From 8a2027a0e4ea497eb91e9e806cf33503a56204e9 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 9 May 2020 20:42:55 +0800
Subject: [PATCH] Use volatile than atomic
---
.../src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
index 9432d5ace..55e957668 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
@@ -11,7 +11,6 @@
package net.mamoe.mirai.event
-import kotlinx.atomicfu.atomic
import net.mamoe.mirai.event.internal.broadcastInternal
import net.mamoe.mirai.utils.MiraiExperimentalAPI
import net.mamoe.mirai.utils.MiraiInternalAPI
@@ -81,7 +80,9 @@ abstract class AbstractEvent : Event {
@Volatile
private var _intercepted = false
- private val _cancelled = atomic(false)
+
+ @Volatile
+ private var _cancelled = false
// 实现 Event
/**
@@ -103,7 +104,7 @@ abstract class AbstractEvent : Event {
/**
* @see CancellableEvent.isCancelled
*/
- val isCancelled: Boolean get() = _cancelled.value
+ val isCancelled: Boolean get() = _cancelled
/**
* @see CancellableEvent.cancel
@@ -112,7 +113,7 @@ abstract class AbstractEvent : Event {
check(this is CancellableEvent) {
"Event $this is not cancellable"
}
- _cancelled.value = true
+ _cancelled = true
}
}