Core/Movement: solve cherrypick conflicts

This commit is contained in:
Ovahlord
2019-04-14 12:15:11 +02:00
parent 5cb3e69e1e
commit aa62a9c75f

View File

@@ -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);