From fc1420bfe4138c1429ae75bdced397df8c2072ec Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Wed, 20 Oct 2021 10:30:30 +0200 Subject: [PATCH] feat(Core/Battlegrounds): Added extra parameter to `SetQueueAnnouncementTimer`. (#8607) --- src/server/game/Battlegrounds/BattlegroundQueue.cpp | 4 ++-- src/server/game/Battlegrounds/BattlegroundQueue.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index 8b06d5a5f..27f84445c 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -1161,10 +1161,10 @@ void BattlegroundQueue::SendExitMessageArenaQueue(GroupQueueInfo* ginfo) sWorld->SendWorldText(LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT, TeamName.c_str(), ArenaType, ArenaType, ArenaTeamRating); } -void BattlegroundQueue::SetQueueAnnouncementTimer(uint32 bracketId, int32 timer) +void BattlegroundQueue::SetQueueAnnouncementTimer(uint32 bracketId, int32 timer, bool isCrossFactionBG /*= true*/) { _queueAnnouncementTimer[bracketId] = timer; - _queueAnnouncementCrossfactioned = true; + _queueAnnouncementCrossfactioned = isCrossFactionBG; } int32 BattlegroundQueue::GetQueueAnnouncementTimer(uint32 bracketId) const diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h index 89bd67326..9594d59a5 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -130,7 +130,7 @@ public: ArenaType GetArenaType() { return m_arenaType; } BattlegroundTypeId GetBGTypeID() { return m_bgTypeId; } - void SetQueueAnnouncementTimer(uint32 bracketId, int32 timer); + void SetQueueAnnouncementTimer(uint32 bracketId, int32 timer, bool isCrossFactionBG = true); [[nodiscard]] int32 GetQueueAnnouncementTimer(uint32 bracketId) const; private: