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

Fixed Fluid Interface with Stack Upgrade not exporting liquids, fixes #1536

Browse Source
This commit is contained in:
raoulvdberge
2017-11-13 22:50:38 +01:00
parent 0905f2fb90
commit 6e7471eaab
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -2,6 +2,7 @@
### 1.5.23 ### 1.5.23
- Fixed duplication bug with autocrafting (raoulvdberge) - Fixed duplication bug with autocrafting (raoulvdberge)
- Fixed Fluid Interface with Stack Upgrade not exporting liquids (raoulvdberge)
### 1.5.22 ### 1.5.22
- Added oredict, blocking, processing, ore inputs access to OpenComputers API (raoulvdberge) - Added oredict, blocking, processing, ore inputs access to OpenComputers API (raoulvdberge)

8
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java
View File

@@ -120,6 +120,14 @@ public class NetworkNodeFluidInterface extends NetworkNode implements IComparabl
if (stackInStorage != null) { if (stackInStorage != null) {
int toExtract = Math.min(Fluid.BUCKET_VOLUME * upgrades.getItemInteractCount(), stackInStorage.amount); int toExtract = Math.min(Fluid.BUCKET_VOLUME * upgrades.getItemInteractCount(), stackInStorage.amount);
int spaceRemaining = tankOut.getCapacity() - tankOut.getFluidAmount();
if (toExtract > spaceRemaining) {
toExtract = spaceRemaining;
}
if (toExtract <= 0) {
return;
}
FluidStack took = network.extractFluid(stack, toExtract, compare, true); FluidStack took = network.extractFluid(stack, toExtract, compare, true);
if (took != null && (toExtract - tankOut.fillInternal(took, false)) == 0) { if (took != null && (toExtract - tankOut.fillInternal(took, false)) == 0) {