From f94c442a556b4c14b99d7d923772a6019c33aea6 Mon Sep 17 00:00:00 2001 From: Henry Loenwind Date: Wed, 10 Aug 2016 22:40:03 +0200 Subject: [PATCH] Backport: Prevent generators from stalling if they are configured to produce more RF/t than normal --- .../machine/generator/combustion/TileCombustionGenerator.java | 2 +- .../enderio/machine/generator/zombie/TileZombieGenerator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index 17001332..c1b15f03 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -214,7 +214,7 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements //flickering on and off constantly when powering a machine that draws less than this produces if(inPause) { int powerPerCycle = getPowerPerCycle(); - if(getEnergyStored() >= (getMaxEnergyStored() - (powerPerCycle * 200))) { + if (getEnergyStored() >= (getMaxEnergyStored() - (powerPerCycle * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) { return false; } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index ca26774c..49997918 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -146,7 +146,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu //once full, don't start again until we have drained 10 seconds worth of power to prevent //flickering on and off constantly when powering a machine that draws less than this produces - if(inPause && getEnergyStored() >= (getMaxEnergyStored() - (outputPerTick * 200))) { + if (inPause && getEnergyStored() >= (getMaxEnergyStored() - (outputPerTick * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) { return false; } inPause = false;