diff options
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 0ea32573030..05e1b688a89 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -27,6 +27,7 @@ #include "DB2Stores.h" #include "GameTime.h" #include "GridNotifiersImpl.h" +#include "G3DPosition.hpp" #include "InstanceScenario.h" #include "Item.h" #include "Log.h" @@ -36,6 +37,7 @@ #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" +#include "PathGenerator.h" #include "PhasingHandler.h" #include "Player.h" #include "ReputationMgr.h" @@ -3190,6 +3192,14 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float return; } + // Use a detour raycast to get our first collision point + PathGenerator path(this); + path.CalculatePath(destx, desty, destz, false, true); + G3D::Vector3 result = path.GetPath().back(); + destx = result.x; + desty = result.y; + destz = result.z; + float halfHeight = GetCollisionHeight() * 0.5f; UpdateAllowedPositionZ(destx, desty, destz); bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(PhasingHandler::GetTerrainMapId(GetPhaseShift(), GetMap(), pos.m_positionX, pos.m_positionY), |