From d51d40d39f1dc2a449a4611bb36500508257508a Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 20 Feb 2019 17:31:24 +0100 Subject: [PATCH] Core/Maps: re-added half-height values for collision checks --- src/server/game/Entities/Object/Object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 7e7d5e8dd2e..06cc1051203 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2541,7 +2541,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float uint32 terrainMapId = PhasingHandler::GetTerrainMapId(GetPhaseShift(), GetMap(), pos.m_positionX, pos.m_positionY); bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(terrainMapId, pos.m_positionX, pos.m_positionY, pos.m_positionZ + halfHeight, - destx, desty, destz, + destx, desty, destz + halfHeight, destx, desty, destz, -0.5f); // collision occured @@ -2556,7 +2556,7 @@ void WorldObject::MovePositionToFirstCollision(Position &pos, float dist, float // check dynamic collision col = GetMap()->getObjectHitPos(GetPhaseShift(), pos.m_positionX, pos.m_positionY, pos.m_positionZ + halfHeight, - destx, desty, destz, + destx, desty, destz + halfHeight, destx, desty, destz, -0.5f); // Collided with a gameobject