aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGrindelwald <137000133@qq.com>2021-11-20 02:53:47 +0800
committerGitHub <noreply@github.com>2021-11-19 19:53:47 +0100
commite63838f624b28b4fc5fcba2b8c64fced8ef8e11c (patch)
tree36783e61cd149698a7710a5796645a95469eec99 /src
parent9cb86a42a9cc2c44507d1ce604a1856b91bb385e (diff)
Core/Pets: Do not force pets to follow their charmer when possessed by player (#27293)
* Fixes Eyes of the Beast Closes #27226 Co-authored-by: Shauren <shauren.trinity@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AI/CoreAI/PetAI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index f38907b4892..ee73d4b2b7d 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -639,7 +639,7 @@ void PetAI::UpdateAllies()
void PetAI::OnCharmed(bool isNew)
{
- if (me->IsCharmed())
+ if (!me->isPossessedByPlayer() && me->IsCharmed())
me->GetMotionMaster()->MoveFollow(me->GetCharmer(), PET_FOLLOW_DIST, me->GetFollowAngle());
CreatureAI::OnCharmed(isNew);