dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix extractFluid voiding excess in OC driver (#2363)

Browse Source
This commit is contained in:
BlueAgent
2020-04-26 16:16:27 +08:00
committed by GitHub
parent 98ed5b89c2
commit 3248514a65
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java
View File

@@ -258,10 +258,16 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment {
}
// Actually do it and return how much fluid we've inserted
FluidStack extracted = node.getNetwork().extractFluid(stack, stack.amount, Action.PERFORM);
handler.fill(extracted, true);
FluidStack extractedActual = node.getNetwork().extractFluid(stack, filledAmountSim, Action.PERFORM);
int filledAmountActual = handler.fill(extractedActual, true);
return new Object[]{filledAmountSim};
// Attempt to insert excess fluid back into the network
// This shouldn't need to happen for most tanks, unless input cap decreases based on insert amount
if (extractedActual != null && extractedActual.amount > filledAmountActual) {
node.getNetwork().insertFluid(stack, extractedActual.amount - filledAmountActual, Action.PERFORM);
}
return new Object[]{filledAmountActual};
}
@Callback(doc = "function(stack:table):table -- Gets a fluid from the network.")