From 3c8c99ce5e3c850ca7ec46e88771845718d8cfc3 Mon Sep 17 00:00:00 2001 From: Mogball Date: Mon, 13 Apr 2020 00:12:03 -0400 Subject: remove recursion depth limit and nullcheck on instanceof --- .../gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/main/java/gregtech/api/threads') 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 03cd53c3dd..5261303838 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java @@ -20,9 +20,6 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { private final World mWorld; private final Set mVisited; - // Hopefully large enough for most multi-block machines - private static final int MAX_UPDATE_DEPTH = 128; - public GT_Runnable_MachineBlockUpdate(World aWorld, int aX, int aY, int aZ) { mWorld = aWorld; mX = aX; @@ -32,9 +29,6 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { } private boolean shouldRecurse(TileEntity aTileEntity, int aX, int aY, int aZ) { - if (aTileEntity == null) - return false; - if (aTileEntity instanceof IGregTechTileEntity) { // Stop recursion on GregTech cables, item pipes, and fluid pipes IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aTileEntity).getMetaTileEntity(); @@ -49,11 +43,11 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { } private void stepToUpdateMachine(int aX, int aY, int aZ) { - if (!mVisited.add(new ChunkPosition(aX, aY, aZ)) || mVisited.size() > MAX_UPDATE_DEPTH) + if (!mVisited.add(new ChunkPosition(aX, aY, aZ))) return; TileEntity tTileEntity = mWorld.getTileEntity(aX, aY, aZ); - if (tTileEntity != null && tTileEntity instanceof IMachineBlockUpdateable) + if (tTileEntity instanceof IMachineBlockUpdateable) ((IMachineBlockUpdateable) tTileEntity).onMachineBlockUpdate(); if (mVisited.size() < 5 || shouldRecurse(tTileEntity, aX, aY, aZ)) { -- cgit