From dcb1be8e9bf756df576fcd3c9aeee5107a4a016b Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 26 Jan 2022 22:31:31 +0200
Subject: [PATCH] Welp, turns out I forgot to apply conditionals

---
 core/src/com/unciv/models/ruleset/IHasUniques.kt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/models/ruleset/IHasUniques.kt b/core/src/com/unciv/models/ruleset/IHasUniques.kt
index 4fcfde9057..68249a4b17 100644
--- a/core/src/com/unciv/models/ruleset/IHasUniques.kt
+++ b/core/src/com/unciv/models/ruleset/IHasUniques.kt
@@ -19,9 +19,11 @@ interface IHasUniques {
      * But making this a function is relevant for future "unify Unciv object" plans ;)
      * */
     fun getUniqueTarget(): UniqueTarget
-    
-    fun getMatchingUniques(uniqueTemplate: String, stateForConditionals: StateForConditionals? = null) = 
-        uniqueMap[uniqueTemplate]?.asSequence() ?: sequenceOf()
+
+    fun getMatchingUniques(uniqueTemplate: String, stateForConditionals: StateForConditionals? = null): Sequence<Unique> {
+        val matchingUniques = uniqueMap[uniqueTemplate] ?: return sequenceOf()
+        return matchingUniques.asSequence().filter { it.conditionalsApply(stateForConditionals) }
+    }
 
     fun getMatchingUniques(uniqueType: UniqueType, stateForConditionals: StateForConditionals? = null) =
         getMatchingUniques(uniqueType.placeholderText, stateForConditionals)