From 7feed8828ce8cc3cd2e597b186f7b4f349449d67 Mon Sep 17 00:00:00 2001 From: Zachary Date: Sat, 16 Nov 2019 13:16:09 +0800 Subject: [PATCH 1/2] Increase time taken for reactor to explode (#1067) yes --- .../io/anuke/mindustry/world/blocks/power/NuclearReactor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java index 9a1d12ac39..0fd3e693d6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -33,7 +33,7 @@ public class NuclearReactor extends PowerGenerator{ protected Color coolColor = new Color(1, 1, 1, 0f); protected Color hotColor = Color.valueOf("ff9575a3"); protected float itemDuration = 120; //time to consume 1 fuel - protected float heating = 0.01f; //heating per frame * fullness + protected float heating = 0.005f; //heating per frame * fullness protected float smokeThreshold = 0.3f; //threshold at which block starts smoking protected int explosionRadius = 40; protected int explosionDamage = 1350; From 083f2e38d45bca12b5676cf3f4cf6b47a439eaae Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 16 Nov 2019 09:37:09 -0500 Subject: [PATCH 2/2] Update BuilderTrait.java --- core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index a4c59b4d53..bb02ed792d 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -113,7 +113,7 @@ public interface BuilderTrait extends Entity, TeamTrait{ /** @return whether this request should be skipped, in favor of the next one. */ default boolean shouldSkip(BuildRequest request, @Nullable TileEntity core){ //requests that you have at least *started* are considered - if(state.rules.infiniteResources || request.breaking || !request.initialized) return false; + if(state.rules.infiniteResources || request.breaking || !request.initialized || core == null) return false; return request.stuck && !core.items.has(request.block.requirements); }