aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2020-03-07 23:18:21 +0100
committerjackpoz <giacomopoz@gmail.com>2020-03-07 23:18:21 +0100
commit49e77d7c9e4c39296536cd0b2d427d047e762f46 (patch)
treea51c3837ca3f08ffd5e65e0e91f666fab48813bd /src
parentc7974bdf909ceb34821fa3953ef4cb090282fcdf (diff)
Core/AI: Fix charmed Creatures with SAI scripts not starting waypoint paths
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AI/SmartScripts/SmartAI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index f09db2f1c68..c06ed6690ed 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -690,7 +690,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())