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:42:13 +08:00
parent 4f13bb2f61
commit 0b101aa961
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/matchteam.cc
View File

@ -443,9 +443,16 @@ bool MatchTeam::CanCombine(MatchTeam* b)
#endif #endif
return false; return false;
} }
if (GetSlotNum() != b->GetSlotNum()) { if (GetOwner()->msg->room_mode() != b->GetOwner()->msg->room_mode() ||
GetOwner()->msg->pve_instance_id() != b->GetOwner()->msg->pve_instance_id()) {
#ifdef DEBUG #ifdef DEBUG
a8::XPrintf("CanCombine 31\n", {}); a8::XPrintf("CanCombine 31\n", {});
#endif
return false;
}
if (GetSlotNum() != b->GetSlotNum()) {
#ifdef DEBUG
a8::XPrintf("CanCombine 32\n", {});
#endif #endif
return false; return false;
} }