mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-28 12:52:25 +01:00
Core/Movement: solve cherrypick conflicts
This commit is contained in:
@@ -165,8 +165,8 @@ bool ChaseMovementGenerator::Update(Unit* owner, uint32 diff)
|
||||
if (owner->IsHovering())
|
||||
owner->UpdateAllowedPositionZ(x, y, z);
|
||||
|
||||
bool success = _path->CalculatePath(x, y, z);
|
||||
if (!success || (_path->GetPathType() & PATHFIND_NOPATH))
|
||||
bool success = _path->CalculatePath(x, y, z, cOwner->CanFly());
|
||||
if (!success || (_path->GetPathType() & (PATHFIND_NOPATH | PATHFIND_INCOMPLETE)))
|
||||
{
|
||||
if (cOwner)
|
||||
cOwner->SetCannotReachTarget(true);
|
||||
|
||||
Reference in New Issue
Block a user