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

Better built-in shuffle

Browse Source
This commit is contained in:
Anuken
2020-06-14 14:50:04 -04:00
parent 5370874686
commit 126b54b981
24 changed files with 41 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,7 @@ public class ServerControl implements ApplicationListener{
}
//set next map to be played
Map map = nextMapOverride != null ? nextMapOverride : maps.getNextMap(state.map);
Map map = nextMapOverride != null ? nextMapOverride : maps.getNextMap(lastMode, state.map);
nextMapOverride = null;
if(map != null){
Call.onInfoMessage((state.rules.pvp
@@ -209,19 +209,6 @@ public class ServerControl implements ApplicationListener{
}
if(lastTask != null) lastTask.cancel();
Map result;
if(arg.length > 0){
result = maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0]));
if(result == null){
err("No map with name &y'@'&lr found.", arg[0]);
return;
}
}else{
result = maps.getShuffleMode().next(state.map);
info("Randomized next map to be @.", result.name());
}
Gamemode preset = Gamemode.survival;
@@ -233,6 +220,19 @@ public class ServerControl implements ApplicationListener{
return;
}
}
Map result;
if(arg.length > 0){
result = maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0]));
if(result == null){
err("No map with name &y'@'&lr found.", arg[0]);
return;
}
}else{
result = maps.getShuffleMode().next(preset, state.map);
info("Randomized next map to be @.", result.name());
}
info("Loading map...");