aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/threads
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-15 15:40:06 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-15 15:40:06 +0100
commitb10acf8244e3e69f7b37af2a1506eb71f57834c2 (patch)
treeb339af410e4f91ecb9919aeab8da523ca5230a22 /src/main/java/gregtech/api/threads
parent55133748f138fef56973ee7f670da9d353cbfc73 (diff)
parentc997df59522511e899b4bb01a667b48646029450 (diff)
downloadGT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.tar.gz
GT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.tar.bz2
GT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.zip
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp
Diffstat (limited to 'src/main/java/gregtech/api/threads')
-rw-r--r--src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java4
1 files changed, 2 insertions, 2 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 0909229d82..92944d3e32 100644
--- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
+++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java
@@ -22,9 +22,9 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable {
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 != null && tTileEntity instanceof IMachineBlockUpdateable)
+ if (tTileEntity instanceof IMachineBlockUpdateable)
((IMachineBlockUpdateable) tTileEntity).onMachineBlockUpdate();
- if (aList.size() < 5 || (tTileEntity != null && tTileEntity instanceof IMachineBlockUpdateable) || GregTech_API.isMachineBlock(aWorld.getBlock(aX, aY, aZ), aWorld.getBlockMetadata(aX, aY, aZ))) {
+ 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);