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

Fixed concurrent iterator change problems

Browse Source
This commit is contained in:
Yair Morgenstern
2018-07-26 23:17:18 +03:00
parent 592b716e81
commit f6f9433c41
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,8 +144,10 @@ class CivilizationInfo {
fun getCivResources(): Counter<TileResource> {
val civResources = Counter<TileResource>()
for (city in cities) civResources.add(city.getCityResources())
for (dip in diplomacy.values) civResources.add(dip.resourcesFromTrade())
// ToLists are so that when we update happiness on a different thread and we call this function,
// we don't modify the iterator as we're using it
for (city in cities.toList()) civResources.add(city.getCityResources())
for (dip in diplomacy.values.toList()) civResources.add(dip.resourcesFromTrade())
return civResources
}