From cb7352480a0157406144850445081710bfa7b5d6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 16 Mar 2023 15:01:46 +0800
Subject: [PATCH] 1

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

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index f6ad5c7f..b635632b 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1473,8 +1473,7 @@ void Room::MatchTeam(Human* hum)
 
 void Room::CombineTeam()
 {
-    return;
-    if (mt::Param::s().prebattle_combine_team) {
+    if (!mt::Param::s().prebattle_combine_team) {
         return;
     }
     std::map<int, size_t> need_combine_teams;