From 884c7b7bb86000febb1c1ec3d0b2673b58603239 Mon Sep 17 00:00:00 2001
From: Duan Tao <duantao@live.cn>
Date: Fri, 26 Apr 2019 12:09:03 +0800
Subject: [PATCH] Fixed : Trying to move into border of uncountered civs caused
 crash.

---
 core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index 4f1cf567..3cac2b5e 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -426,6 +426,8 @@ class CivilizationInfo {
 
     fun canEnterTiles(otherCiv: CivilizationInfo): Boolean {
         if(otherCiv==this) return true
+        if(!diplomacy.containsKey(otherCiv.civName)) // not encountered yet
+            return false
         if(isAtWarWith(otherCiv)) return true
         if(getDiplomacyManager(otherCiv).hasOpenBorders) return true
         return false