Merge branch 'develop' into stable

2 files changed, 26 insertions, 2 deletions

diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
index d3029540..6ae52fd0 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using StardewValley;
 using StardewValley.Buildings;
+using StardewValley.Objects;
 using StardewValley.TerrainFeatures;
 
 namespace StardewModdingAPI.Framework.StateTracking.Snapshots
@@ -33,6 +34,9 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         /// <summary>Tracks added or removed terrain features.</summary>
         public SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>> TerrainFeatures { get; } = new SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>>();
 
+        /// <summary>Tracks changed chest inventories.</summary>
+        public IDictionary<Chest, SnapshotItemListDiff> ChestItems { get; } = new Dictionary<Chest, SnapshotItemListDiff>();
+
 
         /*********
         ** Public methods
@@ -48,12 +52,21 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         /// <param name="watcher">The watcher to snapshot.</param>
         public void Update(LocationTracker watcher)
         {
+            // main lists
             this.Buildings.Update(watcher.BuildingsWatcher);
             this.Debris.Update(watcher.DebrisWatcher);
             this.LargeTerrainFeatures.Update(watcher.LargeTerrainFeaturesWatcher);
             this.Npcs.Update(watcher.NpcsWatcher);
             this.Objects.Update(watcher.ObjectsWatcher);
             this.TerrainFeatures.Update(watcher.TerrainFeaturesWatcher);
+
+            // chest inventories
+            this.ChestItems.Clear();
+            foreach (ChestTracker tracker in watcher.ChestWatchers.Values)
+            {
+                if (tracker.TryGetInventoryChanges(out SnapshotItemListDiff changes))
+                    this.ChestItems[tracker.Chest] = changes;
+            }
         }
     }
 }
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
index 7bcd9f82..f0fb9485 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
@@ -11,6 +11,13 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
     internal class PlayerSnapshot
     {
         /*********
+        ** Fields
+        *********/
+        /// <summary>An empty item list diff.</summary>
+        private readonly SnapshotItemListDiff EmptyItemListDiff = new SnapshotItemListDiff(new Item[0], new Item[0], new ItemStackSizeChange[0]);
+
+
+        /*********
         ** Accessors
         *********/
         /// <summary>The player being tracked.</summary>
@@ -27,7 +34,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
                 .ToDictionary(skill => skill, skill => new SnapshotDiff<int>());
 
         /// <summary>Get a list of inventory changes.</summary>
-        public IEnumerable<ItemStackChange> InventoryChanges { get; private set; }
+        public SnapshotItemListDiff Inventory { get; private set; }
 
 
         /*********
@@ -47,7 +54,11 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             this.Location.Update(watcher.LocationWatcher);
             foreach (var pair in this.Skills)
                 pair.Value.Update(watcher.SkillWatchers[pair.Key]);
-            this.InventoryChanges = watcher.GetInventoryChanges().ToArray();
+
+            this.Inventory = watcher.TryGetInventoryChanges(out SnapshotItemListDiff itemChanges)
+                ? itemChanges
+                : this.EmptyItemListDiff;
+
         }
     }
 }