aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/basic
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-10-07 22:49:34 +0200
committerDream-Master <dream-master@gmx.net>2017-10-07 22:49:34 +0200
commit9c09b6ebe1bfbef3d694b98b5e8c00f4fb37142e (patch)
treee622de96944a0e4b184f79df45412080f9b04f3b /src/main/java/gregtech/common/tileentities/machines/basic
parent12ac40647f5e927d7a0ac696da8edb11d7eda68e (diff)
downloadGT5-Unofficial-9c09b6ebe1bfbef3d694b98b5e8c00f4fb37142e.tar.gz
GT5-Unofficial-9c09b6ebe1bfbef3d694b98b5e8c00f4fb37142e.tar.bz2
GT5-Unofficial-9c09b6ebe1bfbef3d694b98b5e8c00f4fb37142e.zip
cherry pick
Commit: f5abfcefe8d77e2c3c6284bff72de25c0a0ef774 [f5abfce] The right method to find out whether the machine should break the block.
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 cec1c5a68f..3bc104586f 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
@@ -201,7 +201,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
if (yHead <= 0) {
return false;
}
- if ((!consumeFluid(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord())) && (!getBaseMetaTileEntity().getAir(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord()))) {
+ if ((!consumeFluid(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord())) && (!getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord()).isAir(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord()))) {
return false;
}