Removed sandbox from shuffle list / duplicate maps / mobile mech pickup

2018-10-18 18:20:07 -04:00
parent 3b58d57e5c
commit dd2c71fe61
4 changed files with 13 additions and 7 deletions
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -112,7 +112,7 @@ public class ServerControl extends Module{
            if(Settings.getBool("shuffle")){
                if(world.getSector() == null){
                    if(world.maps.all().size > 0){
-                        Array<Map> maps = world.maps.all();
+                        Array<Map> maps = world.maps.customMaps().size == 0 ? world.maps.defaultMaps() : world.maps.customMaps();

                        Map previous = world.getMap();
                        Map map = previous;