Core/Creatures: Implemented CREATURE_STATIC_FLAG_2_IGNORE_SANCTUARY (ignore SPELL_EFFECT_SANCTUARY, used by Vanish)

Port From (https://github.com/TrinityCore/TrinityCore/commit/1369b8708458fb5020b6ab7a9608123459d4eb26)
2024-03-05 18:33:31 -05:00
parent 83bd8b255b
commit 536f72d077
6 changed files with 69 additions and 33 deletions
@@ -610,13 +610,15 @@ namespace Game.Combat
                threatened.GetThreatManager().AddThreat(assistant, 0.0f, spell, true);
        }

-        public void RemoveMeFromThreatLists()
+        public void RemoveMeFromThreatLists(Func<Unit, bool> unitFilter)
        {
-            while (!_threatenedByMe.Empty())
-            {
-                var refe = _threatenedByMe.FirstOrDefault().Value;
+            List<ThreatReference> threatReferencesToRemove = new();
+            foreach (var (_, refe) in _threatenedByMe)
+                if (unitFilter == null || unitFilter(refe.GetOwner()))
+                    threatReferencesToRemove.Add(refe);
+
+            foreach (ThreatReference refe in threatReferencesToRemove)
                refe._mgr.ClearThreat(_owner);
-            }
        }

        public void UpdateMyTempModifiers()