wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed : Trying to move into border of uncountered civs caused crash.

Browse source
This commit is contained in:
Duan Tao 2019-04-26 12:09:03 +08:00 committed by Yair Morgenstern
parent 68c2763ea7
commit 884c7b7bb8
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View file

@ -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