Fixes tryFluidTransfer_Internal to respect the FluidStack drainable when draining fluidSource. (#7782)

This commit is contained in:
mikewk authored and GitHub committed 2021-07-16 17:45:39 -07:00
1 parent f9b894ecbf
commit 7c6ae3e61e
1 file changed
+2 -2
@@ -395,9 +395,10 @@ public class FluidUtil
int fillableAmount = fluidDestination.fill(drainable, IFluidHandler.FluidAction.SIMULATE);
if (fillableAmount > 0)
{
drainable.setAmount(fillableAmount);
if (doTransfer)
{
FluidStack drained = fluidSource.drain(fillableAmount, IFluidHandler.FluidAction.EXECUTE);
FluidStack drained = fluidSource.drain(drainable, IFluidHandler.FluidAction.EXECUTE);
if (!drained.isEmpty())
{
drained.setAmount(fluidDestination.fill(drained, IFluidHandler.FluidAction.EXECUTE));
@@ -406,7 +407,6 @@ public class FluidUtil
}
else
{
drainable.setAmount(fillableAmount);
return drainable;
}
}