aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity
diff options
context:
space:
mode:
authorrepo_alt <wvk17@yandex.ru>2021-01-29 20:20:15 +0300
committerrepo_alt <wvk17@yandex.ru>2021-01-29 20:20:15 +0300
commitb5e203944ce522bfb0f2d00bcb3c348c95043fab (patch)
tree51153406dceb0801f949f3080672ecdf8038044e /src/main/java/gregtech/api/metatileentity
parent363742b4ccaad3c77b56b8fd2e7dd76db6acfe81 (diff)
downloadGT5-Unofficial-b5e203944ce522bfb0f2d00bcb3c348c95043fab.tar.gz
GT5-Unofficial-b5e203944ce522bfb0f2d00bcb3c348c95043fab.tar.bz2
GT5-Unofficial-b5e203944ce522bfb0f2d00bcb3c348c95043fab.zip
multipipe drain() method ignores requested fluid types after first
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7405
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java12
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;
+ }
}