From 759d7c3724a77025d055499ed63a75b7ac10c7e0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 31 Jul 2020 15:40:28 +0800
Subject: [PATCH] 1

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

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index a0cd39a..2eacae3 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1149,6 +1149,9 @@ void Room::MatchTeam(Human* hum)
 
 void Room::CombineTeam()
 {
+    if (GetRoomMode() == kZombieMode) {
+        return;
+    }
     std::map<int, size_t> need_combine_teams;
     std::map<int, size_t> need_combine_teams_copy;