From 8fd2a6fd3a3de037055ccd8ec350c92ba2cdda9d Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 22 Jan 2021 20:17:01 -0500
Subject: update for new map override logic in SDV 1.5.4

Special thanks to the Stardew Valley developers for making the requested changes!
---
 src/SMAPI/Constants.cs                    |  2 +-
 src/SMAPI/Metadata/CoreAssetPropagator.cs | 26 ++------------------------
 2 files changed, 3 insertions(+), 25 deletions(-)

(limited to 'src/SMAPI')

diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index b72471ca..36745ea7 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -57,7 +57,7 @@ namespace StardewModdingAPI
         public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.8.4");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
-        public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.5.3");
+        public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.5.4");
 
         /// <summary>The maximum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MaximumGameVersion { get; } = null;
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 859a1b7a..4b911a83 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -784,32 +784,10 @@ namespace StardewModdingAPI.Metadata
         /// <param name="location">The location whose map to reload.</param>
         private void ReloadMap(GameLocation location)
         {
-            // reset patch caches
-            this.Reflection.GetField<HashSet<string>>(location, "_appliedMapOverrides").GetValue().Clear();
-            switch (location)
-            {
-                case Town _:
-                    this.Reflection.GetField<bool>(location, "ccRefurbished").SetValue(false);
-                    this.Reflection.GetField<bool>(location, "isShowingDestroyedJoja").SetValue(false);
-                    this.Reflection.GetField<bool>(location, "isShowingSpecialOrdersBoard").SetValue(false);
-                    this.Reflection.GetField<bool>(location, "isShowingUpgradedPamHouse").SetValue(false);
-                    break;
-
-                case Beach _:
-                case BeachNightMarket _:
-                case Forest _:
-                    this.Reflection.GetField<bool>(location, "hasShownCCUpgrade").SetValue(false);
-                    break;
-
-                case Mountain _:
-                    this.Reflection.GetField<bool>(location, "bridgeRestored").SetValue(false);
-                    break;
-            }
-
-            // general updates
+            // reload map
             location.reloadMap();
-            location.updateSeasonalTileSheets();
             location.updateWarps();
+            location.MakeMapModifications(force: true);
 
             // update interior doors
             location.interiorDoors.Clear();
-- 
cgit