server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-01-13 11:57:57 +08:00
parent f6a945d6a8
commit ef7df2b543
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/mapinstance.cc
View File

@ -500,6 +500,9 @@ bool MapInstance::Raycast(int layer, const glm::vec3& start, const glm::vec3& en
} }
} }
} }
if (!ok) {
return false;
}
assert(ok); assert(ok);
hit_pos_[0] = hit_pos_copy[0]; hit_pos_[0] = hit_pos_copy[0];
hit_pos_[1] = h; hit_pos_[1] = h;

6
server/gameserver/room.cc
View File

@ -968,9 +968,11 @@ bool Room::CanJoin(class MatchTeam* team)
if (GetGasData().GetGasMode() != GasInactive) { if (GetGasData().GetGasMode() != GasInactive) {
return false; return false;
} }
#if 0
if (map_instance->map_id != team->GetMapId()) { if (map_instance->map_id != team->GetMapId()) {
return false; return false;
} }
#endif
if (team->GetOwner()->msg->pve_instance_id() && !pve_instance){ if (team->GetOwner()->msg->pve_instance_id() && !pve_instance){
return false; return false;
} }
@ -987,7 +989,7 @@ bool Room::CanJoin(class MatchTeam* team)
return false; return false;
} }
#endif #endif
if (GetPlayerNum() < (int)GetRoomMaxPlayerNum()) { if (GetPlayerNum() > (int)GetRoomMaxPlayerNum()) {
return false; return false;
} }
for (auto& member : team->GetCurrMembers()) { for (auto& member : team->GetCurrMembers()) {
@ -995,7 +997,7 @@ bool Room::CanJoin(class MatchTeam* team)
return false; return false;
} }
} }
return false; return true;
} }
void Room::OnPlayerOffline(Player* hum) void Room::OnPlayerOffline(Player* hum)