Merge branch 'experimental' into experimentalMogballThreading

1 files changed, 11 insertions, 27 deletions

diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
index 27dc697daa..0eed84ef2e 100644
--- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
+++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
@@ -1,6 +1,7 @@
 package gregtech.api.threads;
 
 import gregtech.api.GregTech_API;
+
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
@@ -115,35 +116,18 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
         return INSTANCETHREAD;
     }
 
-    private boolean shouldRecurse(TileEntity aTileEntity, int aX, int aY, int aZ) {
-        if (aTileEntity instanceof IGregTechTileEntity) {
-            // Stop recursion on GregTech cables, item pipes, and fluid pipes
-            IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aTileEntity).getMetaTileEntity();
-            if ((tMetaTileEntity instanceof GT_MetaPipeEntity_Cable) ||
-                (tMetaTileEntity instanceof GT_MetaPipeEntity_Fluid) ||
-                (tMetaTileEntity instanceof GT_MetaPipeEntity_Item))
-                return false;
-        }
-
-        return (aTileEntity instanceof IMachineBlockUpdateable) ||
-            GregTech_API.isMachineBlock(mWorld.getBlock(aX, aY, aZ), mWorld.getBlockMetadata(aX, aY, aZ));
-    }
-
-    private void stepToUpdateMachine(int aX, int aY, int aZ) {
-        if (!mVisited.add(new ChunkPosition(aX, aY, aZ)))
-            return;
-
-        TileEntity tTileEntity = mWorld.getTileEntity(aX, aY, aZ);
+    private static void stepToUpdateMachine(World aWorld, int aX, int aY, int aZ, ArrayList<ChunkPosition> aList) {
+        aList.add(new ChunkPosition(aX, aY, aZ));
+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof IMachineBlockUpdateable)
             ((IMachineBlockUpdateable) tTileEntity).onMachineBlockUpdate();
-
-        if (mVisited.size() < 5 || shouldRecurse(tTileEntity, aX, aY, aZ)) {
-            stepToUpdateMachine(aX + 1, aY, aZ);
-            stepToUpdateMachine(aX - 1, aY, aZ);
-            stepToUpdateMachine(aX, aY + 1, aZ);
-            stepToUpdateMachine(aX, aY - 1, aZ);
-            stepToUpdateMachine(aX, aY, aZ + 1);
-            stepToUpdateMachine(aX, aY, aZ - 1);
+        if (aList.size() < 5 || (tTileEntity instanceof IMachineBlockUpdateable) || GregTech_API.isMachineBlock(aWorld.getBlock(aX, aY, aZ), aWorld.getBlockMetadata(aX, aY, aZ))) {
+            if (!aList.contains(new ChunkPosition(aX + 1, aY, aZ))) stepToUpdateMachine(aWorld, aX + 1, aY, aZ, aList);
+            if (!aList.contains(new ChunkPosition(aX - 1, aY, aZ))) stepToUpdateMachine(aWorld, aX - 1, aY, aZ, aList);
+            if (!aList.contains(new ChunkPosition(aX, aY + 1, aZ))) stepToUpdateMachine(aWorld, aX, aY + 1, aZ, aList);
+            if (!aList.contains(new ChunkPosition(aX, aY - 1, aZ))) stepToUpdateMachine(aWorld, aX, aY - 1, aZ, aList);
+            if (!aList.contains(new ChunkPosition(aX, aY, aZ + 1))) stepToUpdateMachine(aWorld, aX, aY, aZ + 1, aList);
+            if (!aList.contains(new ChunkPosition(aX, aY, aZ - 1))) stepToUpdateMachine(aWorld, aX, aY, aZ - 1, aList);
         }
 
     }