Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Handlers/ChatHandler.cpp

1 files changed, 4 insertions, 12 deletions

diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index 8cac59dfd9b..9266653558f 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -156,20 +156,12 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData)
                 case CHAT_MSG_GUILD:
                 case CHAT_MSG_BATTLEGROUND:
                 case CHAT_MSG_WHISPER:
-                    if (sWorld->getBoolConfig(CONFIG_CHATLOG_ADDON))
-                    {
-                        std::string msg = "";
-                        recvData >> msg;
-
-                        if (msg.empty())
-                            return;
-
-                        sScriptMgr->OnPlayerChat(sender, uint32(CHAT_MSG_ADDON), lang, msg);
-                    }
-
-                    // Disabled addon channel?
+                    // check if addon messages are disabled
                     if (!sWorld->getBoolConfig(CONFIG_ADDON_CHANNEL))
+                    {
+                        recvData.rfinish();
                         return;
+                    }
                     break;
                 default:
                     TC_LOG_ERROR("network", "Player %s (GUID: %u) sent a chatmessage with an invalid language/message type combination",