From 3992a6ae46ad0e2e8ac8eb554f84b8da952a30dc Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 10 Jun 2014 12:56:02 +0200 Subject: [PATCH] Several more fixes! --- .../java/mekanism/common/multipart/PartPressurizedTube.java | 4 ++-- .../java/mekanism/common/tile/TileEntityDynamicValve.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index 1162da68f..0178dbc5a 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -260,7 +260,7 @@ public class PartPressurizedTube extends PartTransmitter implements @Override public int receiveGas(ForgeDirection side, GasStack stack) { - if(getConnectionType(side) == ConnectionType.NORMAL) + if(getConnectionType(side) == ConnectionType.NORMAL || getConnectionType(side) == ConnectionType.PULL) { return getTransmitterNetwork().emit(stack); } @@ -277,7 +277,7 @@ public class PartPressurizedTube extends PartTransmitter implements @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { - return getConnectionType(side) == ConnectionType.NORMAL; + return getConnectionType(side) == ConnectionType.NORMAL || getConnectionType(side) == ConnectionType.PULL; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java index 02db4d8df..3896123a9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java @@ -33,7 +33,7 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(fluidTank.dynamicTank.structure != null) + if(fluidTank.dynamicTank.structure != null && fluidTank.dynamicTank.structure.fluidStored != null) { if(resource.getFluid() == fluidTank.dynamicTank.structure.fluidStored.getFluid()) {