diff options
author | Technus <daniel112092@gmail.com> | 2016-10-07 18:08:46 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2016-10-07 18:08:46 +0200 |
commit | 8b9fdcf4f61582c444e801c107adacc59a64dd0f (patch) | |
tree | 5f08307083a4d352d19ce7e1acb5736fbafa818c /src/main/java/gregtech/common/tileentities/machines/basic | |
parent | f5278e72cd3e2b50dc7ad9fb205adde0ae9dbb22 (diff) | |
download | GT5-Unofficial-8b9fdcf4f61582c444e801c107adacc59a64dd0f.tar.gz GT5-Unofficial-8b9fdcf4f61582c444e801c107adacc59a64dd0f.tar.bz2 GT5-Unofficial-8b9fdcf4f61582c444e801c107adacc59a64dd0f.zip |
Machine code changes from bloodasp code
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.java | 1 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java | 2 |
2 files changed, 1 insertions, 2 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 04014b5987..a4a88ff564 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 @@ -154,6 +154,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { && (!consumeFluid(((ChunkPosition) this.mPumpList.get(this.mPumpList.size() - 1)).chunkPosX, ((ChunkPosition) this.mPumpList.get(this.mPumpList.size() - 1)).chunkPosY, ((ChunkPosition) this.mPumpList.remove(this.mPumpList.size() - 1)).chunkPosZ))) { + //Should this be empty? } this.mPumpTimer = GT_Utility.safeInt(160 / (long)Math.pow(2, this.mTier) ); this.mPumpTimer = mPumpTimer==0 ? 1 : mPumpTimer; diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java index 0afdcc9669..a142148fc3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java @@ -91,8 +91,6 @@ public class GT_MetaTileEntity_Replicator Materials tMaterial; for (Iterator i$ = Materials.VALUES.iterator(); i$.hasNext(); sHeaviestElementMass = Math.max(sHeaviestElementMass, (int) tMaterial.getMass())) { tMaterial = (Materials) i$.next(); - if ((tMaterial.mElement == null) || (tMaterial.mElement.mIsIsotope)) { - } } } return sHeaviestElementMass; |