aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/GroupHandler.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-11-07 22:17:04 +0100
committerjackpoz <giacomopoz@gmail.com>2014-11-07 22:17:04 +0100
commit1802fb3e1efcf4c6c37b98189555bf23de62b0e0 (patch)
tree218f7c2e32dcd816839c66852991428355904425 /src/server/game/Handlers/GroupHandler.cpp
parentd77ec27d8fcc8c0ddd463afecb9356f831eef8a4 (diff)
Core/LFG: Fix party members not being able to vote to kick Leader
Diffstat (limited to 'src/server/game/Handlers/GroupHandler.cpp')
-rw-r--r--src/server/game/Handlers/GroupHandler.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index f42919486a5..b9433b719fe 100644
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -288,7 +288,7 @@ void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recvData)
return;
}
- PartyResult res = GetPlayer()->CanUninviteFromGroup();
+ PartyResult res = GetPlayer()->CanUninviteFromGroup(guid);
if (res != ERR_PARTY_RESULT_OK)
{
SendPartyResult(PARTY_OP_UNINVITE, "", res);
@@ -296,14 +296,8 @@ void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recvData)
}
Group* grp = GetPlayer()->GetGroup();
- if (!grp)
- return;
-
- if (grp->IsLeader(guid))
- {
- SendPartyResult(PARTY_OP_UNINVITE, "", ERR_NOT_LEADER);
- return;
- }
+ // grp is checked already above in CanUninviteFromGroup()
+ ASSERT(grp);
if (grp->IsMember(guid))
{