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:15:19 +08:00
parent 4e4419a47b
commit aa6c140048
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/matchteam.cc
View File

@ -480,9 +480,7 @@ bool MatchTeam::CanCombine(MatchTeam* b)
return false; return false;
} }
#if 1 #if 1
if (GetEmptySlotNum() + b->GetInitMemberNum() > GetSlotNum()) {
#else
if (GetPredictMemberNum() + b->GetPredictMemberNum() > MAX_TEAM_NUM) {
#ifdef DEBUG #ifdef DEBUG
a8::XPrintf("CanCombine 9\n", {}); a8::XPrintf("CanCombine 9\n", {});
#endif #endif