Merge remote-tracking branch 'remotes/origin/master' into 1.8.8

This commit is contained in:
Modmuss50 2015-12-14 18:14:12 +00:00
commit fbc5291a1d

View file

@ -145,7 +145,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
syncWithAll();
}
if (!tank.isEmpty()) {
if (!tank.isEmpty() && tank.getFluidType() != null && FluidPowerManager.fluidPowerValues.containsKey(tank.getFluidType())) {
double powerIn = FluidPowerManager.fluidPowerValues.get(tank.getFluidType());
if (getFreeSpace() >= powerIn) {
addEnergy(powerIn, false);