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

Fixed a crash when marrying a city-state without cities (#7684)

Browse Source
This commit is contained in:
Xander Lenstra
2022-08-20 20:11:25 +02:00
committed by GitHub
parent e78d929b33
commit 089e762f72
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,6 +284,7 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
fun canBeMarriedBy(otherCiv: CivilizationInfo): Boolean {
return (!civInfo.isDefeated()
&& civInfo.isCityState()
&& civInfo.cities.any()
&& civInfo.getDiplomacyManager(otherCiv).relationshipLevel() == RelationshipLevel.Ally
&& !otherCiv.getDiplomacyManager(civInfo).hasFlag(DiplomacyFlags.MarriageCooldown)
&& otherCiv.getMatchingUniques(UniqueType.CityStateCanBeBoughtForGold).any()