summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/commandhandler.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index f650ac8d1..559cfd37e 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -26,6 +26,7 @@
#include "channelmanager.h"
#include "channel.h"
#include "game.h"
+#include "guildmanager.h"
#include "localplayer.h"
#include "logger.h"
#include "main.h"
@@ -497,7 +498,12 @@ void CommandHandler::handleMe(const std::string &args, ChatTab *tab)
return;
const Guild *guild = player_node->getGuild();
if (guild)
- Net::getGuildHandler()->chat(guild->getId(), str);
+ {
+ if (guild->getServerGuild())
+ Net::getGuildHandler()->chat(guild->getId(), str);
+ else if (guildManager)
+ guildManager->chat(str);
+ }
break;
}
default: