Fix AddDiscoveredLoot

quleebeen · Jul 5, 2021 · bfa8fe8 · bfa8fe8
1 parent 47b0ff2
commit bfa8fe8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Network/Controller/DungeonController.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Network/Controller/DungeonController.cs
@@ -685,6 +685,11 @@ private void RemoveLeftOverDungeonNotificationFragments(ObservableCollection<Dun
 
         public void UpdateDungeonDataUi(DungeonObject dungeon)
         {
+            if (dungeon == null)
+            {
+                return;
+            }
+
             Application.Current.Dispatcher.Invoke(delegate
             {
                 var uiDungeon = _mainWindowViewModel?.TrackingDungeons?.FirstOrDefault(x => 

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Network/Controller/LootController.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Network/Controller/LootController.cs
@@ -28,6 +28,11 @@ public LootController(TrackingController trackingController, MainWindow mainWind
 
         public void AddDiscoveredLoot(DiscoveredLoot loot)
         {
+            if (_discoveredLoot.Exists(x => x.ObjectId == loot.ObjectId))
+            {
+                return;
+            }
+
             _discoveredLoot.Add(loot);
         }
 
@@ -42,7 +47,7 @@ public void RemoveDiscoveredLoot(long? objectId)
 
         public void AddPutLoot(long? objectId, Guid? interactGuid)
         {
-            if (_trackingController.EntityController.GetLocalEntity()?.Value.InteractGuid != interactGuid)
+            if (_trackingController.EntityController.GetLocalEntity()?.Value?.InteractGuid != interactGuid)
             {
                 return;
             }
@@ -65,12 +70,12 @@ private void LootMerge()
         {
             foreach (var lootedObject in _putLoot)
             {
-                if (!_discoveredLoot.Exists(x => x.ItemId == lootedObject.Key))
+                if (!_discoveredLoot.Exists(x => x.ObjectId == lootedObject.Key))
                 {
                     continue;
                 }
 
-                var discoveredLoot = _discoveredLoot.FirstOrDefault(x => x.ItemId == lootedObject.Key);
+                var discoveredLoot = _discoveredLoot.FirstOrDefault(x => x.ObjectId == lootedObject.Key);
                 if (discoveredLoot != null)
                 {