From 67552add7810e90f321489c0a9d62596e8860e0a Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 7 Sep 2022 08:09:04 -0400 Subject: [PATCH] Fixed #7526 --- core/src/mindustry/core/World.java | 5 +++++ core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index 2d5560c449..3922c65908 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -272,6 +272,10 @@ public class World{ state.rules.sector = sector; }); + if(saveInfo && state.rules.waves){ + sector.info.waves = state.rules.waves; + } + //postgenerate for bases if(sector.preset == null && sector.planet.generator != null){ sector.planet.generator.postGenerate(tiles); @@ -314,6 +318,7 @@ public class World{ sector.planet.applyRules(state.rules); sector.info.resources = content.toSeq(); sector.info.resources.sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id))); + if(saveInfo){ sector.saveInfo(); } diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 1959b552ef..41c0450081 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -644,7 +644,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ float waveTimeDec = 0.4f; state.rules.waveSpacing = Mathf.lerp(60 * 65 * 2, 60f * 60f * 1f, Math.max(difficulty - waveTimeDec, 0f)); - state.rules.waves = sector.info.waves = true; + state.rules.waves = true; state.rules.env = sector.planet.defaultEnv; state.rules.enemyCoreBuildRadius = 600f;