mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7758] Fixed gain reputation and xp reward between group mates in differents instances

Browse source 
Signed-off-by: AlexDereka <dereka.alex@gmail.com>
This commit is contained in:
zhenya 2009-05-04 14:45:11 +04:00 • committed by AlexDereka
parent 15d449c161
commit b1bfdddeb2
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/game/Player.cpp
View file

@ -18700,14 +18700,17 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar
bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const 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; return true;
if(isAlive()) if (isAlive())
return false; return false;
Corpse* corpse = GetCorpse(); Corpse* corpse = GetCorpse();
if(!corpse) if (!corpse)
return false; return false;
return pRewardSource->GetDistance(corpse) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE); return pRewardSource->GetDistance(corpse) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7757" #define REVISION_NR "7758"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__