From 3a323f2b60ed84e8f72deb4dab8f80f6f5ffe31d Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 11 Jan 2019 18:23:10 +0100 Subject: Core/Chat: Fixed addon chat messages using C_ChatInfo.SendAddonMessageLogged Closes #22926 --- src/server/game/Chat/Channels/Channel.cpp | 6 +++--- src/server/game/Chat/Channels/Channel.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Chat') diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index f111891a7cc..00eceb0f9fc 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -749,7 +749,7 @@ void Channel::Say(ObjectGuid const& guid, std::string const& what, uint32 lang) SendToAll(builder, !playerInfo.IsModerator() ? guid : ObjectGuid::Empty); } -void Channel::AddonSay(ObjectGuid const& guid, std::string const& prefix, std::string const& what) const +void Channel::AddonSay(ObjectGuid const& guid, std::string const& prefix, std::string const& what, bool isLogged) const { if (what.empty()) return; @@ -777,10 +777,10 @@ void Channel::AddonSay(ObjectGuid const& guid, std::string const& prefix, std::s WorldPackets::Chat::Chat* packet = new WorldPackets::Chat::Chat(); if (Player* player = ObjectAccessor::FindConnectedPlayer(guid)) - packet->Initialize(CHAT_MSG_CHANNEL, LANG_ADDON, player, player, what, 0, GetName(localeIdx), DEFAULT_LOCALE, prefix); + packet->Initialize(CHAT_MSG_CHANNEL, isLogged ? LANG_ADDON_LOGGED : LANG_ADDON, player, player, what, 0, GetName(localeIdx), DEFAULT_LOCALE, prefix); else { - packet->Initialize(CHAT_MSG_CHANNEL, LANG_ADDON, nullptr, nullptr, what, 0, GetName(localeIdx), DEFAULT_LOCALE, prefix); + packet->Initialize(CHAT_MSG_CHANNEL, isLogged ? LANG_ADDON_LOGGED : LANG_ADDON, nullptr, nullptr, what, 0, GetName(localeIdx), DEFAULT_LOCALE, prefix); packet->SenderGUID = guid; packet->TargetGUID = guid; } diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index 5425d516d69..3604958c20c 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -222,7 +222,7 @@ class TC_GAME_API Channel void List(Player const* player); void Announce(Player const* player); void Say(ObjectGuid const& guid, std::string const& what, uint32 lang) const; - void AddonSay(ObjectGuid const& guid, std::string const& prefix, std::string const& what) const; + void AddonSay(ObjectGuid const& guid, std::string const& prefix, std::string const& what, bool isLogged) const; void DeclineInvite(Player const* player); void Invite(Player const* player, std::string const& newp); void JoinNotify(Player const* player); -- cgit v1.2.3