From 8131a17b49e6d3d3e502fffe2413ec0d50e95714 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 31 Mar 2020 17:34:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E9=98=9F=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/room.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 255e8b4..ab94a60 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1300,23 +1300,23 @@ void Room::CombineTeam() need_combine_teams_copy.erase(team_id2); } else { if (pair1.second >= pair2.second) { - need_combine_teams.erase(team_id2); - need_combine_teams_copy.erase(team_id2); if (pair1.second + pair2.second >= MAX_TEAM_NUM) { need_combine_teams.erase(team_id1); need_combine_teams_copy.erase(team_id1); } else { pair1.second = new_team_num; } + need_combine_teams.erase(team_id2); + need_combine_teams_copy.erase(team_id2); } else { - need_combine_teams.erase(team_id1); - need_combine_teams_copy.erase(team_id1); if (pair1.second + pair2.second >= MAX_TEAM_NUM) { need_combine_teams.erase(team_id2); need_combine_teams_copy.erase(team_id2); } else { pair2.second = new_team_num; } + need_combine_teams.erase(team_id1); + need_combine_teams_copy.erase(team_id1); } } combine_ok = true;