diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-11-04 22:13:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-04 22:13:45 +0100 |
commit | 58206f909ec40d98792040cdfb2da8de90b1ca74 (patch) | |
tree | 45b1d0378bf5a5aa6d66898f496734844b0f99db /src/main/java/gregtech/common | |
parent | 2108b9cdc8f6984f35c29b7fde52cb35a77b9227 (diff) | |
parent | bc619efb8a38220513a29aa8788ed46aadcc3305 (diff) | |
download | GT5-Unofficial-58206f909ec40d98792040cdfb2da8de90b1ca74.tar.gz GT5-Unofficial-58206f909ec40d98792040cdfb2da8de90b1ca74.tar.bz2 GT5-Unofficial-58206f909ec40d98792040cdfb2da8de90b1ca74.zip |
Merge pull request #727 from Dimach/unstable
Fixed oil rig
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 5742320af2..b0f506f7ff 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 @@ -77,7 +77,7 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase if (tFluid == null) { return false; } - if (getYOfPumpHead() <=1 || getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead() - 1 - getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ) != Blocks.bedrock) { + if (getYOfPumpHead() > 0 && getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead() - 1 - getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ) != Blocks.bedrock) { if (completedCycle) { moveOneDown(); } @@ -123,7 +123,7 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX; int zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ; int yHead = getYOfPumpHead(); - if (yHead <= 1) { + if (yHead < 1) { return false; } if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, getBaseMetaTileEntity().getZCoord() + zDir) == Blocks.bedrock) { |