diff options
| -rw-r--r-- | src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Movement/PathGenerator.cpp | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp index 2df86222c33..7b765762fa9 100644 --- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp @@ -184,8 +184,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); diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp index 19b6528a250..69844b2c15b 100644 --- a/src/server/game/Movement/PathGenerator.cpp +++ b/src/server/game/Movement/PathGenerator.cpp @@ -469,13 +469,6 @@ void PathGenerator::BuildPolyPath(G3D::Vector3 const& startPos, G3D::Vector3 con else _type = PATHFIND_INCOMPLETE; - if (_type & PATHFIND_INCOMPLETE && _sourceUnit->CanFly()) - { - BuildShortcut(); - _type = PathType(PATHFIND_NORMAL | PATHFIND_NOT_USING_PATH); - return; - } - // generate the point-path out of our up-to-date poly-path BuildPointPath(startPoint, endPoint); } |