From 96c9d105f3fd4683efb1d9389f97a36261cca5fa Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 21 Jul 2022 18:26:41 +0300
Subject: [PATCH] Resolved #7497 - Fixed Civilopedia crash on terrains

---
 buildSrc/src/main/kotlin/BuildConfig.kt                    | 4 ++--
 core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 4ca6a99682..15cbbcc969 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.7.0"
     const val appName = "Unciv"
-    const val appCodeNumber = 740
-    const val appVersion = "4.1.21"
+    const val appCodeNumber = 741
+    const val appVersion = "4.1.21-patch1"
 
     const val gdxVersion = "1.11.0"
     const val roboVMVersion = "2.3.1"
diff --git a/core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt b/core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt
index f40514770d..5f8915853e 100644
--- a/core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt
+++ b/core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt
@@ -32,12 +32,13 @@ object CivilopediaImageGetters {
                 tileInfo.baseTerrain = terrain.turnsInto ?: Constants.grassland
             }
             TerrainType.TerrainFeature -> {
-                tileInfo.addTerrainFeature(terrain.name)
                 tileInfo.baseTerrain =
                     if (terrain.occursOn.isEmpty() || terrain.occursOn.contains(Constants.grassland))
                         Constants.grassland
                     else
                         terrain.occursOn.lastOrNull()!!
+                tileInfo.setTerrainTransients()
+                tileInfo.addTerrainFeature(terrain.name)
             }
             else ->
                 tileInfo.baseTerrain = terrain.name