From 9cc243a24422ef636bf4f8bd781ecfb2844e71a2 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 23 Dec 2013 23:20:53 -0500 Subject: [PATCH] Properly use IFluidBlock.drain() when draining fluid blocks --- common/mekanism/common/tileentity/TileEntityElectricPump.java | 4 ++++ common/mekanism/common/util/MekanismUtils.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/mekanism/common/tileentity/TileEntityElectricPump.java b/common/mekanism/common/tileentity/TileEntityElectricPump.java index 1efa22134..0abdfab39 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricPump.java +++ b/common/mekanism/common/tileentity/TileEntityElectricPump.java @@ -230,6 +230,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I public boolean clean(boolean take) { boolean took = false; + if(!worldObj.isRemote) { for(Coord4D wrapper : cleaningNodes) @@ -239,6 +240,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID) { took = true; + if(take) { worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); @@ -254,6 +256,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID) { took = true; + if(take) { worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); @@ -271,6 +274,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID) { took = true; + if(take) { worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); diff --git a/common/mekanism/common/util/MekanismUtils.java b/common/mekanism/common/util/MekanismUtils.java index 2de86ec73..43b4f363b 100644 --- a/common/mekanism/common/util/MekanismUtils.java +++ b/common/mekanism/common/util/MekanismUtils.java @@ -739,7 +739,7 @@ public final class MekanismUtils if(meta == 0) { - return new FluidStack(fluid.getFluid(), FluidContainerRegistry.BUCKET_VOLUME); + return fluid.drain(world, x, y, z, false); } }