upstream/ForestryMC
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForestryMC.git synced 2026-11-14 01:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix checking for fuels

Browse Source
This commit is contained in:
mezz committed 2014-11-22 01:38:43 -08:00
1 parent e251d28893
commit 00924ccd68
2 files changed
+8 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/forestry/energy/gadgets/EngineBronze.java
+6 -3
View File
@@ -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;
src/main/java/forestry/energy/gadgets/MachineGenerator.java
+2 -2
View File
@@ -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) {