From 8c0bc41e93367afc4dba8c8fe8f916be89850eb9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 25 Jul 2019 21:51:15 +0800
Subject: [PATCH] 1

---
 server/gameserver/roommgr.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index d16da0d..de34e23 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -102,12 +102,16 @@ int RoomMgr::OverRoomNum()
 
 Room* RoomMgr::GetJoinableRoom(const cs::CMJoin& msg)
 {
-    for (auto& pair : inactive_room_hash_) {
-        if (pair.second->CanJoin(msg)) {
-            return pair.second;
+    auto itr = room_unionid_hash_.find(msg.team_uuid());
+    if (itr != room_unionid_hash_.end()) {
+        if (itr->second->CanJoin(msg)) {
+            return itr->second;
+        } else {
+            return nullptr;
         }
+    } else {
+        return nullptr;
     }
-    return nullptr;
 }
 
 Room* RoomMgr::GetRoomByUuid(long long room_uuid)