ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Core/Movement): Teleport pet when pathfinding returns PATHFIND_NOT_USING_PATH (#23494)

Browse source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
Co-authored-by: Ryan Turner <16946913+TheSCREWEDSoftware@users.noreply.github.com>
This commit is contained in:
blinkysc 2026-03-08 12:33:32 -05:00 • committed by GitHub
parent 73f8af325d
commit 6d9b89c976
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server/game/AI/CoreAI/PetAI.cpp
View file

@ -158,6 +158,15 @@ void PetAI::UpdateAI(uint32 diff)
else
m_updateAlliesTimer -= diff;
if (owner && owner->IsPlayer() && !me->GetVictim() && me->CanNotReachTarget())
{
if (me->GetDistance(owner) > 40.0f)
{
me->NearTeleportTo(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), me->GetOrientation());
me->SetCannotReachTarget(); // Clear flag after teleport
}
}
if (me->GetVictim() && me->GetVictim()->IsAlive())
{
// is only necessary to stop casting, the pet must not exit combat

10
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
View file

@ -648,8 +648,16 @@ bool FollowMovementGenerator<T>::DoUpdate(T* owner, uint32 time_diff)
owner->UpdateAllowedPositionZ(x, y, z);
bool success = i_path->CalculatePath(x, y, z, forceDest);
if (!success || (i_path->GetPathType() & PATHFIND_NOPATH && !followingMaster))
bool cannotReachTarget = !success || (i_path->GetPathType() & PATHFIND_NOPATH && !followingMaster);
if (oPet && followingMaster && !owner->CanFly() && (i_path->GetPathType() & PATHFIND_NOT_USING_PATH))
cannotReachTarget = true;
if (cannotReachTarget)
{
if (oPet && followingMaster)
cOwner->SetCannotReachTarget(target->GetGUID());
if (!owner->IsStopped())
owner->StopMoving();