From aa62a9c75f1e3269ee9c8ed4b18f4bb6c4434255 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 14 Apr 2019 12:15:11 +0200 Subject: [PATCH] Core/Movement: solve cherrypick conflicts --- .../Movement/MovementGenerators/ChaseMovementGenerator .cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp index 6f3f81a37ab..1b14c23731d 100644 --- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp +++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator .cpp @@ -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);