Proper fix

Author: kuroppoi

gameserver/src/main/java/brainwine/gameserver/zone/ZoneManager.java

@@ -47,20 +47,24 @@ public ZoneManager() {
             }
         }
 
-        if(zones.isEmpty()) {
-            logger.info(SERVER_MARKER, "No zones were loaded. Generating default zone ...");
-            ZoneGenerator generator = ZoneGenerator.getZoneGenerator(Biome.PLAIN);
-            
-            if(generator == null) {
-                logger.warn(SERVER_MARKER, "No generator for plain biomes was found! The default generator will be used.");
-                generator = ZoneGenerator.getDefaultZoneGenerator();
-            }
-            
-            Zone zone = generator.generateZone(Biome.PLAIN, 2000, 600);
-            addZone(zone);
-        } else {
-            logger.info(SERVER_MARKER, "Successfully loaded {} zone(s)", zonesByName.size());
+        logger.info(SERVER_MARKER, "Successfully loaded {} zone(s)", zonesByName.size());
+    }
+    
+    public void tryGenerateDefaultZone() {
+        if(!zones.isEmpty()) {
+            return;
         }
+        
+        logger.info(SERVER_MARKER, "No zones were loaded. Generating default zone ...");
+        ZoneGenerator generator = ZoneGenerator.getZoneGenerator(Biome.PLAIN);
+        
+        if(generator == null) {
+            logger.warn(SERVER_MARKER, "No generator for plain biomes was found! The default generator will be used.");
+            generator = ZoneGenerator.getDefaultZoneGenerator();
+        }
+        
+        Zone zone = generator.generateZone(Biome.PLAIN, 2000, 600);
+        addZone(zone);
     }
 
     public void tick(float deltaTime) {
@@ -213,6 +217,10 @@ public List<Zone> searchZones(Predicate<Zone> predicate, Comparator<Zone> compar
         return result;
     }
 
+    public int getZoneCount() {
+        return zones.size();
+    }
+    
     public Collection<Zone> getZones() {
         return zonesByName.values();
     }

gameserver/src/main/java/brainwine/gameserver/zone/gen/ZoneGenerator.java

@@ -159,8 +159,6 @@ public Zone generateZone(Biome biome, int width, int height) {
     public Zone generateZone(Biome biome, int width, int height, int seed) {
         String id = generateDocumentId(seed);
         String name = getRandomName();
-        
-        /*
         int retryCount = 0;
 
         while(GameServer.getInstance().getZoneManager().getZoneByName(name) != null) {
@@ -172,7 +170,7 @@ public Zone generateZone(Biome biome, int width, int height, int seed) {
 
             name = getRandomName();
             retryCount++;
-        }*/
+        }
 
         Zone zone = new Zone(id, name, biome, width, height);
         GeneratorContext ctx = new GeneratorContext(zone, seed);