Fixed a small Gas Generator crash
This commit is contained in:
parent
f95bfbb600
commit
b6264891f1
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue