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-16 10:35:36 +08:00
parent d94b9a64d5
commit be781c14c5
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/gameserver/matchteam.cc
View File

@ -472,10 +472,23 @@ bool MatchTeam::CanCombine(MatchTeam* b)
if (!b->combined_team_hash_.empty()) { if (!b->combined_team_hash_.empty()) {
#ifdef DEBUG #ifdef DEBUG
a8::XPrintf("CanCombine 8\n", {}); a8::XPrintf("CanCombine 8\n", {});
#endif
return false;
}
if (!HaveEmptySlot()) {
#ifdef DEBUG
a8::XPrintf("CanCombine 32\n", {});
#endif
return false;
}
if (!b->HaveEmptySlot()) {
#ifdef DEBUG
a8::XPrintf("CanCombine 33\n", {});
#endif #endif
return false; return false;
} }
#if 1 #if 1
#else #else
if (GetPredictMemberNum() + b->GetPredictMemberNum() > MAX_TEAM_NUM) { if (GetPredictMemberNum() + b->GetPredictMemberNum() > MAX_TEAM_NUM) {
#ifdef DEBUG #ifdef DEBUG