diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-11-02 23:14:40 +0100 |
---|---|---|
committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-11-02 23:14:40 +0100 |
commit | 8a17c674425a84426e59bcc699830ea0c36b5565 (patch) | |
tree | ac6a404d597f2e9e657026061d17ab73bcf174d5 /src/main/java/gregtech/common/tileentities | |
parent | 481580b723c778a2886f1f7c7b4b5ca39edecbd3 (diff) | |
download | GT5-Unofficial-8a17c674425a84426e59bcc699830ea0c36b5565.tar.gz GT5-Unofficial-8a17c674425a84426e59bcc699830ea0c36b5565.tar.bz2 GT5-Unofficial-8a17c674425a84426e59bcc699830ea0c36b5565.zip |
Turn off AdvMinerII and OilDrill once work is done.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java index a6028b541b..0fcb84c3b5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java @@ -128,6 +128,7 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas moveOneDown(); } }else{ + stopMachine(); return false; } } @@ -213,19 +214,23 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas private boolean moveOneDown() { if ((this.mInventory[1] == null) || (this.mInventory[1].stackSize < 1) || (!GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L)))) { + stopMachine(); return false; } int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX; int zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ; int yHead = getYOfPumpHead(); if (yHead <= 0) { + stopMachine(); return false; } if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, getBaseMetaTileEntity().getZCoord() + zDir) == Blocks.bedrock) { + stopMachine(); return false; } if (!(getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, getBaseMetaTileEntity().getZCoord() + zDir, GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))))) { - return false; + stopMachine(); + return false; } if (yHead != getBaseMetaTileEntity().getYCoord()) { getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord() + xDir, yHead, getBaseMetaTileEntity().getZCoord() + zDir, GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java index 2681387ab6..5742320af2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java @@ -85,6 +85,7 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase if (mEnergyHatches.size() > 0 && mEnergyHatches.get(0).getEUVar() > (512 + getMaxInputVoltage() * 4)) completedCycle = true; } else if (tFluid.amount < 5000) { + stopMachine(); return false; } else { tFluid.amount = tFluid.amount / 5000; |