fixed sided fluid handlers not properly returning inserted amounts af…

…ter calling transaction modifiers
GregTech-Intergalactical · Dec 11, 2023 · 65100b8 · 65100b8
1 parent c092238
commit 65100b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/common/src/main/java/muramasa/antimatter/capability/fluid/FluidHandlerSidedWrapper.java b/common/src/main/java/muramasa/antimatter/capability/fluid/FluidHandlerSidedWrapper.java
@@ -80,7 +80,8 @@ public long insertFluid(FluidHolder resource, boolean simulate) {
             if (coverHandler.get(side).blocksInput(FluidContainer.class, side)) {
                 return 0;
             }
-            if(coverHandler.onTransfer(resource, side, true, simulate)) return 0;
+            long oldAmount = resource.getFluidAmount();
+            if(coverHandler.onTransfer(resource, side, true, simulate)) return oldAmount - resource.getFluidAmount();
         }
 
         if (!fluidHandler.canInput(resource, side) || !fluidHandler.canInput(side)) {

diff --git a/common/src/main/java/muramasa/antimatter/capability/fluid/PipeFluidHandlerSidedWrapper.java b/common/src/main/java/muramasa/antimatter/capability/fluid/PipeFluidHandlerSidedWrapper.java
@@ -24,7 +24,8 @@ public long insertFluid(FluidHolder resource, boolean simulate) {
             if (coverHandler.get(side).blocksInput(FluidContainer.class, side)) {
                 return 0;
             }
-            if(coverHandler.onTransfer(resource, side, true, simulate)) return 0;
+            long oldAmount = resource.getFluidAmount();
+            if(coverHandler.onTransfer(resource, side, true, simulate)) return oldAmount - resource.getFluidAmount();
         }
 
         if (!fluidHandler.canInput(resource, side) || !fluidHandler.canInput(side)) {