tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Several more fixes!

Browse source
This commit is contained in:
Aidan C. Brady 2014-06-10 12:56:02 +02:00
parent 49c7b1062a
commit 3992a6ae46
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/common/multipart/PartPressurizedTube.java
View file

@ -260,7 +260,7 @@ public class PartPressurizedTube extends PartTransmitter<GasNetwork> 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<GasNetwork> implements
@Override
public boolean canReceiveGas(ForgeDirection side, Gas type)
{
return getConnectionType(side) == ConnectionType.NORMAL;
return getConnectionType(side) == ConnectionType.NORMAL || getConnectionType(side) == ConnectionType.PULL;
}
@Override

2
src/main/java/mekanism/common/tile/TileEntityDynamicValve.java
View file

@ -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())
{