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
@@ -322,11 +322,12 @@ namespace Game.AI

        public override void AttackStart(Unit victim) { }

-        public override void OnCharmed(bool apply)
+        public override void OnCharmed(bool isNew)
        {
-            if (!me.GetVehicleKit().IsVehicleInUse() && !apply && _hasConditions)//was used and has conditions
+            bool charmed = me.IsCharmed();
+            if (!me.GetVehicleKit().IsVehicleInUse() && !charmed && _hasConditions)//was used and has conditions
                _doDismiss = true;//needs reset
-            else if (apply)
+            else if (charmed)
                _doDismiss = false;//in use again

            _dismissTimer = VEHICLE_DISMISS_TIME;//reset timer