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 2023-03-16 18:27:48 +08:00
parent ba8462677f
commit 851b55ae1f
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

@ -1214,6 +1214,7 @@ void Room::UpdateGasInactivePvp()
} }
battle_start_frameno_ = GetFrameNo(); battle_start_frameno_ = GetFrameNo();
CombineTeam(); CombineTeam();
FillTeam();
ClearPostBattleAutoFreeList(); ClearPostBattleAutoFreeList();
OnBattleStart(); OnBattleStart();
ShuaPlane(); ShuaPlane();
@ -1639,7 +1640,6 @@ void Room::CombineTeam()
} }
} }
} while (++try_count < 20); } while (++try_count < 20);
FillTeam();
} }
void Room::FillTeam() void Room::FillTeam()
@ -1659,7 +1659,10 @@ void Room::FillTeam()
for (int i = pair.second->GetTeam()->GetMemberNum(); i < MAX_TEAM_NUM; ++i) { for (int i = pair.second->GetTeam()->GetMemberNum(); i < MAX_TEAM_NUM; ++i) {
if (!free_team_list.empty()) { if (!free_team_list.empty()) {
Team* b_team = free_team_list.at(free_team_list.size() - 1); Team* b_team = free_team_list.at(free_team_list.size() - 1);
pair.second->GetTeam()->CombineTeam(b_team);
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());
delete b_team;
} }
} }
} }