From 115aef50ad25cdc9e870ac0f06697207a2d9e60f Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 10 Mar 2019 23:03:25 +0200
Subject: [PATCH] Better starting locations on tiny map with lots of players

---
 core/src/com/unciv/GameStarter.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/GameStarter.kt b/core/src/com/unciv/GameStarter.kt
index db2aa052d1..eb8c30db53 100644
--- a/core/src/com/unciv/GameStarter.kt
+++ b/core/src/com/unciv/GameStarter.kt
@@ -10,6 +10,7 @@ import com.unciv.logic.map.TileMap
 import com.unciv.models.gamebasics.GameBasics
 import com.unciv.ui.utils.getRandom
 import java.util.*
+import kotlin.math.min
 
 
 class GameParameters{
@@ -77,7 +78,7 @@ class GameStarter{
     fun getStartingLocations(numberOfPlayers:Int,tileMap: TileMap): Stack<TileInfo> {
         for(minimumDistanceBetweenStartingLocations in 7 downTo 0){
             val freeTiles = tileMap.values
-                    .filter { it.isLand() && vectorIsWithinNTilesOfEdge(it.position,3,tileMap)}
+                    .filter { it.isLand() && vectorIsWithinNTilesOfEdge(it.position,min(3,minimumDistanceBetweenStartingLocations),tileMap)}
                     .toMutableList()
 
             val startingLocations = ArrayList<TileInfo>()