Fix: CreatureHistory make sure to remove expired ones even if the cor…

…responding cell were not updated!
Xian55 · Nov 16, 2021 · 2a9495e · 2a9495e
1 parent 5513e05
commit 2a9495e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Core/AddonComponent/CreatureHistory.cs b/Core/AddonComponent/CreatureHistory.cs
@@ -92,8 +92,13 @@ public void Update(int targetGuid, int targetHealthPercent)
                     KillCredit?.Invoke(this, EventArgs.Empty);
                 }
             }
-        }
 
+            RemoveExpired(Targets);
+            RemoveExpired(Creatures);
+            RemoveExpired(DamageTaken);
+            RemoveExpired(DamageDone);
+            RemoveExpired(Deads);
+        }
 
         private static void Update(int creatureId, float healthPercent, List<CreatureRecord> CombatCreatures)
         {
@@ -122,10 +127,11 @@ private static void Update(int creatureId, float healthPercent, List<CreatureRec
                     });
                 }
             }
+        }
 
-            CombatCreatures.Where(c => c.HasExpired(LifeTimeInSeconds))
-                .ToList()
-                .ForEach(c => CombatCreatures.Remove(c));
+        private static void RemoveExpired(List<CreatureRecord> CombatCreatures)
+        {
+            CombatCreatures.RemoveAll(x => x.HasExpired(LifeTimeInSeconds));
         }
     }
 }