From b6264891f1fb67e511c0f4f3814cfc137c853dfa Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 28 May 2015 16:22:00 -0400 Subject: [PATCH] Fixed a small Gas Generator crash --- .../java/mekanism/common/tile/TileEntityEnergyCube.java | 4 ++-- .../generators/common/tile/TileEntityGasGenerator.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 536658243..4ddbdf1e4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -205,7 +205,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe @Override public void handlePacketData(ByteBuf dataStream) { - tier = EnergyCubeTier.getFromName(PacketHandler.readString(dataStream)); + tier = EnergyCubeTier.values()[dataStream.readInt()]; super.handlePacketData(dataStream); @@ -217,7 +217,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe @Override public ArrayList getNetworkedData(ArrayList data) { - data.add(tier.getBaseTier().getName()); + data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index d24e07d50..7e29e48d0 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -245,11 +245,11 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { boolean isTankEmpty = (fuelTank.getGas() == null); - if(isTankEmpty || fuelTank.getGas().isGasEqual(stack)) + if(canReceiveGas(side, stack.getGas()) && (isTankEmpty || fuelTank.getGas().isGasEqual(stack))) { - int fuelReceived = fuelTank.receive(stack, true); + int fuelReceived = fuelTank.receive(stack, doTransfer); - if(isTankEmpty && fuelReceived > 0) + if(doTransfer && isTankEmpty && fuelReceived > 0) { output = FuelHandler.getFuel(fuelTank.getGas().getGas()).energyPerTick*2; }