Terminate caster's debug sessions on death (close #64)

Author: object-Object

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 - Update zh_cn translations, by ChuijkYahus in [#60](https://github.com/object-Object/HexDebug/pull/60).
 - Source files can now be viewed after the hex that created them finishes debugging.
 - Removed the random prefix from source filenames.
+- Active debug sessions are now terminated on death.
 
 ### Fixed
 

Common/src/main/kotlin/gay/object/hexdebug/adapter/DebugAdapter.kt

@@ -151,8 +151,19 @@ class DebugAdapter(val player: ServerPlayer) : IDebugProtocolServer {
             remoteProxy.terminated(TerminatedEventArguments())
             isConnected = false
         }
-        for (debugger in debuggers.values.toList()) {
-            debugger.debugEnv.terminate()
+        forceTerminateAll()
+    }
+
+    fun onDeath() {
+        forceTerminateAll()
+    }
+
+    private fun forceTerminateAll() {
+        val debugEnvs = debuggers.values.map { it.debugEnv }
+        debuggers.clear()
+        threadIds.clear()
+        for (debugEnv in debugEnvs) {
+            debugEnv.terminate()
         }
     }
 

Common/src/main/kotlin/gay/object/hexdebug/adapter/DebugAdapterManager.kt

@@ -1,6 +1,8 @@
 package gay.`object`.hexdebug.adapter
 
 import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
+import dev.architectury.event.EventResult
+import dev.architectury.event.events.common.EntityEvent
 import dev.architectury.event.events.common.LifecycleEvent
 import dev.architectury.event.events.common.PlayerEvent
 import gay.`object`.hexdebug.HexDebug
@@ -24,6 +26,12 @@ object DebugAdapterManager {
         PlayerEvent.PLAYER_QUIT.register { player ->
             remove(player)
         }
+        EntityEvent.LIVING_DEATH.register { entity, _ ->
+            if (entity is ServerPlayer) {
+                get(entity)?.onDeath()
+            }
+            EventResult.pass()
+        }
         LifecycleEvent.SERVER_STOPPING.register {
             removeAll()
         }

Common/src/main/kotlin/gay/object/hexdebug/adapter/proxy/DebugProxyClient.kt

@@ -4,6 +4,7 @@ import dev.architectury.event.events.client.ClientPlayerEvent
 import gay.`object`.hexdebug.HexDebug
 import gay.`object`.hexdebug.config.HexDebugClientConfig
 import gay.`object`.hexdebug.items.DebuggerItem
+import gay.`object`.hexdebug.items.EvaluatorItem
 import gay.`object`.hexdebug.networking.msg.MsgDebugAdapterProxy
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
@@ -57,8 +58,13 @@ data class DebugProxyClient(val input: InputStream, val output: OutputStream) {
             }
             ClientPlayerEvent.CLIENT_PLAYER_JOIN.register {
                 DebuggerItem.debugStates.clear()
+                EvaluatorItem.evalStates.clear()
                 start()
             }
+            ClientPlayerEvent.CLIENT_PLAYER_RESPAWN.register { _, _ ->
+                DebuggerItem.debugStates.clear()
+                EvaluatorItem.evalStates.clear()
+            }
             ClientPlayerEvent.CLIENT_PLAYER_QUIT.register {
                 stop()
             }