diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-01-19 12:38:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 12:38:50 +0100 |
| commit | 65c5813ae3d5dc735d1a61868a0313ac177d80f5 (patch) | |
| tree | 1e09cea07727a9cc0eac9e679d254dd07b6a104d /src/main/java/gregtech/common/tileentities | |
| parent | 1cf283afa82bf92ec6232b3a665fb1c78dc4e841 (diff) | |
| parent | 90442a8d911523feecf020b833d161fd44ff46a3 (diff) | |
| download | GT5-Unofficial-65c5813ae3d5dc735d1a61868a0313ac177d80f5.tar.gz GT5-Unofficial-65c5813ae3d5dc735d1a61868a0313ac177d80f5.tar.bz2 GT5-Unofficial-65c5813ae3d5dc735d1a61868a0313ac177d80f5.zip | |
Merge pull request #858 from Techlone/unstable
Disable miner when mining pipes is over
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java | 5 |
1 files changed, 3 insertions, 2 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 2fe1a3e273..08d889b7e4 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 @@ -125,10 +125,11 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas if (mMineList.isEmpty()) { if(getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead() - 1 - getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ) != Blocks.bedrock){ if (mEnergyHatches.size() > 0 && mEnergyHatches.get(0).getEUVar() > (512 + getMaxInputVoltage() * 4)) { - moveOneDown(); + if (!moveOneDown()) + return false; } }else{ - stopMachine(); + stopMachine(); return false; } } |