aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/GroupHandler.cpp
diff options
context:
space:
mode:
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))
{