summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2019-07-22 12:44:35 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2019-09-14 18:54:06 -0400
commit4fb16abfe9f300b0d841a98b462967b7ca1dcbe5 (patch)
tree4fc4cbaf78a2f38a57eb2f44ac04e6c4a63ab800
parent4b9ba35a194ac711d7c36943fc7277ce2a33b141 (diff)
downloadSMAPI-4fb16abfe9f300b0d841a98b462967b7ca1dcbe5.tar.gz
SMAPI-4fb16abfe9f300b0d841a98b462967b7ca1dcbe5.tar.bz2
SMAPI-4fb16abfe9f300b0d841a98b462967b7ca1dcbe5.zip
normalise map tilesheets before custom-tilesheet changes to avoid errors
-rw-r--r--src/SMAPI/Framework/ContentManagers/ModContentManager.cs4
1 files 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;
}