public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Movement): Make sure pet always follows its master. (#5103)

Browse Source
This commit is contained in:
UltraNix
2021-04-16 12:04:56 +02:00
committed by GitHub
parent d069d19df0
commit 7d69ee8b9c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
View File

@@ -151,12 +151,13 @@ bool ChaseMovementGenerator<T>::DoUpdate(T* owner, uint32 time_diff)
if (owner->IsHovering()) if (owner->IsHovering())
owner->UpdateAllowedPositionZ(x, y, z); owner->UpdateAllowedPositionZ(x, y, z);
i_recalculateTravel = true;
bool success = i_path->CalculatePath(x, y, z, forceDest); bool success = i_path->CalculatePath(x, y, z, forceDest);
if (!success || i_path->GetPathType() & PATHFIND_NOPATH) if (!success || i_path->GetPathType() & PATHFIND_NOPATH)
{ {
if (cOwner) if (cOwner)
cOwner->SetCannotReachTarget(true); cOwner->SetCannotReachTarget(true);
owner->StopMoving();
return true; return true;
} }
@@ -173,7 +174,6 @@ bool ChaseMovementGenerator<T>::DoUpdate(T* owner, uint32 time_diff)
} }
owner->AddUnitState(UNIT_STATE_CHASE_MOVE); owner->AddUnitState(UNIT_STATE_CHASE_MOVE);
i_recalculateTravel = true;
Movement::MoveSplineInit init(owner); Movement::MoveSplineInit init(owner);
init.MovebyPath(i_path->GetPath()); init.MovebyPath(i_path->GetPath());
@@ -333,17 +333,18 @@ bool FollowMovementGenerator<T>::DoUpdate(T* owner, uint32 time_diff)
target->GetNearPoint(owner, x, y, z, _range, 0.f, target->ToAbsoluteAngle(tAngle)); target->GetNearPoint(owner, x, y, z, _range, 0.f, target->ToAbsoluteAngle(tAngle));
i_recalculateTravel = true;
bool success = i_path->CalculatePath(x, y, z, forceDest); bool success = i_path->CalculatePath(x, y, z, forceDest);
if (!success || i_path->GetPathType() & PATHFIND_NOPATH) if (!success || i_path->GetPathType() & PATHFIND_NOPATH)
{ {
owner->StopMoving(); if (cOwner)
cOwner->SetCannotReachTarget(true);
return true; return true;
} }
owner->AddUnitState(UNIT_STATE_FOLLOW_MOVE); owner->AddUnitState(UNIT_STATE_FOLLOW_MOVE);
i_recalculateTravel = true;
Movement::MoveSplineInit init(owner); Movement::MoveSplineInit init(owner);
init.MovebyPath(i_path->GetPath()); init.MovebyPath(i_path->GetPath());
init.SetFacing(target->GetOrientation()); init.SetFacing(target->GetOrientation());