1 files changed, 52 insertions, 8 deletions

diff --git a/src/SMAPI/Framework/StateTracking/LocationTracker.cs b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
index 1f479e12..519fe8f4 100644
--- a/src/SMAPI/Framework/StateTracking/LocationTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
@@ -5,8 +5,9 @@ using StardewModdingAPI.Framework.StateTracking.FieldWatchers;
 using StardewValley;
 using StardewValley.Buildings;
 using StardewValley.Locations;
+using StardewValley.Objects;
 using StardewValley.TerrainFeatures;
-using Object = StardewValley.Object;
+using SObject = StardewValley.Object;
 
 namespace StardewModdingAPI.Framework.StateTracking
 {
@@ -42,11 +43,14 @@ namespace StardewModdingAPI.Framework.StateTracking
         public ICollectionWatcher<NPC> NpcsWatcher { get; }
 
         /// <summary>Tracks added or removed objects.</summary>
-        public IDictionaryWatcher<Vector2, Object> ObjectsWatcher { get; }
+        public IDictionaryWatcher<Vector2, SObject> ObjectsWatcher { get; }
 
         /// <summary>Tracks added or removed terrain features.</summary>
         public IDictionaryWatcher<Vector2, TerrainFeature> TerrainFeaturesWatcher { get; }
 
+        /// <summary>Tracks items added or removed to chests.</summary>
+        public IDictionary<Vector2, ChestTracker> ChestWatchers { get; } = new Dictionary<Vector2, ChestTracker>();
+
 
         /*********
         ** Public methods
@@ -74,13 +78,8 @@ namespace StardewModdingAPI.Framework.StateTracking
                 this.ObjectsWatcher,
                 this.TerrainFeaturesWatcher
             });
-        }
 
-        /// <summary>Stop watching the player fields and release all references.</summary>
-        public void Dispose()
-        {
-            foreach (IWatcher watcher in this.Watchers)
-                watcher.Dispose();
+            this.UpdateChestWatcherList(added: location.Objects.Pairs, removed: new KeyValuePair<Vector2, SObject>[0]);
         }
 
         /// <summary>Update the current value if needed.</summary>
@@ -88,6 +87,11 @@ namespace StardewModdingAPI.Framework.StateTracking
         {
             foreach (IWatcher watcher in this.Watchers)
                 watcher.Update();
+
+            this.UpdateChestWatcherList(added: this.ObjectsWatcher.Added, removed: this.ObjectsWatcher.Removed);
+
+            foreach (var watcher in this.ChestWatchers)
+                watcher.Value.Update();
         }
 
         /// <summary>Set the current value as the baseline.</summary>
@@ -95,6 +99,46 @@ namespace StardewModdingAPI.Framework.StateTracking
         {
             foreach (IWatcher watcher in this.Watchers)
                 watcher.Reset();
+
+            foreach (var watcher in this.ChestWatchers)
+                watcher.Value.Reset();
+        }
+
+        /// <summary>Stop watching the player fields and release all references.</summary>
+        public void Dispose()
+        {
+            foreach (IWatcher watcher in this.Watchers)
+                watcher.Dispose();
+
+            foreach (var watcher in this.ChestWatchers.Values)
+                watcher.Dispose();
+        }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Update the watcher list for added or removed chests.</summary>
+        /// <param name="added">The objects added to the location.</param>
+        /// <param name="removed">The objects removed from the location.</param>
+        private void UpdateChestWatcherList(IEnumerable<KeyValuePair<Vector2, SObject>> added, IEnumerable<KeyValuePair<Vector2, SObject>> removed)
+        {
+            // remove unused watchers
+            foreach (KeyValuePair<Vector2, SObject> pair in removed)
+            {
+                if (pair.Value is Chest && this.ChestWatchers.TryGetValue(pair.Key, out ChestTracker watcher))
+                {
+                    watcher.Dispose();
+                    this.ChestWatchers.Remove(pair.Key);
+                }
+            }
+
+            // add new watchers
+            foreach (KeyValuePair<Vector2, SObject> pair in added)
+            {
+                if (pair.Value is Chest chest && !this.ChestWatchers.ContainsKey(pair.Key))
+                    this.ChestWatchers.Add(pair.Key, new ChestTracker(chest));
+            }
         }
     }
 }