aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Groups/Group.cpp
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2012-11-26 20:20:47 +0100
committerSpp <spp@jorge.gr>2012-11-26 20:20:47 +0100
commitad6b5fb419f8fc940e9ac8f3257c7d629ad53f88 (patch)
treef1a239a4383d02a1d2cbd6bd1cac2692f9a18a17 /src/server/game/Groups/Group.cpp
parent4dffccb93ff02dc47efabb1183a4e093519213e2 (diff)
Core/Dungeon Finder: Fix reward for last member of each group being disbanded to join new lfg group
- Move some messages to Trace - Add some cases where internal data wasn't updated with new state - Reverts 441712fbb and ae507e5 (Old State should only store those states you can Restore from a Rolecheck/Proposal) Closes #8339 Closes #8420 Closes #8421
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
-rwxr-xr-xsrc/server/game/Groups/Group.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 45473f792c4..1eeb2b3fe7b 100755
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -368,10 +368,13 @@ bool Group::AddMember(Player* player)
if (player)
{
player->SetGroupInvite(NULL);
- if (player->GetGroup() && (isBGGroup() || isBFGroup())) // if player is in group and he is being added to BG raid group, then call SetBattlegroundRaid()
- player->SetBattlegroundOrBattlefieldRaid(this, subGroup);
- else if (player->GetGroup()) //if player is in bg raid and we are adding him to normal group, then call SetOriginalGroup()
- player->SetOriginalGroup(this, subGroup);
+ if (player->GetGroup())
+ {
+ if (isBGGroup() || isBFGroup()) // if player is in group and he is being added to BG raid group, then call SetBattlegroundRaid()
+ player->SetBattlegroundOrBattlefieldRaid(this, subGroup);
+ else //if player is in bg raid and we are adding him to normal group, then call SetOriginalGroup()
+ player->SetOriginalGroup(this, subGroup);
+ }
else //if player is not in group, then call set group
player->SetGroup(this, subGroup);