aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-11-19 12:53:17 +0100
committerGitHub <noreply@github.com>2021-11-19 12:53:17 +0100
commitbca34e483173c303df98a14f39ec14e6a0a9db33 (patch)
treea7ec8563280da1867f060d6810c0eccd36ddc5fe /src/main
parent8762f3ff2e4208cb1b2ebf7f604575cfd24f7ecb (diff)
parentf30f8f115576ce16c12cada43745f07a574e0684 (diff)
downloadGT5-Unofficial-bca34e483173c303df98a14f39ec14e6a0a9db33.tar.gz
GT5-Unofficial-bca34e483173c303df98a14f39ec14e6a0a9db33.tar.bz2
GT5-Unofficial-bca34e483173c303df98a14f39ec14e6a0a9db33.zip
Merge pull request #740 from repo-alt/experimental
Fluid lost when transporting fluid from GregTech pipe to EnderIO Conduit
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java2
1 files changed, 2 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 8479477d12..8cce529050 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
@@ -338,6 +338,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
// Tank, From, Amount to receive
List<MutableTriple<IFluidHandler, ForgeDirection, Integer>> tTanks = new ArrayList<>();
+ int amount = tFluid.amount;
for (byte aSide, i = 0, j = (byte) aBaseMetaTileEntity.getRandomNumber(6); i < 6; i++) {
// Get a list of tanks accepting fluids, and what side they're on
@@ -352,6 +353,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
if (tTank.fill(ForgeDirection.getOrientation(tSide), tFluid, false) > 0) {
tTanks.add(new MutableTriple<>(tTank, ForgeDirection.getOrientation(tSide), 0));
}
+ tFluid.amount = amount; // Because some mods do actually modify input fluid stack
}
}