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:25:06 +0100
commitf65b98f62517a9bd8a8d407b72cccb03455c955a (patch)
tree40ab7a9a15c9d00865e0bb8bbf971dbb39ff6a2c /src/server/game/Handlers/GroupHandler.cpp
parent9f99f6bf47650ae55f957fba3fae4481b788dcdb (diff)
Core/LFG: Fix party members not being able to vote to kick Leader
(cherry picked from commit 1802fb3e1efcf4c6c37b98189555bf23de62b0e0)
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 32fb9bd1ee4..c5207941301 100644
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -416,7 +416,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);
@@ -424,14 +424,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))
{