From 4fb16abfe9f300b0d841a98b462967b7ca1dcbe5 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Mon, 22 Jul 2019 12:44:35 -0400
Subject: normalise map tilesheets before custom-tilesheet changes to avoid
 errors

---
 src/SMAPI/Framework/ContentManagers/ModContentManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index d6eb28c8..34cabefc 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -121,8 +121,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
                             T data = this.RawLoad<T>(assetName, useCache: false);
                             if (data is Map map)
                             {
-                                this.FixCustomTilesheetPaths(map, relativeMapPath: assetName);
                                 this.NormaliseTilesheetPaths(map);
+                                this.FixCustomTilesheetPaths(map, relativeMapPath: assetName);
                             }
                             return data;
                         }
@@ -161,8 +161,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
                             // fetch & cache
                             FormatManager formatManager = FormatManager.Instance;
                             Map map = formatManager.LoadMap(file.FullName);
-                            this.FixCustomTilesheetPaths(map, relativeMapPath: assetName);
                             this.NormaliseTilesheetPaths(map);
+                            this.FixCustomTilesheetPaths(map, relativeMapPath: assetName);
                             return (T)(object)map;
                         }
 
-- 
cgit