From c35db602f45852a880072a5a205b0c38c0ccbed4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Mon, 23 Sep 2019 16:32:32 +0800
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 0a9f928..a545de7 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -902,9 +902,7 @@ void Room::UpdateGas()
                     CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size());
                     NotifyUiUpdate();
                 }
-                #if 1
                 CombineTeam();
-                #endif
                 ShuaPlane();
                 NotifyWxVoip();
                 InitAirDrop();