diff options
| author | Blood-Asp <Blood@Asp> | 2015-06-27 03:26:08 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-06-27 03:26:08 +0200 |
| commit | 8198a51aeef641fd25d2b77f776c7640dd3f84a9 (patch) | |
| tree | c72f6a26a68d4135119c73504cceef1fed3e98fe /main/java/gregtech/common/tileentities/machines/basic | |
| parent | 6591e802e925a1f57d62b8d506936d6d5e9fde3c (diff) | |
| download | GT5-Unofficial-8198a51aeef641fd25d2b77f776c7640dd3f84a9.tar.gz GT5-Unofficial-8198a51aeef641fd25d2b77f776c7640dd3f84a9.tar.bz2 GT5-Unofficial-8198a51aeef641fd25d2b77f776c7640dd3f84a9.zip | |
Version 5.08.21
Diffstat (limited to 'main/java/gregtech/common/tileentities/machines/basic')
| -rw-r--r-- | main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java index 3c2fc3c757..bdf62625e1 100644 --- a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java +++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java @@ -169,8 +169,8 @@ 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().getAir(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord()))) { + return false; } if (!(getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), yHead - 1, getBaseMetaTileEntity().getZCoord(),GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))))) { @@ -306,11 +306,15 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { getBaseMetaTileEntity().decreaseStoredEnergyUnits(4*((int)Math.pow(4, this.mTier)), true); } } - if ((aBlock instanceof IFluidBlock)) { + if ((aBlock instanceof IFluidBlock)) { if (this.mFluid == null) { this.mFluid = ((IFluidBlock) aBlock).drain(getBaseMetaTileEntity().getWorld(), aX, aY, aZ, true); getBaseMetaTileEntity().decreaseStoredEnergyUnits(this.mFluid == null ? 1000 : this.mFluid.amount, true); - } else { + }else if(this.mFluid.isFluidEqual(((IFluidBlock) aBlock).drain(getBaseMetaTileEntity().getWorld(), aX, aY, aZ, false))){ + this.getBaseMetaTileEntity().getWorld().setBlockToAir( aX, aY, aZ); + this.mFluid.amount += 1000; + getBaseMetaTileEntity().decreaseStoredEnergyUnits(16*((int)Math.pow(4, this.mTier)), true); + }else { return false; } } |