Fix issue with rejoining client

End-Tech · Dec 18, 2022 · 7471cc0 · 7471cc0
1 parent 77a5061
commit 7471cc0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/ch/endte/syncmatica/mixin/MixinMinecraftClient.java b/src/main/java/ch/endte/syncmatica/mixin/MixinMinecraftClient.java
@@ -3,6 +3,7 @@
 import ch.endte.syncmatica.Syncmatica;
 import ch.endte.syncmatica.litematica.LitematicManager;
 import ch.endte.syncmatica.litematica.ScreenHelper;
+import ch.endte.syncmatica.mixin_actor.ActorClientPlayNetworkHandler;
 import net.minecraft.client.MinecraftClient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -17,5 +18,6 @@ private void shutdownSyncmatica(final CallbackInfo ci) {
         ScreenHelper.close();
         Syncmatica.shutdown();
         LitematicManager.clear();
+        ActorClientPlayNetworkHandler.getInstance().reset();
     }
 }
diff --git a/src/main/java/ch/endte/syncmatica/mixin_actor/ActorClientPlayNetworkHandler.java b/src/main/java/ch/endte/syncmatica/mixin_actor/ActorClientPlayNetworkHandler.java
@@ -73,6 +73,12 @@ public boolean packetEvent(final Identifier id, final PacketByteBuf buf) {
         return false;
     }
 
+    public void reset() {
+        clientCommunication = null;
+        exTarget = null;
+        clientPlayNetworkHandler = null;
+    }
+
     private static void setClientPlayNetworkHandler(final ClientPlayNetworkHandler clientPlayNetworkHandler) {
         ActorClientPlayNetworkHandler.clientPlayNetworkHandler = clientPlayNetworkHandler;
     }