From bafdb1875640da8b394c8579871348130605e65b Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 7 Sep 2014 00:15:00 +0100 Subject: [PATCH] Fix Gas Tanks filling from the wrong type of gas. (eg. in a Chemical Injection Chamber.) --- src/main/java/mekanism/api/gas/GasTank.java | 2 +- .../mekanism/common/tile/TileEntityAdvancedElectricMachine.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/api/gas/GasTank.java b/src/main/java/mekanism/api/gas/GasTank.java index 1e2aeb944..28a645105 100644 --- a/src/main/java/mekanism/api/gas/GasTank.java +++ b/src/main/java/mekanism/api/gas/GasTank.java @@ -79,7 +79,7 @@ public class GasTank */ public int receive(GasStack amount, boolean doReceive) { - if(amount == null || (stored != null && stored.amount == getMaxGas())) + if(amount == null || (stored != null && !(stored.amount != getMaxGas() && stored.isGasEqual(amount)))) { return 0; } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 64eba3823..fd70eb154 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -145,7 +145,7 @@ public abstract class TileEntityAdvancedElectricMachine= stack.amount) { gasTank.receive(stack, true);