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

Merge branch 'master' into development

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-16 11:03:07 -04:00
commit 77c68b05bf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -324,8 +324,9 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
{ {
fuelTank.read(itemStack.stackTagCompound.getCompoundTag("fuelTank")); fuelTank.read(itemStack.stackTagCompound.getCompoundTag("fuelTank"));
boolean isTankEmpty = (fuelTank.getGas() == null);
//Update energy output based on any existing fuel in tank //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) if(fuel != null)
{ {