Merge branch 'development' into 1.8

This commit is contained in:
Ben Spiers 2014-07-30 15:15:42 +01:00
commit bfe3b545d2

View file

@ -44,7 +44,7 @@ public class GuiGasGauge extends GuiGauge<Gas>
return dummyType.getIcon();
}
return infoHandler.getTank().getGas().getGas().getIcon();
return (infoHandler.getTank() != null && infoHandler.getTank().getGas() != null && infoHandler.getTank().getGas().getGas() != null) ? infoHandler.getTank().getGas().getGas().getIcon() : null;
}
@Override