diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 16243e56f..8468013dc 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -18700,14 +18700,17 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const { - if(pRewardSource->GetDistance(this) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE)) + if (GetInstanceId() != pRewardSource->GetInstanceId()) + return false; + + if (pRewardSource->GetDistance(this) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE)) return true; - if(isAlive()) + if (isAlive()) return false; Corpse* corpse = GetCorpse(); - if(!corpse) + if (!corpse) return false; return pRewardSource->GetDistance(corpse) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 08398c04b..c7d27a904 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7757" + #define REVISION_NR "7758" #endif // __REVISION_NR_H__