AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 22:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Faster filtering to avoid some ANRs

Browse Source
This commit is contained in:
Yair Morgenstern 2021-07-19 23:00:05 +03:00
parent bdf46ea66c
commit f85bedeb2f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -27,9 +27,9 @@ import com.unciv.ui.victoryscreen.RankingType
import java.util.* import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
import kotlin.collections.HashMap import kotlin.collections.HashMap
import kotlin.math.roundToInt
import kotlin.math.min import kotlin.math.min
import kotlin.math.pow import kotlin.math.pow
import kotlin.math.roundToInt
class CivilizationInfo { class CivilizationInfo {
@ -251,7 +251,7 @@ class CivilizationInfo {
// Does not return local uniques, only global ones. // Does not return local uniques, only global ones.
fun getMatchingUniques(uniqueTemplate: String, cityToIgnore: CityInfo? = null): Sequence<Unique> { fun getMatchingUniques(uniqueTemplate: String, cityToIgnore: CityInfo? = null): Sequence<Unique> {
return nation.uniqueObjects.asSequence().filter { it.placeholderText == uniqueTemplate } + return nation.uniqueObjects.asSequence().filter { it.placeholderText == uniqueTemplate } +
cities.filter { it != cityToIgnore}.flatMap { cities.asSequence().filter { it != cityToIgnore}.flatMap {
city -> city.getMatchingUniquesWithNonLocalEffects(uniqueTemplate) city -> city.getMatchingUniquesWithNonLocalEffects(uniqueTemplate)
} + } +
policies.policyUniques.getUniques(uniqueTemplate) + policies.policyUniques.getUniques(uniqueTemplate) +