1

2022-10-16 10:35:36 +08:00 · 2022-10-16 10:35:36 +08:00 · be781c14c5
commit be781c14c5
parent d94b9a64d5
2 changed files with 20 additions and 7 deletions
--- 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