From 87403c947245481aaf455b210e8a71d3bea6090d Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 26 Feb 2023 09:04:14 +0200
Subject: [PATCH] exploredTiles deprecation, step 1 - do not check
 exploredTiles when checking if a tile is explored (#8747)

exploredTiles continues to remain updated, to allow
---
 core/src/com/unciv/logic/civilization/Civilization.kt | 1 +
 core/src/com/unciv/logic/map/tile/Tile.kt             | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/Civilization.kt b/core/src/com/unciv/logic/civilization/Civilization.kt
index 70583531d9..8883348a30 100644
--- a/core/src/com/unciv/logic/civilization/Civilization.kt
+++ b/core/src/com/unciv/logic/civilization/Civilization.kt
@@ -186,6 +186,7 @@ class Civilization : IsPartOfGameInfoSerialization {
     // This is basically a way to ensure our lists are immutable.
     var cities = listOf<City>()
     var citiesCreated = 0
+    @Deprecated("4.5.0 - in favor of Tile.exploredBy")
     var exploredTiles = HashSet<Vector2>()
 
     // Limit camera within explored region
diff --git a/core/src/com/unciv/logic/map/tile/Tile.kt b/core/src/com/unciv/logic/map/tile/Tile.kt
index 05504d2e49..a7ca64b77c 100644
--- a/core/src/com/unciv/logic/map/tile/Tile.kt
+++ b/core/src/com/unciv/logic/map/tile/Tile.kt
@@ -243,20 +243,20 @@ open class Tile : IsPartOfGameInfoSerialization {
     fun isExplored(player: Civilization): Boolean {
         if (UncivGame.Current.viewEntireMapForDebug || player.isSpectator())
             return true
-        return exploredBy.contains(player.civName) || player.exploredTiles.contains(position)
+        return exploredBy.contains(player.civName)
     }
 
     fun setExplored(player: Civilization, isExplored: Boolean, explorerPosition: Vector2? = null) {
         if (isExplored) {
-            exploredBy.add(player.civName)
+            player.exploredTiles.add(position)
 
             // Disable the undo button if a new tile has been explored
-            if (player.exploredTiles.add(position) && GUI.isWorldLoaded()) {
+            if (exploredBy.add(player.civName) && GUI.isWorldLoaded()) {
                 val worldScreen = GUI.getWorldScreen()
                 worldScreen.preActionGameInfo = worldScreen.gameInfo
             }
 
-            if(player.playerType == PlayerType.Human)
+            if (player.playerType == PlayerType.Human)
                 player.exploredRegion.checkTilePosition(position, explorerPosition)
         } else {
             exploredBy.remove(player.civName)