From be781c14c507aaa075e36de8bfcea91f1cd80dbb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 16 Oct 2022 10:35:36 +0800
Subject: [PATCH] 1

---
 server/gameserver/matchteam.cc | 13 +++++++++++++
 server/gameserver/matchteam.h  | 14 +++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 1083cef7..25e0fc09 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -472,10 +472,23 @@ bool MatchTeam::CanCombine(MatchTeam* b)
     if (!b->combined_team_hash_.empty()) {
 #ifdef DEBUG
         a8::XPrintf("CanCombine 8\n", {});
+#endif
+        return false;
+    }
+    if (!HaveEmptySlot()) {
+#ifdef DEBUG
+        a8::XPrintf("CanCombine 32\n", {});
+#endif
+        return false;
+    }
+    if (!b->HaveEmptySlot()) {
+#ifdef DEBUG
+        a8::XPrintf("CanCombine 33\n", {});
 #endif
         return false;
     }
 #if 1
+
 #else
     if (GetPredictMemberNum() + b->GetPredictMemberNum() > MAX_TEAM_NUM) {
 #ifdef DEBUG
diff --git a/server/gameserver/matchteam.h b/server/gameserver/matchteam.h
index bc12d3eb..b52d7ee0 100644
--- a/server/gameserver/matchteam.h
+++ b/server/gameserver/matchteam.h
@@ -6,17 +6,17 @@
 
 enum MatchTeamPhase_e
 {
-  kMatchCombining = 1,
-  kMatchChoose = 2,
-  kMatchLock = 3,
-  kMatchStartGame = 4,
-  kMatchWaitStart = 5
+    kMatchCombining = 1,
+    kMatchChoose = 2,
+    kMatchLock = 3,
+    kMatchStartGame = 4,
+    kMatchWaitStart = 5
 };
 
 enum MatchTeamMember_e
 {
-  kMatchReadying = 0,
-  kMatchPrepare = 1,
+    kMatchReadying = 0,
+    kMatchPrepare = 1,
 };
 
 namespace cs