From 14098b28b39bc9d1ea17d18a7ecd3dd610f29cdc Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 2 May 2021 00:44:31 +0200 Subject: Core/Chat: Allow incorrect spell/skill language assignments to mirror client behavior --- src/server/game/Texts/ChatTextBuilder.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/game/Texts/ChatTextBuilder.cpp') diff --git a/src/server/game/Texts/ChatTextBuilder.cpp b/src/server/game/Texts/ChatTextBuilder.cpp index b31d126d676..ea564c2aa7f 100644 --- a/src/server/game/Texts/ChatTextBuilder.cpp +++ b/src/server/game/Texts/ChatTextBuilder.cpp @@ -27,17 +27,15 @@ namespace Trinity { ChatPacketSender::ChatPacketSender(ChatMsg chatType, ::Language language, WorldObject const* sender, WorldObject const* receiver, std::string message, uint32 achievementId /*= 0*/, LocaleConstant locale /*= LOCALE_enUS*/) - : Type(chatType), Language(language), Sender(sender), Receiver(receiver), Text(std::move(message)), AchievementId(achievementId), Locale(locale), LanguageSkillId(0) + : Type(chatType), Language(language), Sender(sender), Receiver(receiver), Text(std::move(message)), AchievementId(achievementId), Locale(locale) { UntranslatedPacket.Initialize(Type, Language, Sender, Receiver, Text, AchievementId, "", Locale); UntranslatedPacket.Write(); - if (LanguageDesc const* languageDesc = sLanguageMgr->GetLanguageDescById(language)) - LanguageSkillId = languageDesc->SkillId; } void ChatPacketSender::operator()(Player const* player) const { - if (Language == LANG_UNIVERSAL || Language == LANG_ADDON || Language == LANG_ADDON_LOGGED || player->CanUnderstandLanguageSkillId(LanguageSkillId)) + if (Language == LANG_UNIVERSAL || Language == LANG_ADDON || Language == LANG_ADDON_LOGGED || player->CanUnderstandLanguage(Language)) { player->SendDirectMessage(UntranslatedPacket.GetRawPacket()); return; -- cgit v1.2.3