From 528ab45d07fe54945a2809e39e922289c5447b15 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 19 May 2020 16:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/roommgr.cc | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index e1a2b1d..c83ae52 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -147,14 +147,6 @@ int RoomMgr::OverRoomNum()
 
 Room* RoomMgr::GetJoinableRoom(const cs::CMJoin& msg, const RoomType_e self_room_type)
 {
-    #if 0
-    for (auto& pair : inactive_room_hash_) {
-        if (pair.second->CanJoin(msg.account_id(), self_room_type)) {
-            return pair.second;
-        }
-    }
-    return nullptr;
-    #else
     std::vector<std::vector<Room*>> group_rooms;
     for (int i = 0; i < RT_Max; ++i) {
         group_rooms.push_back(std::vector<Room*>());
@@ -191,7 +183,6 @@ Room* RoomMgr::GetJoinableRoom(const cs::CMJoin& msg, const RoomType_e self_room
         }
     }
     return nullptr;
-    #endif
 }
 
 Room* RoomMgr::GetRoomByUuid(long long room_uuid)