1

2022-10-23 09:15:19 +08:00 · 2022-10-23 09:15:19 +08:00 · aa6c140048
commit aa6c140048
parent 4e4419a47b
1 changed files with 1 additions and 3 deletions
--- 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