diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index 72328cf47..833689b38 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -302,14 +302,14 @@ public class PartMechanicalPipe extends PartTransmitter capability, EnumFacing side) { - return (getConnectionType(side) != ConnectionType.NONE && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) - || super.hasCapability(capability, side); + return (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && (side != null && getConnectionType(side) != ConnectionType.NONE)) + || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && getConnectionType(side) != ConnectionType.NONE) + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && (side != null && getConnectionType(side) != ConnectionType.NONE)) { return (T)this; }