Merge branch 'develop' into stable

4 files changed, 28 insertions, 8 deletions

diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 2adafbbf..57c40bbf 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -54,7 +54,7 @@ namespace StardewModdingAPI
         ** Public
         ****/
         /// <summary>SMAPI's current semantic version.</summary>
-        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.9.0");
+        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.9.1");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.5.4");
diff --git a/src/SMAPI/Framework/ContentCoordinator.cs b/src/SMAPI/Framework/ContentCoordinator.cs
index 27fb3dbb..77dd6c72 100644
--- a/src/SMAPI/Framework/ContentCoordinator.cs
+++ b/src/SMAPI/Framework/ContentCoordinator.cs
@@ -99,7 +99,17 @@ namespace StardewModdingAPI.Framework
             this.OnLoadingFirstAsset = onLoadingFirstAsset;
             this.FullRootDirectory = Path.Combine(Constants.ExecutionPath, rootDirectory);
             this.ContentManagers.Add(
-                this.MainContentManager = new GameContentManager("Game1.content", serviceProvider, rootDirectory, currentCulture, this, monitor, reflection, this.OnDisposing, onLoadingFirstAsset)
+                this.MainContentManager = new GameContentManager(
+                    name: "Game1.content",
+                    serviceProvider: serviceProvider,
+                    rootDirectory: rootDirectory,
+                    currentCulture: currentCulture,
+                    coordinator: this,
+                    monitor: monitor,
+                    reflection: reflection,
+                    onDisposing: this.OnDisposing,
+                    onLoadingFirstAsset: onLoadingFirstAsset
+                )
             );
             this.VanillaContentManager = new LocalizedContentManager(serviceProvider, rootDirectory);
             this.CoreAssets = new CoreAssetPropagator(this.MainContentManager.AssertAndNormalizeAssetName, reflection);
@@ -111,7 +121,17 @@ namespace StardewModdingAPI.Framework
         {
             return this.ContentManagerLock.InWriteLock(() =>
             {
-                GameContentManager manager = new GameContentManager(name, this.MainContentManager.ServiceProvider, this.MainContentManager.RootDirectory, this.MainContentManager.CurrentCulture, this, this.Monitor, this.Reflection, this.OnDisposing, this.OnLoadingFirstAsset);
+                GameContentManager manager = new GameContentManager(
+                    name: name,
+                    serviceProvider: this.MainContentManager.ServiceProvider,
+                    rootDirectory: this.MainContentManager.RootDirectory,
+                    currentCulture: this.MainContentManager.CurrentCulture,
+                    coordinator: this,
+                    monitor: this.Monitor,
+                    reflection: this.Reflection,
+                    onDisposing: this.OnDisposing,
+                    onLoadingFirstAsset: this.OnLoadingFirstAsset
+                );
                 this.ContentManagers.Add(manager);
                 return manager;
             });
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index af7d90f6..c70820e4 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -88,8 +88,6 @@ namespace StardewModdingAPI.Framework.ModLoading
                                 if (url != null)
                                     updateUrls.Add(url);
                             }
-                            if (mod.DataRecord.AlternativeUrl != null)
-                                updateUrls.Add(mod.DataRecord.AlternativeUrl);
 
                             // default update URL
                             updateUrls.Add("https://smapi.io/mods");
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 4b911a83..063804e0 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Microsoft.Xna.Framework.Graphics;
@@ -79,7 +80,7 @@ namespace StardewModdingAPI.Metadata
             });
 
             // reload assets
-            IDictionary<string, bool> propagated = assets.ToDictionary(p => p.Key, p => false, StringComparer.OrdinalIgnoreCase);
+            IDictionary<string, bool> propagated = assets.ToDictionary(p => p.Key, _ => false, StringComparer.OrdinalIgnoreCase);
             foreach (var bucket in buckets)
             {
                 switch (bucket.Key)
@@ -110,6 +111,7 @@ namespace StardewModdingAPI.Metadata
         /// <param name="key">The asset key to reload.</param>
         /// <param name="type">The asset type to reload.</param>
         /// <returns>Returns whether an asset was loaded. The return value may be true or false, or a non-null value for true.</returns>
+        [SuppressMessage("ReSharper", "StringLiteralTypo", Justification = "These deliberately match the asset names.")]
         private bool PropagateOther(LocalizedContentManager content, string key, Type type)
         {
             key = this.AssertAndNormalizeAssetName(key);
@@ -492,8 +494,7 @@ namespace StardewModdingAPI.Metadata
                     return true;
 
                 case "terrainfeatures\\grass": // from Grass
-                    this.ReloadGrassTextures(content, key);
-                    return true;
+                    return this.ReloadGrassTextures(content, key);
 
                 case "terrainfeatures\\hoedirt": // from HoeDirt
                     HoeDirt.lightTexture = content.Load<Texture2D>(key);
@@ -785,6 +786,7 @@ namespace StardewModdingAPI.Metadata
         private void ReloadMap(GameLocation location)
         {
             // reload map
+            location.interiorDoors.Clear(); // prevent errors when doors try to update tiles which no longer exist
             location.reloadMap();
             location.updateWarps();
             location.MakeMapModifications(force: true);