*Add some distance check functions. By VladimirMangos.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index f322d8326e1..8d7b877d4f5 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -2058,12 +2058,12 @@ bool Creature::IsOutOfThreatArea(Unit* pVictim) const
     if(sMapStore.LookupEntry(GetMapId())->IsDungeon())
         return false;
 
-    float length = pVictim->GetDistance(mHome_X, mHome_Y, mHome_Z);
     float AttackDist = GetAttackDistance(pVictim);
     uint32 ThreatRadius = sWorld.getConfig(CONFIG_THREAT_RADIUS);
 
     //Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and out of combat every update tick.
-    return ( length > (ThreatRadius > AttackDist ? ThreatRadius : AttackDist));
+    return !pVictim->IsWithinDist3d(mHome_X,mHome_Y,mHome_Z,
+        ThreatRadius > AttackDist ? ThreatRadius : AttackDist);
 }
 
 CreatureDataAddon const* Creature::GetCreatureAddon() const