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

Merge branch 'master' into development

Browse source
This commit is contained in:
Ben Spiers 2014-09-01 04:06:47 +01:00
commit 26cf0ee925
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/mekanism/common/FluidNetwork.java
View file

@ -254,11 +254,14 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
if(fluidStored != null) if(fluidStored != null)
{ {
prevTransferAmount = tickEmit(fluidStored, true); prevTransferAmount = tickEmit(fluidStored, true);
fluidStored.amount -= prevTransferAmount; if(fluidStored != null)
if(fluidStored != null && fluidStored.amount <= 0)
{ {
fluidStored = null; fluidStored.amount -= prevTransferAmount;
if(fluidStored.amount <= 0)
{
fluidStored = null;
}
} }
} }
} }