From 21050797ec3ad3d35cc4ae89877a93c0081948ef Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 6 Feb 2024 19:30:32 +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 1c62d1ae..06cd6de4 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1843,6 +1843,9 @@ void Room::CombineTeam()
     if (!mt::Param::s().prebattle_combine_team) {
         return;
     }
+    if (IsCustomBattle()) {
+        return;
+    }
     std::map<int, size_t> need_combine_teams;
     std::map<int, size_t> need_combine_teams_copy;