Fix #6857: Clear pinned keys and pending jobs on game join (#7120)

AppliedEnergistics · May 22, 2023 · 3ca80be · 3ca80be
1 parent a7fbe03
commit 3ca80be
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/main/java/appeng/client/gui/me/common/PendingCraftingJobs.java b/src/main/java/appeng/client/gui/me/common/PendingCraftingJobs.java
@@ -31,6 +31,10 @@ public static boolean hasPendingJob(AEKey what) {
         return jobs.entrySet().stream().anyMatch(s -> s.getValue().what.equals(what));
     }
 
+    public static void clearPendingJobs() {
+        jobs.clear();
+    }
+
     public static void jobStatus(String id,
             AEKey what,
             long requestedAmount,

diff --git a/src/main/java/appeng/client/gui/me/common/PinnedKeys.java b/src/main/java/appeng/client/gui/me/common/PinnedKeys.java
@@ -43,6 +43,10 @@ public static PinInfo getPinInfo(AEKey key) {
         return pinned.get(key);
     }
 
+    public static void clearPinnedKeys() {
+        pinned.clear();
+    }
+
     public static void pinKey(AEKey key, PinReason reason) {
         // Refresh timer for existing pinned keys if they're re-pinned
         var info = pinned.get(key);

diff --git a/src/main/java/appeng/core/AppEngClient.java b/src/main/java/appeng/core/AppEngClient.java
@@ -37,6 +37,7 @@
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
@@ -63,6 +64,7 @@
 import appeng.client.EffectType;
 import appeng.client.Hotkeys;
 import appeng.client.commands.ClientCommands;
+import appeng.client.gui.me.common.PendingCraftingJobs;
 import appeng.client.gui.me.common.PinnedKeys;
 import appeng.client.gui.style.StyleManager;
 import appeng.client.guidebook.Guide;
@@ -145,6 +147,10 @@ public AppEngClient() {
         ClientTickEvents.END_CLIENT_TICK.register(c -> Hotkeys.checkHotkeys());
 
         ClientTickEvents.END_CLIENT_TICK.register(this::tickPinnedKeys);
+        ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
+            PendingCraftingJobs.clearPendingJobs();
+            PinnedKeys.clearPinnedKeys();
+        });
 
         registerTests();