diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-08-30 01:57:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-08-30 02:32:13 +0300 |
| commit | 9f752d5431364c052b364045015d3574da2c320c (patch) | |
| tree | 9278797f892129e42fde74656db032dc480c4490 /src/net | |
| parent | 8158669fde4f4a32191d6b052586e7cf0889ab7e (diff) | |
| download | plus-9f752d5431364c052b364045015d3574da2c320c.tar.gz plus-9f752d5431364c052b364045015d3574da2c320c.tar.bz2 plus-9f752d5431364c052b364045015d3574da2c320c.tar.xz plus-9f752d5431364c052b364045015d3574da2c320c.zip | |
Dont create guild manager instance if guild bot support not enabled.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/chathandler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 2714f94ce..4a5cfb841 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -662,7 +662,7 @@ void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg) if ((dstBeing = actorSpriteManager->findBeing(msg.readInt32()))) { dstBeing->setPartyName(msg.readString(24)); - if (!guildManager || !guildManager->getEnableGuildBot()) + if (!guildManager || !GuildManager::getEnableGuildBot()) dstBeing->setGuildName(msg.readString(24)); dstBeing->setGuildPos(msg.readString(24)); dstBeing->addToCache(); diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index e430dfc0f..5737cc2b2 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -162,7 +162,7 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) if (nick != "Server") { - if (guildManager && guildManager->getEnableGuildBot() + if (guildManager && GuildManager::getEnableGuildBot() && nick == "guild" && guildManager->processGuildMessage(chatMsg)) { return; |