From 587c8c280cd37470072114890ac746d9c0bfc02e Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 12 May 2023 12:16:32 -0400 Subject: [PATCH] Better VariableReactorBuild explosion check --- core/src/mindustry/world/blocks/power/PowerGenerator.java | 6 +++++- core/src/mindustry/world/blocks/power/VariableReactor.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/power/PowerGenerator.java b/core/src/mindustry/world/blocks/power/PowerGenerator.java index 4b23baae9f..966c2c48d0 100644 --- a/core/src/mindustry/world/blocks/power/PowerGenerator.java +++ b/core/src/mindustry/world/blocks/power/PowerGenerator.java @@ -110,8 +110,12 @@ public class PowerGenerator extends PowerDistributor{ } } + public boolean shouldExplode(){ + return warmup() >= explosionMinWarmup; + } + public void createExplosion(){ - if(warmup() >= explosionMinWarmup){ + if(shouldExplode()){ if(explosionDamage > 0){ Damage.damage(x, y, explosionRadius * tilesize, explosionDamage); } diff --git a/core/src/mindustry/world/blocks/power/VariableReactor.java b/core/src/mindustry/world/blocks/power/VariableReactor.java index 891a25d573..2f8d81dd0f 100644 --- a/core/src/mindustry/world/blocks/power/VariableReactor.java +++ b/core/src/mindustry/world/blocks/power/VariableReactor.java @@ -92,6 +92,11 @@ public class VariableReactor extends PowerGenerator{ } } + @Override + public boolean shouldExplode(){ + return heat > 0f; + } + @Override public void draw(){ super.draw();