move setConnected() back

combine checks in `getController()`
GregTechCEu · Dec 8, 2023 · 7a762f3 · 7a762f3
1 parent 3e9f2d7
commit 7a762f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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/...java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorageController.java b/...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) {