diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2018-01-14 10:29:32 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2018-01-14 10:29:32 -0800 |
| commit | 6a255699c9523dbb816487b02f7b05fe8d3a2e25 (patch) | |
| tree | 0a5173e57903a2f87e027af0b95caec07ae88157 /src/main/java/gregtech | |
| parent | d61db82147486c1c4ccafab427d918718e3da26c (diff) | |
| download | GT5-Unofficial-6a255699c9523dbb816487b02f7b05fe8d3a2e25.tar.gz GT5-Unofficial-6a255699c9523dbb816487b02f7b05fe8d3a2e25.tar.bz2 GT5-Unofficial-6a255699c9523dbb816487b02f7b05fe8d3a2e25.zip | |
Possible fix for ic2 cells interacting with fluid pipes
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 8cf83bbe08..dfefd70687 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1173,7 +1174,9 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE if (aSide == ForgeDirection.UNKNOWN)
return true;
- if (!mMetaTileEntity.isConnectedAtSide((byte) aSide.ordinal()))
+ IFluidHandler tTileEntity = getITankContainerAtSide((byte) aSide.ordinal());
+ // Only require a connection if there's something to connect to - Allows fluid cells & buckets to interact with the pipe
+ if (tTileEntity != null && !mMetaTileEntity.isConnectedAtSide((byte) aSide.ordinal()))
return false;
if(isFill && mMetaTileEntity.isLiquidInput((byte) aSide.ordinal())
|