From 7a762f32d4cb1a8afc0fb1b48c55573fbe7d832e Mon Sep 17 00:00:00 2001
From: Ghzdude <44148655+ghzdude@users.noreply.github.com>
Date: Thu, 7 Dec 2023 17:39:25 -0700
Subject: [PATCH] move `setConnected()` back combine checks in
 `getController()`

---
 .../storage/MetaTileEntityQuantumStorage.java                | 5 ++---
 .../storage/MetaTileEntityQuantumStorageController.java      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java
index f958ec7541a..0a9fdb60868 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java
@@ -62,9 +62,8 @@ public void setDisconnected() {
     // use this to make sure controller is properly initialized
     @Override
     public IQuantumController getController() {
-        if (getWorld().isRemote) return null; // quick safety check
-        if (isConnected()) {
-            if (controller != null && controller.get() != null) return controller.get();
+        if (!getWorld().isRemote && isConnected()) {
+            if (controller.get() != null) return controller.get();
             MetaTileEntity mte = GTUtility.getMetaTileEntity(getWorld(), controllerPos);
             if (mte instanceof IQuantumController) {
                 controller = new WeakReference<>((IQuantumController) mte);
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorageController.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorageController.java
index a31323983de..4c27b3eb556 100644
--- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorageController.java
+++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorageController.java
@@ -179,9 +179,9 @@ public void rebuildNetwork() {
             // valid chest/tank located, add it
             storageInstances.put(pos, new WeakReference<>(storage));
             storagePositions.add(pos);
+            storage.setConnected(this);
             oldInstances.remove(pos);
             oldPositions.remove(pos);
-            storage.setConnected(this);
 
             // check against already check posses so we don't recheck a checked pos
             for (EnumFacing facing : EnumFacing.VALUES) {