From 59bc63cab6cd7fa80a4f46734fdaafde80e5b351 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 20 Jan 2019 01:01:26 -0500
Subject: propagate asset changes into the save file being loaded

---
 src/SMAPI/Metadata/CoreAssetPropagator.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI')

diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index d83fc748..92968271 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -677,7 +677,13 @@ namespace StardewModdingAPI.Metadata
         /// <summary>Get all locations in the game.</summary>
         private IEnumerable<GameLocation> GetLocations()
         {
-            foreach (GameLocation location in Game1.locations)
+            // get available root locations
+            IEnumerable<GameLocation> rootLocations = Game1.locations;
+            if (SaveGame.loaded?.locations != null)
+                rootLocations = rootLocations.Concat(SaveGame.loaded.locations);
+
+            // yield root + child locations
+            foreach (GameLocation location in rootLocations)
             {
                 yield return location;
 
-- 
cgit