server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-10-28 21:58:35 +08:00
parent efb7cb7923
commit 5b005110fa
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/room.cc
View File

@ -1918,6 +1918,9 @@ void Room::CombineTeam()
if (IsCustomBattle()) { if (IsCustomBattle()) {
return; return;
} }
if (GetMapModeMeta()->mapMode() == mt::kCircuitMatchMode) {
return;
}
std::map<int, size_t> need_combine_teams; std::map<int, size_t> need_combine_teams;
std::map<int, size_t> need_combine_teams_copy; std::map<int, size_t> need_combine_teams_copy;
@ -2113,7 +2116,7 @@ void Room::FillTeam()
for (int i = pair.second->GetTeam()->GetMemberNum(); i < GetMaxTeamNum(); ++i) { for (int i = pair.second->GetTeam()->GetMemberNum(); i < GetMaxTeamNum(); ++i) {
if (!free_team_list.empty()) { if (!free_team_list.empty()) {
std::shared_ptr<Team> b_team = free_team_list.at(free_team_list.size() - 1); std::shared_ptr<Team> b_team = free_team_list.at(free_team_list.size() - 1);
pair.second->GetTeam()->CombineTeam(b_team.get()); 4 pair.second->GetTeam()->CombineTeam(b_team.get());
free_team_list.erase(free_team_list.begin() + free_team_list.size() - 1); free_team_list.erase(free_team_list.begin() + free_team_list.size() - 1);
team_hash_.erase(b_team->GetTeamId()); team_hash_.erase(b_team->GetTeamId());
} }