Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #7143

Browse Source
This commit is contained in:
Anuken
2022-07-07 11:09:01 -04:00
parent a8a87e94be
commit 64a30adb9b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/mindustry/core/World.java
View File

@@ -252,11 +252,11 @@ public class World{
} }
public void loadSector(Sector sector){ public void loadSector(Sector sector){
loadSector(sector, 0); loadSector(sector, 0, true);
} }
public void loadSector(Sector sector, int seedOffset){ public void loadSector(Sector sector, int seedOffset, boolean saveInfo){
setSectorRules(sector); setSectorRules(sector, saveInfo);
int size = sector.getSize(); int size = sector.getSize();
loadGenerator(size, size, tiles -> { loadGenerator(size, size, tiles -> {
@@ -278,14 +278,14 @@ public class World{
} }
//reset rules //reset rules
setSectorRules(sector); setSectorRules(sector, saveInfo);
if(state.rules.defaultTeam.core() != null){ if(state.rules.defaultTeam.core() != null){
sector.info.spawnPosition = state.rules.defaultTeam.core().pos(); 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.map = new Map(StringMap.of("name", sector.preset == null ? sector.planet.localizedName + "; Sector " + sector.id : sector.preset.localizedName));
state.rules.sector = sector; state.rules.sector = sector;
state.rules.weather.clear(); state.rules.weather.clear();
@@ -314,7 +314,9 @@ public class World{
sector.planet.applyRules(state.rules); sector.planet.applyRules(state.rules);
sector.info.resources = content.toSeq(); sector.info.resources = content.toSeq();
sector.info.resources.sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id))); 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){ public Context filterContext(Map map){

2
core/src/mindustry/editor/SectorGenerateDialog.java
View File

@@ -93,7 +93,7 @@ public class SectorGenerateDialog extends BaseDialog{
var preset = sectorobj.preset; var preset = sectorobj.preset;
sectorobj.preset = null; sectorobj.preset = null;
world.loadSector(sectorobj, seed); world.loadSector(sectorobj, seed, false);
sectorobj.preset = preset; sectorobj.preset = preset;