diff options
| author | Dream-MasterXXL <dream-master@gmx.net> | 2018-01-08 11:19:56 +0100 |
|---|---|---|
| committer | Dream-MasterXXL <dream-master@gmx.net> | 2018-01-08 11:19:56 +0100 |
| commit | b99577f213a2b48ad5d5275059285d6a737cecba (patch) | |
| tree | 0c452f0f38c1521f1deb5e9ced00a8487c7f080c /src/main | |
| parent | fc53a35ec17ada1a793dc4fc3f205fe047313625 (diff) | |
| parent | 2ea42459e6522bb10d96c70f89c511a90fbb0f32 (diff) | |
| download | GT5-Unofficial-b99577f213a2b48ad5d5275059285d6a737cecba.tar.gz GT5-Unofficial-b99577f213a2b48ad5d5275059285d6a737cecba.tar.bz2 GT5-Unofficial-b99577f213a2b48ad5d5275059285d6a737cecba.zip | |
Merge remote-tracking branch 'origin/fluid_derp' into Dream-Master_Test-Branch
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
|