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

Fixed #10815

Browse Source
This commit is contained in:
Anuken
2025-05-16 14:14:09 -04:00
parent 4abbd1a0f8
commit adb7264bc4
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/mindustry/server/ServerControl.java
View File

@@ -381,24 +381,28 @@ public class ServerControl implements ApplicationListener{
} }
}else{ }else{
result = maps.getShuffleMode().next(preset, state.map); result = maps.getShuffleMode().next(preset, state.map);
info("Randomized next map to be @.", result.plainName()); if(result != null){
info("Randomized next map to be @.", result.plainName());
}
} }
info("Loading map..."); info("Loading map...");
logic.reset(); logic.reset();
lastMode = preset; if(result != null){
Core.settings.put("lastServerMode", lastMode.name()); lastMode = preset;
try{ Core.settings.put("lastServerMode", lastMode.name());
world.loadMap(result, result.applyRules(lastMode)); try{
state.rules = result.applyRules(preset); world.loadMap(result, result.applyRules(lastMode));
logic.play(); state.rules = result.applyRules(preset);
logic.play();
info("Map loaded."); info("Map loaded.");
netServer.openServer(); netServer.openServer();
}catch(MapException e){ }catch(MapException e){
err("@: @", e.map.plainName(), e.getMessage()); err("@: @", e.map.plainName(), e.getMessage());
}
} }
}); });