From 203477eca1e48f950d32c5907ecc499d3a42fbba Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 8 May 2023 21:01:23 +0300
Subject: [PATCH] 4.6.10-patch1

---
 buildSrc/src/main/kotlin/BuildConfig.kt      | 4 ++--
 core/src/com/unciv/UncivGame.kt              | 2 +-
 core/src/com/unciv/logic/map/tile/Tile.kt    | 8 +++++---
 core/src/com/unciv/models/ruleset/Ruleset.kt | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index d1e07d774b..2331464ec6 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 = 862
-    const val appVersion = "4.6.10"
+    const val appCodeNumber = 863
+    const val appVersion = "4.6.10-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 75a9486825..69d645ad63 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.6.10", 862)
+        val VERSION = Version("4.6.10-patch1", 863)
         //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 97a8241147..b386002a0a 100644
--- a/core/src/com/unciv/logic/map/tile/Tile.kt
+++ b/core/src/com/unciv/logic/map/tile/Tile.kt
@@ -243,10 +243,12 @@ open class Tile : IsPartOfGameInfoSerialization {
     fun setExplored(player: Civilization, isExplored: Boolean, explorerPosition: Vector2? = null) {
         if (isExplored) {
             // Disable the undo button if a new tile has been explored
-            if (!exploredBy.contains(player.civName) && GUI.isWorldLoaded()) {
+            if (!exploredBy.contains(player.civName)) {
+                if (GUI.isWorldLoaded()) {
+                    val worldScreen = GUI.getWorldScreen()
+                    worldScreen.preActionGameInfo = worldScreen.gameInfo
+                }
                 exploredBy = exploredBy.withItem(player.civName)
-                val worldScreen = GUI.getWorldScreen()
-                worldScreen.preActionGameInfo = worldScreen.gameInfo
             }
 
             if (player.playerType == PlayerType.Human)
diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt
index 7eb26c501b..86f26cd2bf 100644
--- a/core/src/com/unciv/models/ruleset/Ruleset.kt
+++ b/core/src/com/unciv/models/ruleset/Ruleset.kt
@@ -488,6 +488,7 @@ object RulesetCache : HashMap<String,Ruleset>() {
                 name = ruleset.fullName
             }
         }
+        this.putAll(newRulesets)
 
         val errorLines = ArrayList<String>()
         if (!noMods){