From 4b9ba35a194ac711d7c36943fc7277ce2a33b141 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 21 Jul 2019 22:05:47 -0400
Subject: apply tilesheet fixes to XNB map files too

---
 src/SMAPI/Framework/ContentManagers/ModContentManager.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework')

diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index de05e92d..d6eb28c8 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -118,7 +118,13 @@ namespace StardewModdingAPI.Framework.ContentManagers
                     // XNB file
                     case ".xnb":
                         {
-                            return this.RawLoad<T>(assetName, useCache: false);
+                            T data = this.RawLoad<T>(assetName, useCache: false);
+                            if (data is Map map)
+                            {
+                                this.FixCustomTilesheetPaths(map, relativeMapPath: assetName);
+                                this.NormaliseTilesheetPaths(map);
+                            }
+                            return data;
                         }
 
                     // unpacked data
-- 
cgit