diff options
| -rw-r--r-- | src/net/ea/chathandler.cpp | 9 | ||||
| -rw-r--r-- | src/net/ea/chathandler.h | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 7199d3b5c..a10bf931d 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -49,6 +49,7 @@ namespace Ea ChatHandler::ChatHandler() : mSentWhispers(), + mMotdTime(-1), mShowAllLang(serverConfig.getValue("showAllLang", 0)), mShowMotd(config.getBoolValue("showmotd")), mSkipping(true) @@ -367,15 +368,17 @@ void ChatHandler::processChat(Net::MessageIn &msg, const bool normalChat, } } - if (chatMsg.find(": ") == std::string::npos && !mShowMotd + if (pos == std::string::npos && !mShowMotd && mSkipping && channel.empty()) { // skip motd from "new" tmw server + if (mMotdTime == -1) + mMotdTime = cur_time + 1; + else if (mMotdTime == cur_time || mMotdTime < cur_time) + mSkipping = false; return; } - mSkipping = false; - if (pos != std::string::npos) chatMsg.erase(0, pos + 3); diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index 49909ad6f..ead5dac98 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -60,6 +60,7 @@ class ChatHandler : public Net::ChatHandler protected: typedef std::queue<std::string> WhisperQueue; WhisperQueue mSentWhispers; + int mMotdTime; bool mShowAllLang; bool mShowMotd; bool mSkipping; |