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

Fixed a small Gas Generator crash

Browse source
This commit is contained in:
aidancbrady 2015-05-28 16:22:00 -04:00
parent f95bfbb600
commit b6264891f1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
View file

@ -205,7 +205,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe
@Override @Override
public void handlePacketData(ByteBuf dataStream) public void handlePacketData(ByteBuf dataStream)
{ {
tier = EnergyCubeTier.getFromName(PacketHandler.readString(dataStream)); tier = EnergyCubeTier.values()[dataStream.readInt()];
super.handlePacketData(dataStream); super.handlePacketData(dataStream);
@ -217,7 +217,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe
@Override @Override
public ArrayList getNetworkedData(ArrayList data) public ArrayList getNetworkedData(ArrayList data)
{ {
data.add(tier.getBaseTier().getName()); data.add(tier.ordinal());
super.getNetworkedData(data); super.getNetworkedData(data);

6
src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
View file

@ -245,11 +245,11 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
{ {
boolean isTankEmpty = (fuelTank.getGas() == null); 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; output = FuelHandler.getFuel(fuelTank.getGas().getGas()).energyPerTick*2;
} }