diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc index c64e7fe8..dc274e56 100644 --- 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", {});