From 51aef06564fc1b1fccbc56891cfd087ef75c2c3d Mon Sep 17 00:00:00 2001 From: Parker Young Date: Sat, 20 Sep 2014 21:10:24 -0400 Subject: [PATCH] Fixed engines generating energy without being active. Whoops. --- src/main/java/forestry/core/gadgets/Engine.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 2c3cc9f9a..bf5a4ecd0 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -132,7 +132,9 @@ public abstract class Engine extends TileBase implements IEnergyHandler { @Override public void updateServerSide() { //doWork appears to be called before updateServerSide, so it's contents have been moved to here. - energyStorage.modifyEnergyStored(energyStorage.getMaxReceive()); + if(isActive) { + energyStorage.modifyEnergyStored(energyStorage.getMaxReceive()); + } TemperatureState energyState = getTemperatureState(); if (energyState == TemperatureState.MELTING && heat > 0) @@ -248,14 +250,6 @@ public abstract class Engine extends TileBase implements IEnergyHandler { return 0; } - /** - * @deprecated Use {@link #getEnergyStored(net.minecraftforge.common.util.ForgeDirection)} instead - */ - @Deprecated - public float getEnergyStored() { - return energyStorage.getEnergyStored(); - } - public int getHeat() { return heat; }