Merge branch 'master' into development
This commit is contained in:
commit
26cf0ee925
1 changed files with 7 additions and 4 deletions
|
@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue