From 06c4cfe19854dbb26ccb12906ba7050619bfac25 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 7 Sep 2021 11:51:19 +0000
Subject: [PATCH] 1

---
 server/gameserver/room.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index bc65d5c..64bbbce 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1379,11 +1379,9 @@ void Room::MatchTeam(Human* hum)
 
 void Room::CombineTeam()
 {
-    #if 0
     if (MetaMgr::Instance()->prebattle_combine_team) {
         return;
     }
-    #endif
     std::map<int, size_t> need_combine_teams;
     std::map<int, size_t> need_combine_teams_copy;