From 2a1fe5b3e9efeb8a7a2b542bfdbdeda953909cf3 Mon Sep 17 00:00:00 2001 From: brian lewis Date: Sun, 15 Mar 2015 19:26:12 -0500 Subject: [PATCH] [#2210] fix for NPE on placing an empty gas-burning generator --- .../generators/common/tile/TileEntityGasGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index d24fc8969..646bec3c4 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -323,8 +323,9 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { fuelTank.read(itemStack.stackTagCompound.getCompoundTag("fuelTank")); + boolean isTankEmpty = (fuelTank.getGas() == null); //Update energy output based on any existing fuel in tank - FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas()); + FuelGas fuel = (isTankEmpty) ? null : FuelHandler.getFuel(fuelTank.getGas().getGas()); if(fuel != null) {