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

Now ignore unknown fields on all jsons

Browse Source
This commit is contained in:
Yair Morgenstern 2019-02-10 23:27:48 +02:00
parent e3bf80091a
commit d080f37a94
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -216,7 +216,7 @@ class NextTurnAutomation{
&& civInfo.cities.none { it.cityConstructions.currentConstruction == "Settler" }) { && civInfo.cities.none { it.cityConstructions.currentConstruction == "Settler" }) {
val bestCity = civInfo.cities.maxBy { it.cityStats.currentCityStats.production }!! val bestCity = civInfo.cities.maxBy { it.cityStats.currentCityStats.production }!!
if (bestCity.cityConstructions.builtBuildings.size > 1) // 2 buildings or more, otherwisse focus on self first if (bestCity.cityConstructions.builtBuildings.size > 1) // 2 buildings or more, otherwise focus on self first
bestCity.cityConstructions.currentConstruction = "Settler" bestCity.cityConstructions.currentConstruction = "Settler"
} }
} }

2
core/src/com/unciv/models/gamebasics/GameBasics.kt
View File

@ -28,7 +28,7 @@ object GameBasics {
fun <T> getFromJson(tClass: Class<T>, name: String): T { fun <T> getFromJson(tClass: Class<T>, name: String): T {
val jsonText = Gdx.files.internal("jsons/$name.json").readString() val jsonText = Gdx.files.internal("jsons/$name.json").readString()
return Json().fromJson(tClass, jsonText) return Json().apply { ignoreUnknownFields=true }.fromJson(tClass, jsonText)
} }
private fun <T : INamed> createHashmap(items: Array<T>): LinkedHashMap<String, T> { private fun <T : INamed> createHashmap(items: Array<T>): LinkedHashMap<String, T> {