From ea664e55f8de32872ccca4de49e2195d1bcb0347 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 2 Nov 2014 17:03:46 +0800 Subject: [PATCH] #1176 Stirling Gen not outputting as much power as it generates when base rate changed in config --- ReleaseNotes.txt | 3 ++- .../generator/stirling/TileEntityStirlingGenerator.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 83864880..df6fba56 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -15,7 +15,8 @@ Changes Bugs - #1162 Infinite Broken-Spawner exploit with Twilight Forest -- #1170 Dimensional Transceiver liquid related crash +- #1170 Dimensional Transceiver infinite loop with liquids +- #1176 Stirling Gen not outputting as much power as it generates when base rate changed in config - Transceiver item buffers would allow multiple non-stackable items of the same type diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index b90abbab..d41fa1a4 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -173,7 +173,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); } - int canTransmit = Math.min(getEnergyStored(), capacitorType.capacitor.getMaxEnergyExtracted()); + int canTransmit = Math.min(getEnergyStored(), getPowerUsePerTick() * 2); if(canTransmit <= 0) { return false; }