AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 19:08:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #8490 - missionaries check if inquisitors block their religion, and not the religion of the unit's owner

Browse Source
This commit is contained in:
Yair Morgenstern 2023-01-29 18:31:35 +02:00
parent 072f08d440
commit 4ea644aa8d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/city/managers/CityReligionManager.kt
View File

@ -295,9 +295,7 @@ class CityReligionManager : IsPartOfGameInfoSerialization {
if (unit?.religion != null
&& (fromReligion == null || unit.religion != fromReligion)
&& unit.hasUnique(UniqueType.PreventSpreadingReligion)
) {
return true
}
) return true
}
}
return false

2
core/src/com/unciv/logic/civilization/managers/ReligionManager.kt
View File

@ -414,7 +414,7 @@ class ReligionManager : IsPartOfGameInfoSerialization {
if (missionary.getTile().getOwner() == null) return false
if (missionary.currentTile.owningCity?.religion?.getMajorityReligion()?.name == missionary.religion)
return false
if (missionary.getTile().getCity()!!.religion.isProtectedByInquisitor(religion!!.name)) return false
if (missionary.getTile().getCity()!!.religion.isProtectedByInquisitor(missionary.religion)) return false
return true
}