More fluid container integration, removed dead code

This commit is contained in:
aidancbrady committed 2016-03-06 02:57:32 -05:00
1 parent d332ad49b7
commit 34d55f72ea
8 files changed
+37 -127

No files matched your search

@@ -350,10 +350,21 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc
int needed = fluidTank.getCapacity()-fluidTank.getFluidAmount();
Coord4D top = Coord4D.get(this).getFromSide(ForgeDirection.UP);
TileEntity topTile = top.getTileEntity(worldObj);
if(top.getTileEntity(worldObj) instanceof TileEntityFluidTank)
if(topTile instanceof TileEntityFluidTank)
{
needed += ((TileEntityFluidTank)top.getTileEntity(worldObj)).getCurrentNeeded();
TileEntityFluidTank topTank = (TileEntityFluidTank)topTile;
if(fluidTank.getFluid() != null && topTank.fluidTank.getFluid() != null)
{
if(fluidTank.getFluid().getFluid() != topTank.fluidTank.getFluid().getFluid())
{
return needed;
}
}
needed += topTank.getCurrentNeeded();
}
return needed;