mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-31 15:09:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-08-27 13:45:07 -04:00
parent fba7f7592b
commit 92aba83450
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ public class ServerControl implements ApplicationListener{
private Fi currentLogFile;
private boolean inExtraRound;
private Task lastTask;
private Gamemode lastMode = Gamemode.survival;
private Gamemode lastMode;
private @Nullable Map nextMapOverride;
private Interval autosaveCount = new Interval();
@ -67,6 +67,12 @@ public class ServerControl implements ApplicationListener{
//update log level
Config.debug.set(Config.debug.bool());
try{
lastMode = Gamemode.valueOf(Core.settings.getString("lastServerMode", "survival"));
}catch(Exception e){ //handle enum parse exception
lastMode = Gamemode.survival;
}
Log.setLogger((level, text) -> {
String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(tags[level.ordinal()] + " " + text + "&fr");
System.out.println(result);
@ -304,6 +310,7 @@ public class ServerControl implements ApplicationListener{
logic.reset();
lastMode = preset;
Core.settings.put("lastServerMode", lastMode.name());
try{
world.loadMap(result, result.applyRules(lastMode));
state.rules = result.applyRules(preset);