From 6953e0341b53aac995534f1ac5172751f764d8d6 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 3 Apr 2023 21:34:22 +0300
Subject: [PATCH] 4.5.16-patch Fixed 'construct improvement' crash

---
 buildSrc/src/main/kotlin/BuildConfig.kt                       | 4 ++--
 core/src/com/unciv/UncivGame.kt                               | 2 +-
 .../unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 3ad3d3d807..eb5c888064 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 = 841
-    const val appVersion = "4.5.16"
+    const val appCodeNumber = 842
+    const val appVersion = "4.5.16-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 e0d9e60019..5d16797050 100644
--- a/core/src/com/unciv/UncivGame.kt
+++ b/core/src/com/unciv/UncivGame.kt
@@ -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.5.16", 841)
+        val VERSION = Version("4.5.16-patch1", 842)
         //endregion
 
         lateinit var Current: UncivGame
diff --git a/core/src/com/unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt
index 9c4ba1582a..121b222bba 100644
--- a/core/src/com/unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt
+++ b/core/src/com/unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt
@@ -12,7 +12,6 @@ import com.unciv.models.ruleset.unique.LocalUniqueCache
 import com.unciv.models.ruleset.unique.UniqueType
 import com.unciv.models.stats.Stats
 import com.unciv.models.translations.tr
-import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.components.Fonts
 import com.unciv.ui.components.UncivTooltip.Companion.addTooltip
 import com.unciv.ui.components.extensions.disable
@@ -20,6 +19,7 @@ import com.unciv.ui.components.extensions.keyShortcuts
 import com.unciv.ui.components.extensions.onClick
 import com.unciv.ui.components.extensions.onDoubleClick
 import com.unciv.ui.components.extensions.toLabel
+import com.unciv.ui.images.ImageGetter
 import kotlin.math.roundToInt
 
 class ImprovementPickerScreen(
@@ -79,6 +79,7 @@ class ImprovementPickerScreen(
         // clone tileInfo without "top" feature if it could be removed
         // Keep this copy around for speed
         val tileWithoutLastTerrain: Tile = tile.clone()
+        tileWithoutLastTerrain.setTerrainTransients()
         if (Constants.remove + tileWithoutLastTerrain.lastTerrain.name in ruleSet.tileImprovements) {
             tileWithoutLastTerrain.removeTerrainFeature(tileWithoutLastTerrain.lastTerrain.name)
         }