Crash fixes!

This commit is contained in:
aidancbrady committed 2016-11-25 12:25:26 -05:00
1 parent 9f4c73ee94
commit 459cdc67e8
3 files changed
+5 -4

No files matched your search

@@ -21,7 +21,8 @@ public class FluidHandlerWrapper implements IFluidHandler
@Override
public IFluidTankProperties[] getTankProperties()
{
return FluidTankProperties.convert(wrapper.getTankInfo(side));
return wrapper.getTankInfo(side) != null ? FluidTankProperties.convert(wrapper.getTankInfo(side))
: new IFluidTankProperties[]{};
}
@Override
@@ -542,7 +542,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc
{
if(resource != null && canDrain(from, resource.getFluid()))
{
return fluidTank.drain(resource.amount, tier != FluidTankTier.CREATIVE);
return fluidTank.drain(resource.amount, tier != FluidTankTier.CREATIVE && doDrain);
}
return null;
@@ -553,7 +553,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc
{
if(canDrain(from, null))
{
return fluidTank.drain(maxDrain, tier != FluidTankTier.CREATIVE);
return fluidTank.drain(maxDrain, tier != FluidTankTier.CREATIVE && doDrain);
}
return null;