aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorMogball <jeffniu22@gmail.com>2020-04-13 00:12:03 -0400
committerMogball <jeffniu22@gmail.com>2020-04-13 00:12:03 -0400
commit3c8c99ce5e3c850ca7ec46e88771845718d8cfc3 (patch)
tree544c06ab35c4f100f8dd5030320a82298446c1aa /src/main/java/gregtech
parent15359ee04e8773b256aa3cbd7230947528453660 (diff)
downloadGT5-Unofficial-3c8c99ce5e3c850ca7ec46e88771845718d8cfc3.tar.gz
GT5-Unofficial-3c8c99ce5e3c850ca7ec46e88771845718d8cfc3.tar.bz2
GT5-Unofficial-3c8c99ce5e3c850ca7ec46e88771845718d8cfc3.zip
remove recursion depth limit and nullcheck on instanceof
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java10
1 files changed, 2 insertions, 8 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 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<ChunkPosition> 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)) {