Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
This commit is contained in:
commit
fbc5291a1d
1 changed files with 1 additions and 1 deletions
|
@ -145,7 +145,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
|
||||||
syncWithAll();
|
syncWithAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!tank.isEmpty()) {
|
if (!tank.isEmpty() && tank.getFluidType() != null && FluidPowerManager.fluidPowerValues.containsKey(tank.getFluidType())) {
|
||||||
double powerIn = FluidPowerManager.fluidPowerValues.get(tank.getFluidType());
|
double powerIn = FluidPowerManager.fluidPowerValues.get(tank.getFluidType());
|
||||||
if (getFreeSpace() >= powerIn) {
|
if (getFreeSpace() >= powerIn) {
|
||||||
addEnergy(powerIn, false);
|
addEnergy(powerIn, false);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue