1

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

server/gameserver/matchteam.h

@@ -6,17 +6,17 @@
 
 enum MatchTeamPhase_e
 {
-  kMatchCombining = 1,
+    kMatchCombining = 1,
-  kMatchChoose = 2,
+    kMatchChoose = 2,
-  kMatchLock = 3,
+    kMatchLock = 3,
-  kMatchStartGame = 4,
+    kMatchStartGame = 4,
-  kMatchWaitStart = 5
+    kMatchWaitStart = 5
 };
 
 enum MatchTeamMember_e
 {
-  kMatchReadying = 0,
+    kMatchReadying = 0,
-  kMatchPrepare = 1,
+    kMatchPrepare = 1,
 };
 
 namespace cs