From 82bbd8bdbb635952c2891b24c0963c349ab07133 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Sat, 31 Aug 2019 13:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BB=84=E9=98=9F=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 1e9788c..c4082e0 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -917,7 +917,9 @@ void Room::UpdateGas()
                     CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size());
                     NotifyUiUpdate();
                 }
+                #if 0
                 CombineTeam();
+                #endif
                 ShuaPlane();
                 NotifyWxVoip();
                 RoomMgr::Instance()->ActiveRoom(room_uuid);