From 3960c50dc51bc15402106e06dce15573396c8aaf Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 30 Jul 2020 15:31:31 +0800
Subject: [PATCH] 1

---
 server/gameserver/room.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 4f1ede5..def5561 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1118,7 +1118,7 @@ bool Room::GenSmallCircle(a8::Vec2 big_circle_pos, float big_circle_rad, float s
 
 void Room::MatchTeam(Human* hum)
 {
-    if (!hum->team_uuid.empty()) {
+    if (!hum->team_uuid.empty() && GetRoomMode() != kZombieMode) {
         for (auto& pair : human_hash_) {
             if (pair.second != hum) {
                 if (!hum->team_uuid.empty() && pair.second->team_uuid == hum->team_uuid) {
@@ -1146,6 +1146,9 @@ void Room::MatchTeam(Human* hum)
 
 void Room::CombineTeam()
 {
+    if (GetRoomMode() != kChiJiMode) {
+        return;
+    }
     std::map<int, size_t> need_combine_teams;
     std::map<int, size_t> need_combine_teams_copy;