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

1

Browse Source
This commit is contained in:
aozhiwei 2020-07-30 15:31:31 +08:00
parent 33bf201aed
commit 3960c50dc5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/room.cc
View File

@ -1118,7 +1118,7 @@ bool Room::GenSmallCircle(a8::Vec2 big_circle_pos, float big_circle_rad, float s
void Room::MatchTeam(Human* hum) void Room::MatchTeam(Human* hum)
{ {
if (!hum->team_uuid.empty()) { if (!hum->team_uuid.empty() && GetRoomMode() != kZombieMode) {
for (auto& pair : human_hash_) { for (auto& pair : human_hash_) {
if (pair.second != hum) { if (pair.second != hum) {
if (!hum->team_uuid.empty() && pair.second->team_uuid == hum->team_uuid) { if (!hum->team_uuid.empty() && pair.second->team_uuid == hum->team_uuid) {
@ -1146,6 +1146,9 @@ void Room::MatchTeam(Human* hum)
void Room::CombineTeam() void Room::CombineTeam()
{ {
if (GetRoomMode() != kChiJiMode) {
return;
}
std::map<int, size_t> need_combine_teams; std::map<int, size_t> need_combine_teams;
std::map<int, size_t> need_combine_teams_copy; std::map<int, size_t> need_combine_teams_copy;