From 00924ccd6827e353869a8febdaee8cf1e22cdae2 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 22 Nov 2014 01:33:07 -0800 Subject: [PATCH] Fix checking for fuels --- src/main/java/forestry/energy/gadgets/EngineBronze.java | 9 ++++++--- .../java/forestry/energy/gadgets/MachineGenerator.java | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index 3067baa5a..f70d439b9 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -201,9 +201,12 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa loss++; // Lose extra heat when using water as fuel. - EngineBronzeFuel fuel = FuelManager.bronzeEngineFuel.get(fuelTank.getFluid()); - if (fuel != null) - loss = loss * fuel.dissipationMultiplier; + if (fuelTank.getFluidAmount() > 0) { + FluidStack fuelFluidStack = fuelTank.getFluid(); + EngineBronzeFuel fuel = FuelManager.bronzeEngineFuel.get(fuelFluidStack.getFluid()); + if (fuel != null) + loss = loss * fuel.dissipationMultiplier; + } heat -= loss; return loss; diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 9ea87e404..949663f03 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -138,7 +138,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi ic2EnergySource.updateEntity(); if (resourceTank.getFluidAmount() > 0) { - GeneratorFuel fuel = FuelManager.generatorFuel.get(resourceTank.getFluid()); + GeneratorFuel fuel = FuelManager.generatorFuel.get(resourceTank.getFluid().getFluid()); if (resourceTank.getFluidAmount() >= fuel.fuelConsumed.amount && ic2EnergySource.getFreeCapacity() >= fuel.eu) { @@ -240,7 +240,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi if (container == null) return 0; - if (!FuelManager.generatorFuel.containsKey(container.fluid)) + if (container.fluid == null || !FuelManager.generatorFuel.containsKey(container.fluid.getFluid())) return 0; if (inventory.getStackInSlot(SLOT_CAN) == null) {