From 9efcc4f423cd72decdbd05a8a7a88ee71b1bb61f Mon Sep 17 00:00:00 2001
From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Date: Thu, 15 Jul 2021 09:38:26 +0200
Subject: [PATCH] Fixed bug where great prophets could be chosen as free great
 persons when religion was disabled (#4518)

---
 core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index eafd79bf3b..4a8a848bf8 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -458,8 +458,12 @@ class CivilizationInfo {
     }
 
 
-    fun getGreatPeople() = gameInfo.ruleSet.units.values.asSequence()
-            .filter { it.isGreatPerson() }.map { getEquivalentUnit(it.name) }.toHashSet()
+    fun getGreatPeople(): HashSet<BaseUnit> {
+        val greatPeople = gameInfo.ruleSet.units.values.asSequence()
+            .filter { it.isGreatPerson() }.map { getEquivalentUnit(it.name) }
+        return if (!gameInfo.hasReligionEnabled()) greatPeople.filter { !it.uniques.contains("Great Person - [Faith]")}.toHashSet()
+        else greatPeople.toHashSet()
+    }
 
     //endregion