diff --git a/core/assets/version.properties b/core/assets/version.properties index 9940cfc1b4..0b99ba2e94 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sun Feb 11 17:04:14 EST 2018 +#Sun Feb 11 19:23:12 EST 2018 version=beta -androidBuildCode=172 +androidBuildCode=173 name=Mindustry code=3.3 build=custom build diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 10db02132b..2dda0b6ba0 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -71,20 +71,23 @@ public class ServerControl extends Module { state.set(State.menu); Net.closeServer(); - if(mode != ShuffleMode.off) { - Array maps = mode == ShuffleMode.both ? world.maps().getAllMaps() : - mode == ShuffleMode.normal ? world.maps().getDefaultMaps() : world.maps().getCustomMaps(); + Timers.runTask(30f, () -> { - Map previous = world.getMap(); - Map map = previous; - while(map == previous || !map.visible) map = maps.random(); + if (mode != ShuffleMode.off) { + Array maps = mode == ShuffleMode.both ? world.maps().getAllMaps() : + mode == ShuffleMode.normal ? world.maps().getDefaultMaps() : world.maps().getCustomMaps(); - info("Selected next map to be {0}.", map.name); - state.set(State.playing); - logic.reset(); - world.loadMap(map); - host(); - } + Map previous = world.getMap(); + Map map = previous; + while (map == previous || !map.visible) map = maps.random(); + + info("Selected next map to be {0}.", map.name); + state.set(State.playing); + logic.reset(); + world.loadMap(map); + host(); + } + }); }); });