diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-10-19 17:57:30 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-10-19 17:57:30 -0500 |
| commit | 9dc2b7ecd566eea4115cea19a4036cfa49cce055 (patch) | |
| tree | f50c7015362ae2cad1dabb0bb6be83b63e56a0c7 /src/server/game/Groups/Group.cpp | |
| parent | 972b41810330b287fc7c4172cf33878240cd25ce (diff) | |
| parent | 38ca1531d8738141c742d9b7f892a75af3283edd (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
| -rwxr-xr-x | src/server/game/Groups/Group.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 19ea3ff8174..11d9f502bab 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -523,7 +523,7 @@ bool Group::RemoveMember(uint64 guid, const RemoveMethod &method /*= GROUP_REMOV WorldPacket data; - if (method == GROUP_REMOVEMETHOD_KICK) + if (method == GROUP_REMOVEMETHOD_KICK || method == GROUP_REMOVEMETHOD_KICK_LFG) { data.Initialize(SMSG_GROUP_UNINVITE, 0); player->GetSession()->SendPacket(&data); @@ -600,7 +600,7 @@ bool Group::RemoveMember(uint64 guid, const RemoveMethod &method /*= GROUP_REMOV if (isLFGGroup() && GetMembersCount() == 1) { Player* Leader = ObjectAccessor::FindPlayer(GetLeaderGUID()); - LFGDungeonEntry const* dungeon = sLFGDungeonStore.LookupEntry(sLFGMgr->GetDungeon(GetGUID())); + LFGDungeonData const* dungeon = sLFGMgr->GetLFGDungeon(sLFGMgr->GetDungeon(GetGUID())); if ((Leader && dungeon && Leader->isAlive() && Leader->GetMapId() != uint32(dungeon->map)) || !dungeon) { Disband(); |
