1

2022-10-23 09:16:21 +08:00 · 2022-10-23 09:16:21 +08:00 · 4f13bb2f61
commit 4f13bb2f61
parent aa6c140048
1 changed files with 0 additions and 2 deletions
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@ -479,14 +479,12 @@ bool MatchTeam::CanCombine(MatchTeam* b)
 #endif
        return false;
    }
-#if 1
    if (GetEmptySlotNum() + b->GetInitMemberNum() > GetSlotNum()) {
 #ifdef DEBUG
        a8::XPrintf("CanCombine 9\n", {});
 #endif
        return false;
    }
-#endif
    if (combined_team_hash_.find(b->GetTeamUUid()) != combined_team_hash_.end()) {
 #ifdef DEBUG
        a8::XPrintf("CanCombine 10\n", {});