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