summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/chat-server/chathandler.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 664ac4a8..17346e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-02 David Athay <ko2fan@gmail.com>
+
+ * src/chat-server/chathandler.cpp: Fix accepting guild invites.
+
2008-04-01 David Athay <ko2fan@gmail.com>
* src/account-server/dalstorage.cpp,
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index d6a21ca9..0ec9ba39 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -654,12 +654,12 @@ void
ChatHandler::handleGuildAcceptInvite(ChatClient &client, MessageIn &msg)
{
MessageOut reply(CPMSG_GUILD_ACCEPT_RESPONSE);
- short guildId = msg.readShort();
+ std::string guildName = msg.readString();
// check guild exists and that member was invited
// then add them as guild member
// and remove from invite list
- Guild *guild = guildManager->findById(guildId);
+ Guild *guild = guildManager->findByName(guildName);
if (guild)
{
if (guild->checkInvited(client.characterName))