From 194b96a79c335fa098a6cf55c2be75c7f2e9c6ad Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 8 Dec 2019 11:31:20 -0500
Subject: use GetLocations logic more consistently in asset propagation

---
 src/SMAPI/Metadata/CoreAssetPropagator.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 985e4e1b..8b00d893 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -611,7 +611,7 @@ namespace StardewModdingAPI.Metadata
         {
             // get buildings
             string type = Path.GetFileName(key);
-            Building[] buildings = Game1.locations
+            Building[] buildings = this.GetLocations(buildingInteriors: false)
                 .OfType<BuildableGameLocation>()
                 .SelectMany(p => p.buildings)
                 .Where(p => p.buildingType.Value == type)
@@ -706,7 +706,7 @@ namespace StardewModdingAPI.Metadata
         {
             Grass[] grasses =
                 (
-                    from location in Game1.locations
+                    from location in this.GetLocations()
                     from grass in location.terrainFeatures.Values.OfType<Grass>()
                     let textureName = this.NormalizeAssetNameIgnoringEmpty(
                         this.Reflection.GetMethod(grass, "textureName").Invoke<string>()
@@ -804,7 +804,7 @@ namespace StardewModdingAPI.Metadata
         /// <returns>Returns whether any textures were reloaded.</returns>
         private bool ReloadTreeTextures(LocalizedContentManager content, string key, int type)
         {
-            Tree[] trees = Game1.locations
+            Tree[] trees = this.GetLocations()
                 .SelectMany(p => p.terrainFeatures.Values.OfType<Tree>())
                 .Where(tree => tree.treeType.Value == type)
                 .ToArray();
@@ -909,7 +909,8 @@ namespace StardewModdingAPI.Metadata
         }
 
         /// <summary>Get all locations in the game.</summary>
-        private IEnumerable<GameLocation> GetLocations()
+        /// <param name="buildingInteriors">Whether to also get the interior locations for constructable buildings.</param>
+        private IEnumerable<GameLocation> GetLocations(bool buildingInteriors = true)
         {
             // get available root locations
             IEnumerable<GameLocation> rootLocations = Game1.locations;
@@ -921,7 +922,7 @@ namespace StardewModdingAPI.Metadata
             {
                 yield return location;
 
-                if (location is BuildableGameLocation buildableLocation)
+                if (buildingInteriors && location is BuildableGameLocation buildableLocation)
                 {
                     foreach (Building building in buildableLocation.buildings)
                     {
-- 
cgit