From ef7df2b543070e4973b8baee3bc155b7b2a3be45 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 13 Jan 2023 11:57:57 +0800
Subject: [PATCH] 1

---
 server/gameserver/mapinstance.cc | 3 +++
 server/gameserver/room.cc        | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc
index 332f7d60..081691e5 100644
--- a/server/gameserver/mapinstance.cc
+++ b/server/gameserver/mapinstance.cc
@@ -500,6 +500,9 @@ bool MapInstance::Raycast(int layer, const glm::vec3& start, const glm::vec3& en
                     }
                 }
             }
+            if (!ok) {
+                return false;
+            }
             assert(ok);
             hit_pos_[0] = hit_pos_copy[0];
             hit_pos_[1] = h;
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index a77a0fac..ffdc6a4d 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -968,9 +968,11 @@ bool Room::CanJoin(class MatchTeam* team)
     if (GetGasData().GetGasMode() != GasInactive) {
         return false;
     }
+    #if 0
     if (map_instance->map_id != team->GetMapId()) {
         return false;
     }
+    #endif
     if (team->GetOwner()->msg->pve_instance_id() && !pve_instance){
         return false;
     }
@@ -987,7 +989,7 @@ bool Room::CanJoin(class MatchTeam* team)
         return false;
     }
 #endif
-    if (GetPlayerNum() < (int)GetRoomMaxPlayerNum()) {
+    if (GetPlayerNum() > (int)GetRoomMaxPlayerNum()) {
         return false;
     }
     for (auto& member : team->GetCurrMembers()) {
@@ -995,7 +997,7 @@ bool Room::CanJoin(class MatchTeam* team)
             return false;
         }
     }
-    return false;
+    return true;
 }
 
 void Room::OnPlayerOffline(Player* hum)