Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'imbris/fix-server' into 'master'

Browse Source 
Fix server panic

See merge request veloren/veloren!1890
This commit is contained in:
Imbris 2021-03-13 08:58:06 +00:00
commit 0170acb460
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/client.rs
View File

@ -193,13 +193,14 @@ impl Client {
&self,
stream_id: u8,
) -> Result<Option<M>, StreamError> {
// TODO: are two systems using the same stream?? why is there contention here?
match stream_id {
0 => self.register_stream.try_lock().unwrap().try_recv(),
1 => self.character_screen_stream.try_lock().unwrap().try_recv(),
2 => self.in_game_stream.try_lock().unwrap().try_recv(),
3 => self.general_stream.try_lock().unwrap().try_recv(),
4 => self.ping_stream.try_lock().unwrap().try_recv(),
5 => self.terrain_stream.try_lock().unwrap().try_recv(),
0 => self.register_stream.lock().unwrap().try_recv(),
1 => self.character_screen_stream.lock().unwrap().try_recv(),
2 => self.in_game_stream.lock().unwrap().try_recv(),
3 => self.general_stream.lock().unwrap().try_recv(),
4 => self.ping_stream.lock().unwrap().try_recv(),
5 => self.terrain_stream.lock().unwrap().try_recv(),
_ => unreachable!("invalid stream id"),
}
}