Ticket #4152: heightmapFix2016-11-23.patch

binaries/data/mods/public/maps/random/heightmap/heightmap.js

@@ -119 +119 @@
                 if (!isCircular || r - getDistance(x, y, r, r) >= minDistance) // Is far enough away from map border
                     validTiles.push({ "x": x, "y": y });
 
-    for (let tries = 0; tries < maxTries; ++tries)
+    if (validTiles.length)
     {
-        let tile = validTiles[randInt(validTiles.length)];
-        let isValid = true;
-        for (let p = 0; p < placements.length; ++p)
+        for (let tries = 0; tries < maxTries; ++tries)
         {
-            if (getDistance(placements[p].x, placements[p].y, tile.x, tile.y) < minDistance)
+            let tile = validTiles[randInt(validTiles.length)];
+            let isValid = true;
+            for (let p = 0; p < placements.length; ++p)
             {
-                isValid = false;
-                break;
+                if (getDistance(placements[p].x, placements[p].y, tile.x, tile.y) < minDistance)
+                {
+                    isValid = false;
+                    break;
+                }
             }
+            if (isValid)
+            {
+                placeObject(tile.x, tile.y, entityList[randInt(entityList.length)], 0, randFloat(0, 2*PI));
+                placements.push(tile);
+            }
         }
-        if (isValid)
-        {
-            placeObject(tile.x, tile.y, entityList[randInt(entityList.length)], 0, randFloat(0, 2*PI));
-            placements.push(tile);
-        }
     }
+    else
+    {
+        log("No validTiles found for the given arguments! " +  new Error().stack);
+    }
 }
 
 /**