summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/chat-server/chathandler.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 0ec9ba39..3d2d8742 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -621,8 +621,11 @@ ChatHandler::handleGuildInvitation(ChatClient &client, MessageIn &msg)
if (invitedClient && guild)
{
- // check permissions of inviter
- if (guild->checkLeader(client.characterName))
+ // check permissions of inviter, and that they arent inviting themself,
+ // and arent someone already in the guild
+ if (guild->checkLeader(client.characterName) &&
+ (client.characterName != character) &&
+ !guild->checkInGuild(character))
{
// send the name of the inviter and the name of the guild
// that the character has been invited to join