diff options
author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-08-06 22:21:10 -0400 |
---|---|---|
committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-08-06 22:21:10 -0400 |
commit | a1a93ac4bf20458d49028ed40905e715aa1ae152 (patch) | |
tree | d76e739f930761b032584be8bf5be488882463dc | |
parent | 7eca78426e46c90320be6d904cd97fa6319da1a7 (diff) | |
download | SMAPI-a1a93ac4bf20458d49028ed40905e715aa1ae152.tar.gz SMAPI-a1a93ac4bf20458d49028ed40905e715aa1ae152.tar.bz2 SMAPI-a1a93ac4bf20458d49028ed40905e715aa1ae152.zip |
fix spring tilesheets always used for custom festival maps (#577)
-rw-r--r-- | docs/release-notes.md | 3 | ||||
-rw-r--r-- | src/SMAPI/Framework/ModHelpers/ContentHelper.cs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md index 4594815f..42bd7975 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,5 +1,8 @@ # Release notes ## 2.6.1 +* For players: + * Fixed custom festival maps always using spring tilesheets. + * For modders: * Fixed false compatibility error when constructing multidimensional arrays. * Fixed `.ToSButton()` methods not being public. diff --git a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs index 671dc21e..a8b24a13 100644 --- a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs @@ -259,7 +259,7 @@ namespace StardewModdingAPI.Framework.ModHelpers // get seasonal name (if applicable) string seasonalImageSource = null; - if (Game1.currentSeason != null) + if (Context.IsSaveLoaded && Game1.currentSeason != null) { string filename = Path.GetFileName(imageSource) ?? throw new InvalidOperationException($"The '{imageSource}' tilesheet couldn't be loaded: filename is unexpectedly null."); bool hasSeasonalPrefix = |