From 4ea644aa8d13b026e87def9122b320eee7292fc3 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 29 Jan 2023 18:31:35 +0200 Subject: [PATCH] Resolved #8490 - missionaries check if inquisitors block their religion, and not the religion of the unit's owner --- core/src/com/unciv/logic/city/managers/CityReligionManager.kt | 4 +--- .../com/unciv/logic/civilization/managers/ReligionManager.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/logic/city/managers/CityReligionManager.kt b/core/src/com/unciv/logic/city/managers/CityReligionManager.kt index 006b9faddb..9aa5447d9b 100644 --- a/core/src/com/unciv/logic/city/managers/CityReligionManager.kt +++ b/core/src/com/unciv/logic/city/managers/CityReligionManager.kt @@ -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 diff --git a/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt b/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt index ac696edbba..b3c182a70c 100644 --- a/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/ReligionManager.kt @@ -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 }