From 5af7000b0fe5d45ec14b3c5d760874eb7ec8f959 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 30 Aug 2019 23:32:58 +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 0e94e65..1e9788c 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1206,6 +1206,9 @@ void Room::CombineTeam()
                         break;
                     }
                 }
+            }//end for
+            if (combine_ok) {
+                break;
             }
         }
     } while (combine_ok);