server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-10-23 09:16:21 +08:00
parent aa6c140048
commit 4f13bb2f61
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/matchteam.cc
View File

@ -479,14 +479,12 @@ bool MatchTeam::CanCombine(MatchTeam* b)
#endif #endif
return false; return false;
} }
#if 1
if (GetEmptySlotNum() + b->GetInitMemberNum() > GetSlotNum()) { if (GetEmptySlotNum() + b->GetInitMemberNum() > GetSlotNum()) {
#ifdef DEBUG #ifdef DEBUG
a8::XPrintf("CanCombine 9\n", {}); a8::XPrintf("CanCombine 9\n", {});
#endif #endif
return false; return false;
} }
#endif
if (combined_team_hash_.find(b->GetTeamUUid()) != combined_team_hash_.end()) { if (combined_team_hash_.find(b->GetTeamUUid()) != combined_team_hash_.end()) {
#ifdef DEBUG #ifdef DEBUG
a8::XPrintf("CanCombine 10\n", {}); a8::XPrintf("CanCombine 10\n", {});