Merge pull request #424 from repo-alt/experimental

multipipe drain() method ignores requested fluid types after first

1 files changed, 12 insertions, 0 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
index 4fc3b28dc9..e472305a36 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
@@ -675,4 +675,16 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     		if (inputAABB.intersectsWith(aabb)) outputAABB.add(aabb);
     	}
     }
+    @Override
+    public FluidStack drain(ForgeDirection aSide, FluidStack aFluid, boolean doDrain) {
+        if (aFluid == null)
+            return null;
+        for (int i = 0; i < mFluids.length; ++i) {
+            final FluidStack f = mFluids[i];
+            if (f == null || !f.isFluidEqual(aFluid))
+                continue;
+            return drainFromIndex(aFluid.amount, doDrain, i);
+        }
+        return null;
+    }
 }