diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index afaa0063a4..09c2a7e6b2 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -118,12 +118,12 @@ void Channel::GetChannelName(std::string& channelName, uint32 channelId, LocaleC if (!(channelEntry->flags & CHANNEL_DBC_FLAG_GLOBAL)) { if (channelEntry->flags & CHANNEL_DBC_FLAG_CITY_ONLY) - channelName = Trinity::StringFormat(channelEntry->pattern[locale], sObjectMgr->GetTrinityString(LANG_CHANNEL_CITY, locale)); + channelName = Trinity::StringFormat(channelEntry->pattern, sObjectMgr->GetTrinityString(LANG_CHANNEL_CITY, locale)); else - channelName = Trinity::StringFormat(channelEntry->pattern[locale], ASSERT_NOTNULL(zoneEntry)->area_name[locale]); + channelName = Trinity::StringFormat(channelEntry->pattern, ASSERT_NOTNULL(zoneEntry)->area_name[locale]); } else - channelName = channelEntry->pattern[locale]; + channelName = channelEntry->pattern; } } diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index 4b3caae686..231b4400ad 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -76,7 +76,7 @@ public: if (!entry) continue; - if (strstr(entry->pattern[handler->GetSessionDbcLocale()], channelStr)) + if (strstr(entry->pattern, channelStr)) { channelId = i; break; @@ -90,7 +90,7 @@ public: if (!entry) continue; - if (strstr(entry->area_name[handler->GetSessionDbcLocale()], channelStr)) + if (strstr(entry->area_name, channelStr)) { zoneEntry = entry; break;