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

Fixed server map shuffling

Browse Source
This commit is contained in:
Anuken
2019-09-29 10:06:17 -04:00
parent 2019196f65
commit 4210070d07
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=151dc8b70276b74c612d23b01573f7a8452c2b69 archash=d4519a9721927165850bfe3135ef6b095c990474

4
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -155,7 +155,7 @@ public class ServerControl implements ApplicationListener{
maps.shuffle(); maps.shuffle();
Map previous = world.getMap(); Map previous = world.getMap();
Map map = maps.find(m -> m != previous); Map map = maps.find(m -> m != previous || maps.size == 1);
if(map != null){ if(map != null){
@@ -168,6 +168,8 @@ public class ServerControl implements ApplicationListener{
info("Selected next map to be {0}.", map.name()); info("Selected next map to be {0}.", map.name());
play(true, () -> world.loadMap(map, map.applyRules(lastMode))); play(true, () -> world.loadMap(map, map.applyRules(lastMode)));
}else{
Log.err("No suitable map found.");
} }
} }
}else{ }else{