From c690fbc273bed328ae773d73f939b235e5d8614a Mon Sep 17 00:00:00 2001
From: Kogepan229 <73163994+Kogepan229@users.noreply.github.com>
Date: Thu, 15 Oct 2026 23:32:48 +0900
Subject: [PATCH] Fix stale storage watchers after grid node removal (#1704)

---
 src/main/java/appeng/me/cache/GridStorageCache.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java
index ebfc980f1..096ee1cdd 100644
--- a/src/main/java/appeng/me/cache/GridStorageCache.java
+++ b/src/main/java/appeng/me/cache/GridStorageCache.java
@@ -152,11 +152,10 @@ public class GridStorageCache implements IStorageGrid {
         }
 
         if (machine instanceof IStackWatcherHost) {
-            final IStackWatcher myWatcher = this.watchers.get(machine);
+            final IStackWatcher myWatcher = this.watchers.remove(node);
 
             if (myWatcher != null) {
                 myWatcher.clear();
-                this.watchers.remove(machine);
             }
         }
     }