diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8468013dc..2ffd64420 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -18700,10 +18700,7 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const { - if (GetInstanceId() != pRewardSource->GetInstanceId()) - return false; - - if (pRewardSource->GetDistance(this) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE)) + if (pRewardSource->IsWithinDistInMap(this,sWorld.getConfig(CONFIG_GR OUP_XP_DISTANCE))) return true; if (isAlive()) @@ -18713,7 +18710,7 @@ bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const if (!corpse) return false; - return pRewardSource->GetDistance(corpse) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE); + return pRewardSource->IsWithinDistInMap(corpse,sWorld.getConfig(CONFIG_GR OUP_XP_DISTANCE)); } uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c7d27a904..59125b63a 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 "7758" + #define REVISION_NR "7759" #endif // __REVISION_NR_H__