* Correct group reward distance check

--HG--
branch : trunk

1 files changed, 6 insertions, 12 deletions

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