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

Solved another rare concurrency error

Browse Source
This commit is contained in:
Yair Morgenstern 2019-04-14 22:18:40 +03:00
parent 8bf09420e0
commit 8d91cb90dc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -53,16 +53,18 @@ class CityConstructions {
} }
fun getCityProductionTextForCityButton(): String { fun getCityProductionTextForCityButton(): String {
var result = currentConstruction.tr() val currentConstructionSnapshot = currentConstruction // See below
if (SpecialConstruction.getSpecialConstructions().none { it.name==currentConstruction }) var result = currentConstructionSnapshot .tr()
result += "\r\n" + turnsToConstruction(currentConstruction) + " {turns}".tr() if (SpecialConstruction.getSpecialConstructions().none { it.name==currentConstructionSnapshot })
result += "\r\n" + turnsToConstruction(currentConstructionSnapshot ) + " {turns}".tr()
return result return result
} }
fun getProductionForTileInfo(): String { fun getProductionForTileInfo(): String {
var result = currentConstruction.tr() val currentConstructionSnapshot = currentConstruction // this is because there were rare errors tht I assume were caused because currentContruction changed on another thread
if (SpecialConstruction.getSpecialConstructions().none { it.name==currentConstruction }) var result = currentConstructionSnapshot.tr()
result += "\r\n{in} ".tr() + turnsToConstruction(currentConstruction) + " {turns}".tr() if (SpecialConstruction.getSpecialConstructions().none { it.name==currentConstructionSnapshot })
result += "\r\n{in} ".tr() + turnsToConstruction(currentConstructionSnapshot) + " {turns}".tr()
return result return result
} }