From b823d126d2fabac0cb8e0af3f4d7ab8594ee1aed Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 7 Dec 2018 13:39:58 -0500
Subject: fix location warps when propagating map changes (#608)

---
 src/SMAPI/Metadata/CoreAssetPropagator.cs | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 8083b4b1..d273c251 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -95,6 +95,7 @@ namespace StardewModdingAPI.Metadata
                     if (this.GetNormalisedPath(location.mapPath.Value) == key)
                     {
                         this.Reflection.GetMethod(location, "reloadMap").Invoke();
+                        this.Reflection.GetMethod(location, "updateWarps").Invoke();
                         anyChanged = true;
                     }
                 }
@@ -641,24 +642,6 @@ namespace StardewModdingAPI.Metadata
             this.Reflection.GetField<Texture2D>(sprite, "spriteTexture").SetValue(texture);
         }
 
-        /// <summary>Get an NPC name from the name of their file under <c>Content/Characters</c>.</summary>
-        /// <param name="name">The file name.</param>
-        /// <remarks>Derived from <see cref="NPC.reloadSprite"/>.</remarks>
-        private string GetNpcNameFromFileName(string name)
-        {
-            switch (name)
-            {
-                case "Mariner":
-                    return "Old Mariner";
-                case "DwarfKing":
-                    return "Dwarf King";
-                case "MrQi":
-                    return "Mister Qi";
-                default:
-                    return name;
-            }
-        }
-
         /// <summary>Get all NPCs in the game (excluding farm animals).</summary>
         private IEnumerable<NPC> GetCharacters()
         {
-- 
cgit