Stop ClipManager execute on disconnect

n2pm · Jul 21, 2023 · 0166151 · 0166151
1 parent 698ace2
commit 0166151
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/pm/n2/tangerine/mixin/MinecraftClientMixin.java b/src/main/java/pm/n2/tangerine/mixin/MinecraftClientMixin.java
@@ -1,10 +1,14 @@
 package pm.n2.tangerine.mixin;
 
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import pm.n2.tangerine.Tangerine;
+import pm.n2.tangerine.core.TangerineEvent;
 import pm.n2.tangerine.modules.visuals.GlowESPModule;
 
 @Mixin(MinecraftClient.class)
@@ -15,4 +19,9 @@ public class MinecraftClientMixin {
             cir.setReturnValue(true);
         }
     }
+
+    @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("TAIL"))
+    private void disconnect(Screen screen, CallbackInfo ci) {
+        Tangerine.INSTANCE.getEventManager().dispatch(TangerineEvent.Disconnected.INSTANCE);
+    }
 }
diff --git a/src/main/kotlin/pm/n2/tangerine/core/TangerineEvent.kt b/src/main/kotlin/pm/n2/tangerine/core/TangerineEvent.kt
@@ -5,6 +5,7 @@ import net.minecraft.network.packet.Packet
 sealed class TangerineEvent {
     data object PreTick : TangerineEvent()
     data object PostTick : TangerineEvent()
+    data object Disconnected : TangerineEvent()
 
     data class C2SPacket(val packet: Packet<*>) : TangerineEvent()
     data class S2CPacket(val packet: Packet<*>) : TangerineEvent()

diff --git a/src/main/kotlin/pm/n2/tangerine/managers/ClipManager.kt b/src/main/kotlin/pm/n2/tangerine/managers/ClipManager.kt
@@ -8,8 +8,10 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.ChunkPos
 import net.minecraft.util.math.Vec3d
 import org.slf4j.LoggerFactory
+import pm.n2.hajlib.event.EventHandler
 import pm.n2.tangerine.Tangerine
 import pm.n2.tangerine.core.Manager
+import pm.n2.tangerine.core.TangerineEvent
 import pm.n2.tangerine.core.TangerineTaskContext
 import pm.n2.tangerine.managers.ClipManager.build
 import kotlin.math.abs
@@ -36,6 +38,11 @@ object ClipManager : Manager {
     const val SKY_INTERMEDIATE = 320.0 // our feet will be on 320, which is guaranteed to be air
     const val VOID_INTERMEDIATE = -64.0 - 2.0 // 2 for the player to not suffocate in bedrock
 
+    @EventHandler
+    fun onDisconnected(event: TangerineEvent.Disconnected) {
+        isRunning = false
+    }
+
     // List of lists - each entry in the first list should have all its packets sent on a single tick
     fun build(from: Vec3d, to: Vec3d): List<List<Packet<*>>>? {
         // If we're only going vertically, don't bother with hclip