From e64a1220e309e8fc83e20833b8849de1721ec469 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 1 Jan 2020 18:52:24 -0500
Subject: unify item diff logic for players & chests

---
 .../Framework/StateTracking/Snapshots/LocationSnapshot.cs |  7 ++-----
 .../Framework/StateTracking/Snapshots/PlayerSnapshot.cs   | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'src/SMAPI/Framework/StateTracking/Snapshots')

diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
index edfba736..6ae52fd0 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.Xna.Framework;
-using StardewModdingAPI.Events;
 using StardewValley;
 using StardewValley.Buildings;
 using StardewValley.Objects;
@@ -37,7 +35,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         public SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>> TerrainFeatures { get; } = new SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>>();
 
         /// <summary>Tracks changed chest inventories.</summary>
-        public IDictionary<Chest, ItemStackChange[]> ChestItems { get; } = new Dictionary<Chest, ItemStackChange[]>();
+        public IDictionary<Chest, SnapshotItemListDiff> ChestItems { get; } = new Dictionary<Chest, SnapshotItemListDiff>();
 
 
         /*********
@@ -66,8 +64,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             this.ChestItems.Clear();
             foreach (ChestTracker tracker in watcher.ChestWatchers.Values)
             {
-                ItemStackChange[] changes = tracker.GetInventoryChanges().ToArray();
-                if (changes.Length > 0)
+                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
@@ -10,6 +10,13 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
     /// <summary>A frozen snapshot of a tracked player.</summary>
     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
         *********/
@@ -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;
+
         }
     }
 }
-- 
cgit