From a08bf241ed93a2f183ab6c116452ae34150c2b47 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 29 Apr 2020 18:21:01 +0800
Subject: [PATCH] Improve event handler coroutine management

---
 .../net/mamoe/mirai/event/internal/EventInternalJvm.kt      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/internal/EventInternalJvm.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/internal/EventInternalJvm.kt
index d2f3a979c..7a2f17694 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/internal/EventInternalJvm.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/internal/EventInternalJvm.kt
@@ -29,8 +29,8 @@ internal fun <E : Event> Class<E>._subscribeEventForJaptOnly(
 ): Listener<E> {
     return this.kotlin.subscribeInternal(
         scope.Handler(
-            EmptyCoroutineContext,
-            Listener.ConcurrencyKind.CONCURRENT
+            scope.coroutineContext,
+            Listener.ConcurrencyKind.LOCKED
         ) { withContext(Dispatchers.IO) { onEvent.apply(it) } })
 }
 
@@ -39,6 +39,6 @@ internal fun <E : Event> Class<E>._subscribeEventForJaptOnly(scope: CoroutineSco
     return this.kotlin.subscribeInternal(
         scope.Handler(
             EmptyCoroutineContext,
-            Listener.ConcurrencyKind.CONCURRENT
+            Listener.ConcurrencyKind.LOCKED
         ) { withContext(Dispatchers.IO) { onEvent.accept(it) }; ListeningStatus.LISTENING; })
 }
\ No newline at end of file