Battleground: Fix players unable to join running battleground or too … #593
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…many players being able to join
killerwife
reviewed
Jan 21, 2025
| // invite those selection pools | ||
| for (uint8 i = 0; i < PVP_TEAM_COUNT; ++i) | ||
| for (GroupsQueueType::const_iterator citr = m_selectionPools[TEAM_INDEX_ALLIANCE + i].selectedGroups.begin(); citr != m_selectionPools[TEAM_INDEX_ALLIANCE + i].selectedGroups.end(); ++citr) | ||
| InviteGroupToBg((*citr), bgInfo, (*citr)->groupTeam); | ||
|
|
||
| queue.AddBgToFreeSlots(bgInfo); |
There was a problem hiding this comment.
Why the move of this code tidbit
There was a problem hiding this comment.
Because InviteGroupToBg modifies the invited values of bgInfo. If we copy bgInfo to the global queue object before these values are set they will be copied empty.
There was a problem hiding this comment.
Mind AddBgToFreeSlots does a copy instead of a move (if that is even possible).
This was referenced Jan 21, 2025
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…many players being able to join
🍰 Pullrequest
This pull request fixes two issues with battleground queues.
Proof
When a battleground is created for a premade group (and for non-premades simulary) the BattleGroundInQueueInfo is saved to the BattleGroundQueue here:
mangos-classic/src/game/BattleGround/BattleGroundQueue.cpp
Line 864 in f0fab6b
Notice that his is an emplace_back which copies the BattleGroundInQueueInfo so it can later be used to check the room for new invites. However only after the copy it fills the invited counts here:
mangos-classic/src/game/BattleGround/BattleGroundQueue.cpp
Line 869 in f0fab6b
Since the original bgInfo goes out of scope after this method the information is lost.
This leaves the invited players at 0/0 globally in the BattleGroundInQueueInfo while the battleground has the correct values. If a player removes the battleground it will actually make these values negative which makes it a huge number and this block any invites.
The second issue was actually a bit nastier. This is actually a copy:
mangos-classic/src/game/BattleGround/BattleGroundQueue.cpp
Line 789 in f0fab6b
The auto hides it a bit but if you create a custom destructor for BattleGroundInQueueInfo you see the queueInfo created from it go out of scope at the end of this code.
The result is that even with above fix new players joining a bg in progress are not saved to the global BattleGroundInQueueInfo resulting in the ability to join a filled battleground.
Issues
How2Test
-The expected results are that a battleground that is not completely filled should be joinable after one of the players leaves it and that a completely filled battleground should not be joinable.