diff options
author | Jeremy <Golrag@users.noreply.github.com> | 2023-08-26 14:03:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-26 14:03:42 +0200 |
commit | 0ede6c155605da602b3bafaa3a1212d9f924759b (patch) | |
tree | c30077044c03821c4af7db095f49b1edf71d7a05 /src/server/game/Handlers/MovementHandler.cpp | |
parent | 3e7b5f982c3b518a642447f112fc628edd963ce2 (diff) |
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
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
-rw-r--r-- | src/server/game/Handlers/MovementHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index b8b36effa8c..6f9dfa69337 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -139,7 +139,7 @@ void WorldSession::HandleMoveWorldportAck() if (!mEntry->IsBattlegroundOrArena()) { // We're not in BG - player->SetBattlegroundId(0, BATTLEGROUND_TYPE_NONE); + player->SetBattlegroundId(0, BATTLEGROUND_TYPE_NONE, BATTLEGROUND_QUEUE_NONE); // reset destination bg team player->SetBGTeam(0); } @@ -147,7 +147,7 @@ void WorldSession::HandleMoveWorldportAck() else if (Battleground* bg = player->GetBattleground()) { if (player->IsInvitedForBattlegroundInstance(player->GetBattlegroundId())) - bg->AddPlayer(player); + bg->AddPlayer(player, player->m_bgData.queueId); } } |