From 967dab21bc811e627dbaac0259c537c6fbc20497 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 23 Mar 2018 22:49:07 -0400
Subject: [PATCH] Extra conflict fixes

---
 server/src/io/anuke/mindustry/server/ServerControl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 74fee3237d..bf97973641 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -145,8 +145,7 @@ public class ServerControl extends Module {
                     return;
                 }
             }else{
-                while(result == null || result.visible)
-                    result = world.maps().getAllMaps().random();
+                result = world.maps().all().random();
             }
 
             GameMode mode = null;