diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2018-01-07 13:00:35 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2018-01-07 13:00:35 -0800 |
| commit | 2ea42459e6522bb10d96c70f89c511a90fbb0f32 (patch) | |
| tree | b0605e7f9fd376ad506ef1ff408251098dfe00d2 /src/main | |
| parent | 82bd441ebbfe3d199c7d28e0dcd6e5c930eaac84 (diff) | |
| download | GT5-Unofficial-2ea42459e6522bb10d96c70f89c511a90fbb0f32.tar.gz GT5-Unofficial-2ea42459e6522bb10d96c70f89c511a90fbb0f32.tar.bz2 GT5-Unofficial-2ea42459e6522bb10d96c70f89c511a90fbb0f32.zip | |
Fix derp (output vs input)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 78a462a7af..8cf83bbe08 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -1170,14 +1170,21 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE }
private boolean canMoveFluidOnSide(ForgeDirection aSide, Fluid aFluid, boolean isFill) {
- if (aSide == ForgeDirection.UNKNOWN
- || ( (isFill ? mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) : mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()))
- && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), this)
- && mMetaTileEntity.isConnectedAtSide((byte) aSide.ordinal())
- )
- )
- return true;
- return false;
+ if (aSide == ForgeDirection.UNKNOWN)
+ return true;
+
+ if (!mMetaTileEntity.isConnectedAtSide((byte) aSide.ordinal()))
+ return false;
+
+ if(isFill && mMetaTileEntity.isLiquidInput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), this))
+ return true;
+
+ if (!isFill && mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal())
+ && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), this))
+ return true;
+
+ return false;
}
@Override
|