diff --git a/core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt index d8c7d57e92..3e6ba788aa 100644 --- a/core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt @@ -629,7 +629,11 @@ object SpecificUnitAutomation { return } - UnitActionsReligion.getFoundReligionAction(unit)() + val foundReligionAction = UnitActions.getUnitActions(unit) + .firstOrNull { it.type == UnitActionType.FoundReligion } + ?.action ?: return + + foundReligionAction() } fun enhanceReligion(unit: MapUnit) { diff --git a/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsReligion.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsReligion.kt index 2bc5157a3a..572db85c34 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsReligion.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsReligion.kt @@ -19,17 +19,13 @@ object UnitActionsReligion { if (!unit.civ.religionManager.mayFoundReligionAtAll(unit)) return actionList += UnitAction( UnitActionType.FoundReligion, - action = getFoundReligionAction(unit).takeIf { unit.civ.religionManager.mayFoundReligionNow(unit) } + action = { + unit.civ.religionManager.foundReligion(unit) + unit.consume() + }.takeIf { unit.civ.religionManager.mayFoundReligionNow(unit) } ) } - fun getFoundReligionAction(unit: MapUnit): () -> Unit { - return { - unit.civ.religionManager.foundReligion(unit) - unit.consume() - } - } - internal fun addEnhanceReligionAction(unit: MapUnit, actionList: ArrayList) { if (!unit.hasUnique(UniqueType.MayEnhanceReligion)) return if (!unit.civ.religionManager.mayEnhanceReligionAtAll(unit)) return