From 0bef9c2e59e87f44d35b8c33a8c700bf82e85d28 Mon Sep 17 00:00:00 2001
From: Iskander <none@none>
Date: Fri, 19 Jun 2009 13:14:33 +0200
Subject: * Correct group reward distance check

--HG--
branch : trunk
---
 src/game/Player.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 716997df045..c449c53b23b 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -18834,20 +18834,14 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim)
 
 bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const
 {
-    if(GetInstanceId() != pRewardSource->GetInstanceId())
+    const WorldObject* player = GetCorpse();
+    if(!player || isAlive())
+        player = this;
+    
+    if(player->GetMapId() != pRewardSource->GetMapId() || player->GetInstanceId() != pRewardSource->GetInstanceId())
         return false;
 
-    if(pRewardSource->GetDistance(this) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE))
-        return true;
-
-    if(isAlive())
-        return false;
-
-    Corpse* corpse = GetCorpse();
-    if(!corpse)
-        return false;
-
-    return pRewardSource->GetDistance(corpse) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE);
+    return pRewardSource->GetDistance(player) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE);
 }
 
 uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const
-- 
cgit v1.2.3