From 0c396f76b2920e9366d428b73fb1b5937897e420 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 3 May 2019 00:13:37 -0400 Subject: [PATCH] Fixed impact reactor warming up without satisfied power --- .../items/item-thorium.png | Bin 2786 -> 2757 bytes .../world/blocks/power/ImpactReactor.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets-raw/sprites_replacement/items/item-thorium.png b/core/assets-raw/sprites_replacement/items/item-thorium.png index ebb385b40d43473da8217216e5fb1801047b661c..709a4a10465ffc532f3c3c05cf78758e729e4607 100644 GIT binary patch delta 2146 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 JWt~$(69B@XBryO0 diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java index 6a4823069a..8d6dc5e17e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java @@ -76,7 +76,7 @@ public class ImpactReactor extends PowerGenerator{ public void update(Tile tile){ FusionReactorEntity entity = tile.entity(); - if(entity.cons.valid()){ + if(entity.cons.valid() && entity.power.satisfaction >= 0.99f){ entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, warmupSpeed); if(Mathf.isEqual(entity.warmup, 1f, 0.001f)){ entity.warmup = 1f;