AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-10-03 08:56:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash from conquering cities (#4877)

Browse Source
This commit is contained in:
Xander Lenstra 2021-08-16 15:58:53 +02:00 committed by GitHub
parent df31fb2f05
commit 8d49a84f78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
View File

@ -216,7 +216,7 @@ class CityInfoConquestFunctions(val city: CityInfo){
} }
} }
religion.removeUnknownPantheons() if (civInfo.gameInfo.hasReligionEnabled()) religion.removeUnknownPantheons()
tryUpdateRoadStatus() tryUpdateRoadStatus()
} }

1
core/src/com/unciv/logic/city/CityReligion.kt
View File

@ -171,6 +171,7 @@ class CityInfoReligionManager {
*/ */
fun removeUnknownPantheons() { fun removeUnknownPantheons() {
for (pressure in pressures) { for (pressure in pressures) {
if (pressure.key == Constants.noReligionName) continue
val correspondingReligion = cityInfo.civInfo.gameInfo.religions[pressure.key]!! val correspondingReligion = cityInfo.civInfo.gameInfo.religions[pressure.key]!!
if (correspondingReligion.isPantheon() if (correspondingReligion.isPantheon()
&& correspondingReligion.foundingCivName != cityInfo.civInfo.civName && correspondingReligion.foundingCivName != cityInfo.civInfo.civName