From c75d75b9fa53309467ec7fff810dd77d9f7fde09 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 7 Mar 2020 23:18:21 +0100 Subject: Core/AI: Fix charmed Creatures with SAI scripts not starting waypoint paths (cherry picked from commit 49e77d7c9e4c39296536cd0b2d427d047e762f46) --- src/server/game/AI/SmartScripts/SmartAI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 8ff5acde3ae..a26aa46f5bf 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -692,7 +692,7 @@ void SmartAI::OnCharmed(bool /*isNew*/) _charmed = charmed; - if (charmed) + if (charmed && !me->isPossessed() && !me->IsVehicle()) me->GetMotionMaster()->MoveFollow(me->GetCharmer(), PET_FOLLOW_DIST, me->GetFollowAngle()); if (!charmed && !me->IsInEvadeMode()) -- cgit v1.2.3