mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-02 20:34:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash caused by #4142

Browse Source
This commit is contained in:
Yair Morgenstern 2021-06-18 10:40:54 +03:00
parent 243647dea6
commit 6e7e05248d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -291,8 +291,12 @@ open class TileInfo {
&& observingCiv.tech.isResearched(it.params[2])
}
for (unique in cityWideUniques + improvementUniques) {
if (matchesUniqueFilter(unique.params[1]))
stats.add(unique.stats)
if (matchesUniqueFilter(unique.params[1])
// Freshwater and non-freshwater cannot be moved to matchesUniqueFilter since that creates an enless feedback.
// If you're attempting that, check that it works!
|| unique.params[1] == "Fresh water" && isAdjacentToFreshwater
|| unique.params[1] == "non-fresh water" && !isAdjacentToFreshwater)
stats.add(unique.stats)
}
for (unique in city.civInfo.getMatchingUniques("[] from every []")) {
@ -399,8 +403,6 @@ open class TileInfo {
"Land" -> isLand
"Coastal" -> isCoastalTile()
"River" -> isAdjacentToRiver()
"Fresh water" -> isAdjacentToFreshwater
"non-fresh water" -> !isAdjacentToFreshwater
improvement -> true
naturalWonder -> true
"Foreign Land" -> civInfo != null && !isFriendlyTerritory(civInfo)