diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index e27aa2ca9e..94745e979b 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" - const val appCodeNumber = 897 - const val appVersion = "4.7.12-patch1" + const val appCodeNumber = 898 + const val appVersion = "4.7.12-patch2" const val gdxVersion = "1.11.0" const val ktorVersion = "2.2.3" diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 66a3925351..eb10e80bf8 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -536,7 +536,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.7.12-patch1", 897) + val VERSION = Version("4.7.12-patch2", 898) //endregion lateinit var Current: UncivGame diff --git a/core/src/com/unciv/logic/map/tile/Tile.kt b/core/src/com/unciv/logic/map/tile/Tile.kt index f5e8249fd4..908b03c8e4 100644 --- a/core/src/com/unciv/logic/map/tile/Tile.kt +++ b/core/src/com/unciv/logic/map/tile/Tile.kt @@ -739,6 +739,8 @@ open class Tile : IsPartOfGameInfoSerialization { //endregion //region state-changing functions + /** Do not run this on cloned tiles, since then the cloned *units* will be assigned to the civs + * Instead run setTerrainTransients */ fun setTransients() { setTerrainTransients() setUnitTransients(true) diff --git a/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt b/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt index e08ed95303..8f3ab3653e 100644 --- a/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt +++ b/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt @@ -204,7 +204,7 @@ class TileStatFunctions(val tile: Tile) { val currentStats = getTileStats(city, observingCiv, cityUniqueCache) val tileClone = tile.clone() - tileClone.setTransients() + tileClone.setTerrainTransients() if (improvement.name.startsWith(Constants.remove)) tileClone.removeTerrainFeature(improvement.name.removePrefix(Constants.remove))