From 0ede6c155605da602b3bafaa3a1212d9f924759b Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 26 Aug 2023 14:03:42 +0200 Subject: Core/Battlegrounds: Rework queues (#29200) * No more copies of Battleground classes * FreesSlotQueues now have as key the MapId instead of queue id * Random queues can now popup already busy specific battelgrounds (queues are NOT merged) * Removed Holiday handling, this should already be handled in BattlegroundMgr::IsBGWeekend --- src/server/scripts/Commands/cs_misc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index efaf039149a..a368b7033e5 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -389,7 +389,7 @@ public: // all's well, set bg id // when porting out from the bg, it will be reset to 0 - _player->SetBattlegroundId(target->GetBattlegroundId(), target->GetBattlegroundTypeId()); + _player->SetBattlegroundId(target->GetBattlegroundId(), target->GetBattlegroundTypeId(), BATTLEGROUND_QUEUE_NONE); // unsure // remember current position as entry point for return at bg end teleportation if (!_player->GetMap()->IsBattlegroundOrArena()) _player->SetBattlegroundEntryPoint(); @@ -522,7 +522,7 @@ public: // all's well, set bg id // when porting out from the bg, it will be reset to 0 - target->SetBattlegroundId(_player->GetBattlegroundId(), _player->GetBattlegroundTypeId()); + target->SetBattlegroundId(_player->GetBattlegroundId(), _player->GetBattlegroundTypeId(), BATTLEGROUND_QUEUE_NONE); // unsure about this // remember current position as entry point for return at bg end teleportation if (!target->GetMap()->IsBattlegroundOrArena()) target->SetBattlegroundEntryPoint(); -- cgit v1.2.3