aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/basic
diff options
context:
space:
mode:
authorMuramasa- <haydenkilloh@gmail.com>2016-09-13 21:09:38 +0100
committerGitHub <noreply@github.com>2016-09-13 21:09:38 +0100
commit059cf34455b326abfed19da176d62ad478fca7c6 (patch)
treeb0b77ea0391b55f40a99931b54bb8992256737fe /src/main/java/gregtech/common/tileentities/machines/basic
parent4091b39401329c7dbc849b37c3eafbb95943566b (diff)
parent0d9c100ade10ebc72905b0f2a298e9b078b233d8 (diff)
downloadGT5-Unofficial-059cf34455b326abfed19da176d62ad478fca7c6.tar.gz
GT5-Unofficial-059cf34455b326abfed19da176d62ad478fca7c6.tar.bz2
GT5-Unofficial-059cf34455b326abfed19da176d62ad478fca7c6.zip
Merge pull request #631 from Muramasa-/LoadTimes
Various Load Time Improvements
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index 6aabea8286..25912f2485 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
this.mPumpCountBelow = 0;
IGregTechTileEntity tTileEntity;
for (int i = 1; (i < 21) && ((tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance((byte) 0, i)) != null)
- && (tTileEntity.getMetaTileEntity() != null) && ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Pump)); i++) {
+ && ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Pump)); i++) {
getBaseMetaTileEntity().setActive(tTileEntity.isActive());
this.mPumpCountBelow += 1;
((GT_MetaTileEntity_Pump) tTileEntity.getMetaTileEntity()).mPumpTimer -= 1;