From aa6c1400484f625bc59a0cf8c0b613b49457cec5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 23 Oct 2022 09:15:19 +0800
Subject: [PATCH] 1

---
 server/gameserver/matchteam.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 4c374bc0..c64e7fe8 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -480,9 +480,7 @@ bool MatchTeam::CanCombine(MatchTeam* b)
         return false;
     }
 #if 1
-
-#else
-    if (GetPredictMemberNum() + b->GetPredictMemberNum() > MAX_TEAM_NUM) {
+    if (GetEmptySlotNum() + b->GetInitMemberNum() > GetSlotNum()) {
 #ifdef DEBUG
         a8::XPrintf("CanCombine 9\n", {});
 #endif