mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-26 15:49:14 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #11340 - rare crash on city-state diplomatic relationship update

Browse Source
This commit is contained in:
Yair Morgenstern
2024-03-19 23:20:05 +02:00
parent efcf270b07
commit e04e1b8732
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
View File

@ -461,7 +461,7 @@ class CityStateFunctions(val civInfo: Civilization) {
// Check if city-state invaded by other civs // Check if city-state invaded by other civs
if (getNumThreateningBarbarians() > 0) return // Assume any players are there to fight barbarians if (getNumThreateningBarbarians() > 0) return // Assume any players are there to fight barbarians
for (otherCiv in civInfo.getKnownCivs().filter { it.isMajorCiv() }) { for (otherCiv in civInfo.getKnownCivs().filter { it.isMajorCiv() }.toList()) {
if (civInfo.isAtWarWith(otherCiv)) continue if (civInfo.isAtWarWith(otherCiv)) continue
if (otherCiv.hasUnique(UniqueType.CityStateTerritoryAlwaysFriendly)) continue if (otherCiv.hasUnique(UniqueType.CityStateTerritoryAlwaysFriendly)) continue
val diplomacy = civInfo.getDiplomacyManager(otherCiv) val diplomacy = civInfo.getDiplomacyManager(otherCiv)