exec module enable() after world join, if not called yet

mems01 · Dec 26, 2023 · 5e19cb1 · 5e19cb1
1 parent c52e6d8
commit 5e19cb1
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/Module.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/Module.kt
@@ -25,10 +25,7 @@ import net.ccbluex.liquidbounce.config.Configurable
 import net.ccbluex.liquidbounce.config.util.Exclude
 import net.ccbluex.liquidbounce.event.EventManager
 import net.ccbluex.liquidbounce.event.Listenable
-import net.ccbluex.liquidbounce.event.events.NotificationEvent
-import net.ccbluex.liquidbounce.event.events.RefreshArrayListEvent
-import net.ccbluex.liquidbounce.event.events.ToggleModuleEvent
-import net.ccbluex.liquidbounce.event.events.WorldDisconnectEvent
+import net.ccbluex.liquidbounce.event.events.*
 import net.ccbluex.liquidbounce.event.handler
 import net.ccbluex.liquidbounce.utils.client.*
 import net.minecraft.client.MinecraftClient
@@ -60,13 +57,17 @@ open class Module(
         }
     }.notAnOption()
 
+    private var calledSinceStartup = false
+
     // Module options
     var enabled by valueEnabled.listen { new ->
         runCatching {
             if (!inGame) {
                 return@runCatching
             }
 
+            calledSinceStartup = true
+
             // Call enable or disable function
             if (new) {
                 enable()
@@ -162,6 +163,12 @@ open class Module(
         }
     }
 
+    val onWorldChange = handler<WorldChangeEvent>(ignoreCondition = true) {
+        if (enabled && !calledSinceStartup && it.world != null) {
+            calledSinceStartup = true
+            enable()
+        }
+    }
 
     protected fun choices(name: String, active: Choice, choices: Array<Choice>) =
         choices(this, name, active, choices)