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

[7457] Fixed set Bg raid leader to party or raid leader who entered Bg.

Browse source 
Removed useless code from my previous patch.

Signed-off-by: Triply <triply@getmangos.com>
This commit is contained in:
Triply 2009-03-14 20:20:28 +01:00
parent 435b53c853
commit 74006886e9
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/game/BattleGround.cpp
View file

@ -1162,7 +1162,12 @@ void BattleGround::AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid,
plr->SetBattleGroundRaid(group, subgroup); plr->SetBattleGroundRaid(group, subgroup);
} }
else else
GetBgRaid(team)->AddMember(plr_guid, plr->GetName()); {
group->AddMember(plr_guid, plr->GetName());
if( Group* originalGroup = plr->GetOriginalGroup() )
if( originalGroup->IsLeader(plr_guid) )
group->ChangeLeader(plr_guid);
}
} }
} }

19
src/game/Group.cpp
View file

@ -386,19 +386,16 @@ void Group::Disband(bool hideDestroy)
continue; continue;
//we cannot call _removeMember because it would invalidate member iterator //we cannot call _removeMember because it would invalidate member iterator
if (player) //if we are removing player from battleground raid
if( isBGGroup() )
player->RemoveFromBattleGroundRaid();
else
{ {
//if we are removing player from battleground raid //we can remove player who is in battleground from his original group
if( isBGGroup() ) if( player->GetOriginalGroup() == this )
player->RemoveFromBattleGroundRaid(); player->SetOriginalGroup(NULL);
else else
{ player->SetGroup(NULL);
//we can remove player who is in battleground from his original group
if( player->GetOriginalGroup() == this )
player->SetOriginalGroup(NULL);
else
player->SetGroup(NULL);
}
} }
// quest related GO state dependent from raid membership // quest related GO state dependent from raid membership

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 "7456" #define REVISION_NR "7457"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__