Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
8a2027a0
Commit
8a2027a0
authored
May 09, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use volatile than atomic
parent
8117382f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
...core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
+5
-4
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/Event.kt
View file @
8a2027a0
...
@@ -11,7 +11,6 @@
...
@@ -11,7 +11,6 @@
package
net.mamoe.mirai.event
package
net.mamoe.mirai.event
import
kotlinx.atomicfu.atomic
import
net.mamoe.mirai.event.internal.broadcastInternal
import
net.mamoe.mirai.event.internal.broadcastInternal
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
import
net.mamoe.mirai.utils.MiraiExperimentalAPI
import
net.mamoe.mirai.utils.MiraiInternalAPI
import
net.mamoe.mirai.utils.MiraiInternalAPI
...
@@ -81,7 +80,9 @@ abstract class AbstractEvent : Event {
...
@@ -81,7 +80,9 @@ abstract class AbstractEvent : Event {
@Volatile
@Volatile
private
var
_intercepted
=
false
private
var
_intercepted
=
false
private
val
_cancelled
=
atomic
(
false
)
@Volatile
private
var
_cancelled
=
false
// 实现 Event
// 实现 Event
/**
/**
...
@@ -103,7 +104,7 @@ abstract class AbstractEvent : Event {
...
@@ -103,7 +104,7 @@ abstract class AbstractEvent : Event {
/**
/**
* @see CancellableEvent.isCancelled
* @see CancellableEvent.isCancelled
*/
*/
val
isCancelled
:
Boolean
get
()
=
_cancelled
.
value
val
isCancelled
:
Boolean
get
()
=
_cancelled
/**
/**
* @see CancellableEvent.cancel
* @see CancellableEvent.cancel
...
@@ -112,7 +113,7 @@ abstract class AbstractEvent : Event {
...
@@ -112,7 +113,7 @@ abstract class AbstractEvent : Event {
check
(
this
is
CancellableEvent
)
{
check
(
this
is
CancellableEvent
)
{
"Event $this is not cancellable"
"Event $this is not cancellable"
}
}
_cancelled
.
value
=
true
_cancelled
=
true
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment