tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Properly use IFluidBlock.drain() when draining fluid blocks

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-23 23:20:53 -05:00
parent 52319ed31e
commit 9cc243a244
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/mekanism/common/tileentity/TileEntityElectricPump.java
View file

@ -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);

2
common/mekanism/common/util/MekanismUtils.java
View file

@ -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);
}
}