From 64a30adb9b7776afb9b2e2b697b55e302432c89f Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 7 Jul 2022 11:09:01 -0400 Subject: [PATCH] Fixed #7143 --- core/src/mindustry/core/World.java | 14 ++++++++------ .../src/mindustry/editor/SectorGenerateDialog.java | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index 6872b5df95..2a9bf5f8a8 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -252,11 +252,11 @@ public class World{ } public void loadSector(Sector sector){ - loadSector(sector, 0); + loadSector(sector, 0, true); } - public void loadSector(Sector sector, int seedOffset){ - setSectorRules(sector); + public void loadSector(Sector sector, int seedOffset, boolean saveInfo){ + setSectorRules(sector, saveInfo); int size = sector.getSize(); loadGenerator(size, size, tiles -> { @@ -278,14 +278,14 @@ public class World{ } //reset rules - setSectorRules(sector); + setSectorRules(sector, saveInfo); if(state.rules.defaultTeam.core() != null){ sector.info.spawnPosition = state.rules.defaultTeam.core().pos(); } } - private void setSectorRules(Sector sector){ + private void setSectorRules(Sector sector, boolean saveInfo){ state.map = new Map(StringMap.of("name", sector.preset == null ? sector.planet.localizedName + "; Sector " + sector.id : sector.preset.localizedName)); state.rules.sector = sector; state.rules.weather.clear(); @@ -314,7 +314,9 @@ 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))); - sector.saveInfo(); + if(saveInfo){ + sector.saveInfo(); + } } public Context filterContext(Map map){ diff --git a/core/src/mindustry/editor/SectorGenerateDialog.java b/core/src/mindustry/editor/SectorGenerateDialog.java index 4a56276644..f51b55f443 100644 --- a/core/src/mindustry/editor/SectorGenerateDialog.java +++ b/core/src/mindustry/editor/SectorGenerateDialog.java @@ -93,7 +93,7 @@ public class SectorGenerateDialog extends BaseDialog{ var preset = sectorobj.preset; sectorobj.preset = null; - world.loadSector(sectorobj, seed); + world.loadSector(sectorobj, seed, false); sectorobj.preset = preset;