remove async tasks

CCBlueX · Feb 24, 2025 · 991d953 · 991d953
1 parent 974179c
commit 991d953
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/main/java/net/ccbluex/liquidbounce/event/EventManager.kt b/src/main/java/net/ccbluex/liquidbounce/event/EventManager.kt
@@ -11,8 +11,10 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import net.ccbluex.liquidbounce.event.async.LoopManager
 import net.ccbluex.liquidbounce.event.async.TickScheduler
+import net.ccbluex.liquidbounce.event.async.waitTicks
 import net.ccbluex.liquidbounce.utils.client.ClientUtils
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.coroutines.cancellation.CancellationException
 
@@ -46,13 +48,41 @@ object EventManager : CoroutineScope by CoroutineScope(SupervisorJob()) {
         CopyOnWriteArrayList<EventHook<in Event>>()
     }
 
+    private class AsyncTask(val owner: EventHook<*>, val job: Job)
+
+    private val jobs = CopyOnWriteArrayList<AsyncTask>()
+
     init {
         LoopManager
         TickScheduler
+
+        LoopManager.loopHandler {
+            jobs.removeIf { !it.owner.isActive || !it.job.isActive }
+            waitTicks(1)
+        }
+    }
+
+    fun Listenable.cancelAsyncJobs() {
+        jobs.removeIf {
+            if (it.owner.owner === this) {
+                it.job.cancel()
+                true
+            } else {
+                false
+            }
+        }
     }
 
     fun <T : Event> unregisterEventHook(eventClass: Class<out T>, eventHook: EventHook<in T>) {
         registry[eventClass]!!.remove(eventHook)
+        jobs.removeIf {
+            if (it.owner === eventHook) {
+                it.job.cancel()
+                true
+            } else {
+                false
+            }
+        }
     }
 
     fun <T : Event> registerEventHook(eventClass: Class<out T>, eventHook: EventHook<T>): EventHook<T> {
@@ -101,13 +131,14 @@ object EventManager : CoroutineScope by CoroutineScope(SupervisorJob()) {
             }
 
             is EventHook.Async -> {
-                launch(dispatcher) {
+                val job = launch(dispatcher) {
                     try {
                         action(this, event)
                     } catch (e: Exception) {
                         ClientUtils.LOGGER.error("Exception during call event (async)", e)
                     }
                 }
+                jobs += AsyncTask(this, job)
             }
         }
     }

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/Module.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/Module.kt
@@ -7,6 +7,7 @@ package net.ccbluex.liquidbounce.features.module
 
 import net.ccbluex.liquidbounce.LiquidBounce.isStarting
 import net.ccbluex.liquidbounce.config.Configurable
+import net.ccbluex.liquidbounce.event.EventManager.cancelAsyncJobs
 import net.ccbluex.liquidbounce.event.Listenable
 import net.ccbluex.liquidbounce.features.module.modules.misc.GameDetector
 import net.ccbluex.liquidbounce.file.FileManager.modulesConfig
@@ -133,6 +134,7 @@ open class Module(
 
                 if (canBeEnabled) field = true
             } else {
+                cancelAsyncJobs()
                 onDisable()
                 field = false
             }