diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-03-25 18:59:36 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-04-22 22:02:14 -0400 |
| commit | 5d0cba90a15ee27e14ea0e2cff73db7542cd5762 (patch) | |
| tree | 9c13df84d8f411578e9bbd13888604a189c22600 | |
| parent | 2800f7a931b56b551df35280134b9d9e4d7e96a6 (diff) | |
| download | SMAPI-5d0cba90a15ee27e14ea0e2cff73db7542cd5762.tar.gz SMAPI-5d0cba90a15ee27e14ea0e2cff73db7542cd5762.tar.bz2 SMAPI-5d0cba90a15ee27e14ea0e2cff73db7542cd5762.zip | |
fix error on Mac when a custom map references a vanilla tilesheet that only exists under Content/Maps
| -rw-r--r-- | docs/release-notes.md | 1 | ||||
| -rw-r--r-- | src/SMAPI/Framework/ModHelpers/ContentHelper.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md index d9bc3ad1..d0578b33 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -3,6 +3,7 @@ These changes have not been released yet. * For players: + * Fixed error when a custom map references certain vanilla tilesheets on MacOS. * Fixed compatibility with Arch Linux. ## 2.11.1 diff --git a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs index 7c353003..8b86fdeb 100644 --- a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs @@ -316,7 +316,7 @@ namespace StardewModdingAPI.Framework.ModHelpers // check relative to content folder { - foreach (string candidateKey in new[] { imageSource, $@"Maps\{imageSource}" }) + foreach (string candidateKey in new[] { imageSource, Path.Combine("Maps", imageSource) }) { string contentKey = candidateKey.EndsWith(".png") ? candidateKey.Substring(0, candidateKey.Length - 4) |