From 575283f46c34761a1b2f6346600b5ea577c754ad Mon Sep 17 00:00:00 2001 From: Vincent Vanclef Date: Thu, 17 Apr 2025 21:39:05 +0200 Subject: [PATCH] fix(Core/AutobroadcastMgr): correctly check for existing textId in SendWorldAnnouncement (#21911) --- src/server/game/Autobroadcast/AutobroadcastMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Autobroadcast/AutobroadcastMgr.cpp b/src/server/game/Autobroadcast/AutobroadcastMgr.cpp index a7756c658..f41e27bb0 100644 --- a/src/server/game/Autobroadcast/AutobroadcastMgr.cpp +++ b/src/server/game/Autobroadcast/AutobroadcastMgr.cpp @@ -167,7 +167,7 @@ void AutobroadcastMgr::SendWorldAnnouncement(uint8 textId) // Get player's locale LocaleConstant locale = player->GetSession()->GetSessionDbLocaleIndex(); - if (!_autobroadcasts.empty()) + if (!_autobroadcasts.contains(textId)) return; std::string_view localizedMessage = ObjectMgr::GetLocaleString(_autobroadcasts[textId], locale); @@ -188,7 +188,7 @@ void AutobroadcastMgr::SendNotificationAnnouncement(uint8 textId) // Retrieve player's locale LocaleConstant locale = player->GetSession()->GetSessionDbLocaleIndex(); - if (!_autobroadcasts.count(textId)) + if (!_autobroadcasts.contains(textId)) return; // Get localized message