summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release-notes.md4
-rw-r--r--src/StardewModdingAPI/Framework/ModHelpers/ContentHelper.cs1
2 files changed, 3 insertions, 2 deletions
diff --git a/release-notes.md b/release-notes.md
index 16ebae2c..5e01a264 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -28,8 +28,8 @@ For power users:
## 1.15.4
For players:
-* Fixed errors when loading some custom maps via Entoarox Framework or XNB Loader.
-* Fixed errors with in-game date calculation in some mods.
+* Fixed errors when loading some custom maps on Linux/Mac or using XNB Loader.
+* Fixed errors in rare cases when a mod calculates an in-game date.
For modders:
* Added UTC timestamp to log file.
diff --git a/src/StardewModdingAPI/Framework/ModHelpers/ContentHelper.cs b/src/StardewModdingAPI/Framework/ModHelpers/ContentHelper.cs
index 9f236823..4440ae40 100644
--- a/src/StardewModdingAPI/Framework/ModHelpers/ContentHelper.cs
+++ b/src/StardewModdingAPI/Framework/ModHelpers/ContentHelper.cs
@@ -231,6 +231,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
// check map info
if (!map.TileSheets.Any())
return;
+ mapKey = this.ContentManager.NormaliseAssetName(mapKey); // Mono's Path.GetDirectoryName doesn't handle Windows dir separators
string relativeMapFolder = Path.GetDirectoryName(mapKey) ?? ""; // folder path containing the map, relative to the mod folder
// fix tilesheets