2 files changed, 40 insertions, 14 deletions

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index dac494d9bc..0a6b7e96fe 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -390,7 +390,7 @@ public class GregTech_API {
      */
     public static boolean causeMachineUpdate(World aWorld, int aX, int aY, int aZ) {
         if (!aWorld.isRemote)
-            new Thread(new GT_Runnable_MachineBlockUpdate(aWorld, aX, aY, aZ), "Machine Block Updating").start();
+            new GT_Runnable_MachineBlockUpdate(aWorld, aX, aY, aZ).run();
         return true;
     }
 
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 92944d3e32..5261303838 100644
--- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
+++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
@@ -1,43 +1,69 @@
 package gregtech.api.threads;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item;
+
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.World;
 
-import java.util.ArrayList;
+import java.util.Set;
+import java.util.HashSet;
 
 public class GT_Runnable_MachineBlockUpdate implements Runnable {
     private final int mX, mY, mZ;
     private final World mWorld;
+    private final Set<ChunkPosition> mVisited;
 
     public GT_Runnable_MachineBlockUpdate(World aWorld, int aX, int aY, int aZ) {
         mWorld = aWorld;
         mX = aX;
         mY = aY;
         mZ = aZ;
+        mVisited = new HashSet<ChunkPosition>(80);
     }
 
-    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);
+    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);
         if (tTileEntity instanceof IMachineBlockUpdateable)
             ((IMachineBlockUpdateable) tTileEntity).onMachineBlockUpdate();
-        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);
+
+        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);
         }
     }
 
     @Override
     public void run() {
         try {
-            stepToUpdateMachine(mWorld, mX, mY, mZ, new ArrayList<ChunkPosition>());
+            stepToUpdateMachine(mX, mY, mZ);
         } catch (Throwable e) {/**/}
     }
-}
\ No newline at end of file
+}