From ab95871811273d7abe7cdf0356e2b5e679473b98 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 6 May 2019 02:30:24 +0200 Subject: [PATCH] Core/Objects: replaced another IsFlying check with CanFly to make sure that hovering creatures will get their ground height returned properly *also fixed a small typo in path generator --- src/server/game/Entities/Object/Object.cpp | 2 +- src/server/game/Movement/PathGenerator.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 54bccc11aba..3f77aae5ec6 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2620,7 +2620,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float if (Unit const* unit = ToUnit()) { // flying, ignore. - if (unit->IsFlying()) + if (unit->CanFly()) return; // fall back to gridHeight if any diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp index 40185d69036..a268efdf621 100644 --- a/src/server/game/Movement/PathGenerator.cpp +++ b/src/server/game/Movement/PathGenerator.cpp @@ -41,7 +41,7 @@ PathGenerator::PathGenerator(const Unit* owner) : TC_LOG_DEBUG("maps.mmaps", "++ PathGenerator::PathGenerator for %u", _sourceUnit->GetGUID().GetCounter()); uint32 mapId = PhasingHandler::GetTerrainMapId(_sourceUnit->GetPhaseShift(), _sourceUnit->GetMap(), _sourceUnit->GetPositionX(), _sourceUnit->GetPositionY()); - if (DisableMgr::IsPathfindingEnabled(_sourceUnit->GetMapId())) + if (DisableMgr::IsPathfindingEnabled(mapId)) { MMAP::MMapManager* mmap = MMAP::MMapFactory::createOrGetMMapManager(); _navMesh = mmap->GetNavMesh(mapId);