Properly use IFluidBlock.drain() when draining fluid blocks
This commit is contained in:
parent
52319ed31e
commit
9cc243a244
2 changed files with 5 additions and 1 deletions
|
@ -230,6 +230,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
|
||||||
public boolean clean(boolean take)
|
public boolean clean(boolean take)
|
||||||
{
|
{
|
||||||
boolean took = false;
|
boolean took = false;
|
||||||
|
|
||||||
if(!worldObj.isRemote)
|
if(!worldObj.isRemote)
|
||||||
{
|
{
|
||||||
for(Coord4D wrapper : cleaningNodes)
|
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)
|
if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID)
|
||||||
{
|
{
|
||||||
took = true;
|
took = true;
|
||||||
|
|
||||||
if(take)
|
if(take)
|
||||||
{
|
{
|
||||||
worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord);
|
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)
|
if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID)
|
||||||
{
|
{
|
||||||
took = true;
|
took = true;
|
||||||
|
|
||||||
if(take)
|
if(take)
|
||||||
{
|
{
|
||||||
worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord);
|
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)
|
if(fluidTank.getFluid() != null && MekanismUtils.getFluidId(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord) == fluidTank.getFluid().fluidID)
|
||||||
{
|
{
|
||||||
took = true;
|
took = true;
|
||||||
|
|
||||||
if(take)
|
if(take)
|
||||||
{
|
{
|
||||||
worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord);
|
worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord);
|
||||||
|
|
|
@ -739,7 +739,7 @@ public final class MekanismUtils
|
||||||
|
|
||||||
if(meta == 0)
|
if(meta == 0)
|
||||||
{
|
{
|
||||||
return new FluidStack(fluid.getFluid(), FluidContainerRegistry.BUCKET_VOLUME);
|
return fluid.drain(world, x, y, z, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue