diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 95f5d4f0b1..d48eeae077 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.0" const val appName = "Unciv" - const val appCodeNumber = 865 - const val appVersion = "4.6.11" + const val appCodeNumber = 866 + const val appVersion = "4.6.11-patch1" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 185a984d71..30245f6e3c 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -41,15 +41,15 @@ import com.unciv.ui.screens.worldscreen.PlayerReadyScreen import com.unciv.ui.screens.worldscreen.WorldMapHolder import com.unciv.ui.screens.worldscreen.WorldScreen import com.unciv.ui.screens.worldscreen.unit.UnitTable +import com.unciv.utils.Concurrency import com.unciv.utils.DebugUtils import com.unciv.utils.Display import com.unciv.utils.Log import com.unciv.utils.PlatformSpecific -import com.unciv.utils.Concurrency +import com.unciv.utils.debug import com.unciv.utils.launchOnGLThread import com.unciv.utils.withGLContext import com.unciv.utils.withThreadPoolContext -import com.unciv.utils.debug import kotlinx.coroutines.CancellationException import java.io.PrintWriter import java.util.* @@ -531,7 +531,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.6.11", 865) + val VERSION = Version("4.6.11-patch1", 866) //endregion lateinit var Current: UncivGame diff --git a/core/src/com/unciv/json/NonStringKeyMapSerializer.kt b/core/src/com/unciv/json/NonStringKeyMapSerializer.kt index 388aaea3fe..26f272b818 100644 --- a/core/src/com/unciv/json/NonStringKeyMapSerializer.kt +++ b/core/src/com/unciv/json/NonStringKeyMapSerializer.kt @@ -58,8 +58,10 @@ class NonStringKeyMapSerializer, KT>( val isOldEncampment = entry.child.next.child.run { name == "class" && isString && asString() == "com.unciv.logic.Encampment" } - val value = if (isOldEncampment) - json.readValue(Encampment::class.java, entry.child.next.child.next) + val value = if (isOldEncampment) { + entry.child.next.remove("class") + json.readValue(Encampment::class.java, entry.child.next) + } else json.readValue(null, entry.child.next) result[key!!] = value!!