jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

how did this ever work?

Browse Source
This commit is contained in:
jake 2020-11-25 22:02:16 -07:00
parent 78ed2101e5
commit f96ae557fd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ship/location.rs
View File

@ -146,6 +146,12 @@ impl Default for ClientLocation {
impl ClientLocation { impl ClientLocation {
pub fn add_client_to_lobby(&mut self, id: ClientId, lobby: LobbyId) -> Result<(), JoinLobbyError> { pub fn add_client_to_lobby(&mut self, id: ClientId, lobby: LobbyId) -> Result<(), JoinLobbyError> {
let l = self.lobbies.get_mut(lobby.0).ok_or(JoinLobbyError::LobbyDoesNotExist)?;
if l.0.iter().filter(|c| c.is_none()).count() == 0 {
return Err(JoinLobbyError::LobbyFull);
}
self.remove_client_from_area(id);
let l = self.lobbies.get_mut(lobby.0).ok_or(JoinLobbyError::LobbyDoesNotExist)?; let l = self.lobbies.get_mut(lobby.0).ok_or(JoinLobbyError::LobbyDoesNotExist)?;
let (index, empty_slot) = l.0.iter_mut() let (index, empty_slot) = l.0.iter_mut()
.enumerate() .enumerate()
@ -157,7 +163,6 @@ impl ClientLocation {
local_client: LocalClientId(index), local_client: LocalClientId(index),
time_join: SystemTime::now(), time_join: SystemTime::now(),
}); });
self.remove_client_from_area(id);
self.client_location.insert(id, RoomLobby::Lobby(lobby)); self.client_location.insert(id, RoomLobby::Lobby(lobby));
Ok(()) Ok(())
} }