From ac3e401c2fc1fa09066f7b9e2aa6009c05aaf5b2 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 5 Mar 2019 21:39:42 +0100 Subject: [PATCH] Core/Objects: removed unneeded combat reach calls from several distance helpers as they need another commit to be merged before --- src/server/game/Entities/Object/Object.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 5354ec59e44..ff035f7d3e7 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1412,22 +1412,22 @@ bool WorldObject::IsInMap(const WorldObject* obj) const bool WorldObject::IsWithinDist3d(float x, float y, float z, float dist) const { - return IsInDist(x, y, z, dist + GetCombatReach()); + return IsInDist(x, y, z, dist); } bool WorldObject::IsWithinDist3d(Position const* pos, float dist) const { - return IsInDist(pos, dist + GetCombatReach()); + return IsInDist(pos, dist); } bool WorldObject::IsWithinDist2d(float x, float y, float dist) const { - return IsInDist2d(x, y, dist + GetCombatReach()); + return IsInDist2d(x, y, dist); } bool WorldObject::IsWithinDist2d(Position const* pos, float dist) const { - return IsInDist2d(pos, dist + GetCombatReach()); + return IsInDist2d(pos, dist); } bool WorldObject::IsWithinDist(WorldObject const* obj, float dist2compare, bool is3D /*= true*/) const