From 2aca300cd238b94ea20f27fd112b8e3e597d4930 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 4 Apr 2023 18:13:59 +0800
Subject: [PATCH] 1

---
 server/gameserver/room.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index daced23f..e12d6a45 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1515,7 +1515,7 @@ void Room::CombineTeam()
         return;
     }
 
-    if (need_combine_teams.size() < 2) {
+    if (need_combine_teams.size() <= 2) {
         return;
     }
     if (total_count == 3) {
@@ -1529,12 +1529,11 @@ void Room::CombineTeam()
         if (del_team_id != 0) {
             auto itr = need_combine_teams.find(del_team_id);
             if (itr != need_combine_teams.end()) {
-                total_count -= itr->second->GetTeamNum();
+                total_count -= itr->second;
                 need_combine_teams.erase(itr);
-                break;
             }
         }
-        if (total_count <= 0) {
+        if (total_count <= 1) {
             abort();
         }
     }