Fixes #5273: Close craft confirm when grid is missing. (#5292)

AppliedEnergistics · Aug 17, 2021 · d93c74f · d93c74f
1 parent e58150c
commit d93c74f
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/appeng/menu/me/crafting/CraftConfirmMenu.java b/src/main/java/appeng/menu/me/crafting/CraftConfirmMenu.java
@@ -33,6 +33,7 @@
 
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGrid;
+import appeng.api.networking.IGridNode;
 import appeng.api.networking.crafting.ICraftingCPU;
 import appeng.api.networking.crafting.ICraftingJob;
 import appeng.api.networking.crafting.ICraftingLink;
@@ -115,7 +116,15 @@ public void broadcastChanges() {
             return;
         }
 
-        this.cpuCycler.detectAndSendChanges(this.getGrid());
+        var grid = this.getGrid();
+
+        // Close the screen if the grid no longer exists
+        if (grid == null) {
+            this.setValidMenu(false);
+            return;
+        }
+
+        this.cpuCycler.detectAndSendChanges(grid);
 
         super.broadcastChanges();
 
@@ -146,7 +155,8 @@ public void broadcastChanges() {
 
     private IGrid getGrid() {
         final IActionHost h = (IActionHost) this.getTarget();
-        return h.getActionableNode().getGrid();
+        final IGridNode a = h.getActionableNode();
+        return a != null ? a.getGrid() : null;
     }
 
     private boolean cpuMatches(final ICraftingCPU c) {