Fixed guilds not being removed when leader quits.

1 files changed, 2 insertions, 7 deletions

diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 9d146ad1..ca0cc88c 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -338,7 +338,7 @@ ChatHandler::handleRegisterChannelMessage(ChatClient &client, MessageIn &msg)
     else if (guildManager->doesExist(channelName))
     {
         // Channel already exists
-        reply.writeByte(ERRMSG_INVALID_ARGUMENT);
+        reply.writeByte(ERRMSG_ALREADY_TAKEN);
     }
     else
     {
@@ -579,9 +579,6 @@ ChatHandler::handleGuildCreation(ChatClient &client, MessageIn &msg)
         // Send autocreated channel id
         short channelId = joinGuildChannel(guildName, client);
         reply.writeShort(channelId);
-
-        // Add new guild to chatclient
-        client.guilds.push_back(guild);
     }
     else
     {
@@ -661,8 +658,6 @@ ChatHandler::handleGuildAcceptInvite(ChatClient &client, MessageIn &msg)
 
             short id = joinGuildChannel(guild->getName(), client);
             reply.writeShort(id);
-
-            client.guilds.push_back(guild);
         }
         else
         {
@@ -723,7 +718,7 @@ ChatHandler::handleGuildQuit(ChatClient &client, MessageIn &msg)
         {
             reply.writeByte(ERRMSG_OK);
             reply.writeShort(guildId);
-            guild->removeMember(client.characterName);
+            guildManager->removeGuildMember(guildId, client.characterName);
         }
         else
         {