Fix null pointer exception in MixinCircleExecutionState

Author: object-Object

Common/src/main/java/gay/object/hexdebug/mixin/MixinBlockSlate.java

@@ -59,7 +59,7 @@ public void acceptDebugControlFlow(
 
         // TODO: maybe startExecuting should return something to tell us if we can continue
         try {
-            HexDebugCoreAPI.INSTANCE.startExecuting(debugEnv, env, iotas, imageIn);
+            HexDebugCoreAPI.INSTANCE.startDebuggingIotas(debugEnv, env, iotas, imageIn);
         } catch (IllegalDebugSessionException ignored) {}
     }
 

Common/src/main/java/gay/object/hexdebug/mixin/MixinCircleExecutionState.java

@@ -137,13 +137,12 @@ public abstract class MixinCircleExecutionState implements IMixinCircleExecution
     private void hexdebug$stopDebugging(BlockEntityAbstractImpetus impetus, CallbackInfo ci) {
         if (debugEnv$hexdebug != null) {
             HexDebugCoreAPI.INSTANCE.removeDebugThread(debugEnv$hexdebug);
-            debugEnv$hexdebug = null;
         }
     }
 
     @ModifyReturnValue(method = "save", at = @At("RETURN"))
     private CompoundTag hexdebug$saveDebugEnvSessionId(CompoundTag out) {
-        if (debugEnv$hexdebug != null) {
+        if (debugEnv$hexdebug != null && debugEnv$hexdebug.isDebugging()) {
             out.putUUID(TAG_HEXDEBUG_SESSION_ID, debugEnv$hexdebug.getSessionId());
         }
         return out;

Common/src/main/kotlin/gay/object/hexdebug/impl/HexDebugCoreAPIImpl.kt

@@ -23,11 +23,15 @@ class HexDebugCoreAPIImpl : HexDebugCoreAPI {
         return DebugAdapterManager[caster]?.debugger(sessionId)?.debugEnv
     }
 
+    override fun isSessionDebugging(debugEnv: DebugEnvironment): Boolean {
+        return DebugAdapterManager[debugEnv.caster]?.debugger(debugEnv.sessionId) != null
+    }
+
     override fun createDebugThread(debugEnv: DebugEnvironment, threadId: Int?) {
         getAdapterOrThrow(debugEnv).createDebugThread(debugEnv, threadId)
     }
 
-    override fun startExecuting(
+    override fun startDebuggingIotas(
         debugEnv: DebugEnvironment,
         env: CastingEnvironment,
         iotas: MutableList<Iota>,

Core/src/main/java/gay/object/hexdebug/core/api/HexDebugCoreAPI.java

@@ -38,6 +38,11 @@ default DebugEnvironment getDebugEnv(@NotNull ServerPlayer caster, @NotNull UUID
         return null;
     }
 
+    @Contract(pure = true)
+    default boolean isSessionDebugging(@NotNull DebugEnvironment debugEnv) {
+        return false;
+    }
+
     /**
      * @throws IllegalDebugSessionException if {@code debugEnv} is currently associated with an
      *     active debug session
@@ -54,7 +59,7 @@ default void createDebugThread(@NotNull DebugEnvironment debugEnv, @Nullable Int
      * @throws IllegalDebugSessionException if no debug thread is currently associated with
      *     {@code debugEnv}, or if the debugger is already executing something
      */
-    default void startExecuting(
+    default void startDebuggingIotas(
         @NotNull DebugEnvironment debugEnv,
         @NotNull CastingEnvironment env,
         @NotNull List<Iota> iotas,

Core/src/main/java/gay/object/hexdebug/core/api/debugging/DebugEnvironment.java

@@ -47,7 +47,7 @@ public abstract boolean resume(
      * when requested by the user.
      * <br>
      * The previous debug thread is removed before this method is called, so the implementation may
-     * use {@link HexDebugCoreAPI#createDebugThread} and {@link HexDebugCoreAPI#startExecuting}.
+     * use {@link HexDebugCoreAPI#createDebugThread} and {@link HexDebugCoreAPI#startDebuggingIotas}.
      * However, note that {@link DebugEnvironment} is <strong>not</strong> called before this
      * method, so it's up to the implementation whether they need to call that or not.
      */
@@ -95,6 +95,10 @@ public void printDebugMishap(
         }
     }
 
+    public boolean isDebugging() {
+        return HexDebugCoreAPI.INSTANCE.isSessionDebugging(this);
+    }
+
     @NotNull
     public ServerPlayer getCaster() {
         return caster;

Core/src/main/java/gay/object/hexdebug/core/api/debugging/SimplePlayerBasedDebugEnv.java

@@ -58,6 +58,6 @@ public void start(@Nullable Integer threadId)
         throws IllegalDebugSessionException, IllegalDebugThreadException
     {
         HexDebugCoreAPI.INSTANCE.createDebugThread(this, threadId);
-        HexDebugCoreAPI.INSTANCE.startExecuting(this, env, iotas, null);
+        HexDebugCoreAPI.INSTANCE.startDebuggingIotas(this, env, iotas, null);
     }
 }