From f85bedeb2fb698ed16bf674699263cfaf7a3ff4c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 19 Jul 2021 23:00:05 +0300 Subject: [PATCH] Faster filtering to avoid some ANRs --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 4a8a848bf8..32dd223de1 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -27,9 +27,9 @@ import com.unciv.ui.victoryscreen.RankingType import java.util.* import kotlin.collections.ArrayList import kotlin.collections.HashMap -import kotlin.math.roundToInt import kotlin.math.min import kotlin.math.pow +import kotlin.math.roundToInt class CivilizationInfo { @@ -251,7 +251,7 @@ class CivilizationInfo { // Does not return local uniques, only global ones. fun getMatchingUniques(uniqueTemplate: String, cityToIgnore: CityInfo? = null): Sequence { return nation.uniqueObjects.asSequence().filter { it.placeholderText == uniqueTemplate } + - cities.filter { it != cityToIgnore}.flatMap { + cities.asSequence().filter { it != cityToIgnore}.flatMap { city -> city.getMatchingUniquesWithNonLocalEffects(uniqueTemplate) } + policies.policyUniques.getUniques(uniqueTemplate) +