Core/AI: Clean up charm AI handling.

Port From (https://github.com/TrinityCore/TrinityCore/commit/e4e8c1c59c8b37216814526b4d2551f23934f465)
2021-10-31 13:55:26 -04:00
parent 7050fda482
commit 26940fa650
33 changed files with 472 additions and 443 deletions
@@ -44,13 +44,20 @@ namespace Game.AI
            _moveInLineOfSightLocked = false;
        }

-        public override void OnCharmed(bool apply)
+        public override void OnCharmed(bool isNew)
        {
-            if (apply)
+            if (isNew && !me.IsCharmed() && !me.LastCharmerGUID.IsEmpty())
            {
-                me.NeedChangeAI = true;
-                me.IsAIEnabled = false;
+                if (!me.HasReactState(ReactStates.Passive))
+                {
+                    Unit lastCharmer = Global.ObjAccessor.GetUnit(me, me.LastCharmerGUID);
+                    if (lastCharmer != null)
+                        me.EngageWithTarget(lastCharmer);
+                }
+                me.LastCharmerGUID.Clear();
            }
+
+            base.OnCharmed(isNew);
        }

        public void Talk(uint id, WorldObject whisperTarget = null)