Merge branch 'develop' into stable

Pathoschild · Oct 17, 2020 · e20d26a · e20d26a
2 parents c87cd3b + 4aecc2a
commit e20d26a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/build/common.targets b/build/common.targets
@@ -4,7 +4,7 @@
 
   <!--set properties -->
   <PropertyGroup>
-    <Version>3.7.4</Version>
+    <Version>3.7.5</Version>
     <Product>SMAPI</Product>
 
     <LangVersion>latest</LangVersion>

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -7,6 +7,12 @@
   * Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info).
 -->
 
+## 3.7.5
+Released 16 October 2020 for Stardew Valley 1.4.1 or later.
+
+* For modders:
+  * Fixed changes to the town map asset not reapplying the game's community center, JojaMart, and Pam house changes.
+
 ## 3.7.4
 Released 03 October 2020 for Stardew Valley 1.4.1 or later.
 

diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "3.7.4",
+    "Version": "3.7.5",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "3.7.4"
+    "MinimumApiVersion": "3.7.5"
 }
diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Save Backup",
     "Author": "SMAPI",
-    "Version": "3.7.4",
+    "Version": "3.7.5",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "3.7.4"
+    "MinimumApiVersion": "3.7.5"
 }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
@@ -51,7 +51,7 @@ public static class Constants
         ** Public
         ****/
         /// <summary>SMAPI's current semantic version.</summary>
-        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.7.4");
+        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.7.5");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.4.1");

diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -138,6 +138,14 @@ private bool PropagateOther(LocalizedContentManager content, string key, Type ty
                 {
                     if (!string.IsNullOrWhiteSpace(location.mapPath.Value) && this.NormalizeAssetNameIgnoringEmpty(location.mapPath.Value) == key)
                     {
+                        // reset town caches
+                        if (location is Town town)
+                        {
+                            this.Reflection.GetField<bool>(town, "ccRefurbished").SetValue(false);
+                            this.Reflection.GetField<bool>(town, "isShowingDestroyedJoja").SetValue(false);
+                            this.Reflection.GetField<bool>(town, "isShowingUpgradedPamHouse").SetValue(false);
+                        }
+
                         // general updates
                         location.reloadMap();
                         location.updateSeasonalTileSheets();