Merge pull request #2152 from Dannerick/myDev1

Fix for a gas-generator with empty tank throwing exception (bug #2148)
This commit is contained in:
Aidan 2015-02-24 08:39:27 -05:00
commit 995c798767

View file

@ -266,7 +266,8 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
fuelTank.read(nbtTags.getCompoundTag("fuelTank"));
FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas());
boolean isTankEmpty = (fuelTank.getGas() == null);
FuelGas fuel = (isTankEmpty) ? null : FuelHandler.getFuel(fuelTank.getGas().getGas());
if(fuel != null)
{