diff -r 16d3c9acd715 -r 24f692e791d3 rust/hedgewars-server/src/handlers.rs --- a/rust/hedgewars-server/src/handlers.rs Tue Dec 24 20:57:58 2019 +0300 +++ b/rust/hedgewars-server/src/handlers.rs Tue Dec 24 21:45:26 2019 +0300 @@ -233,10 +233,10 @@ Destination::ToIds(ids) => ids, Destination::ToAll { group, skip_self } => { let mut ids: Vec<_> = match group { - DestinationGroup::All => server.all_clients().collect(), - DestinationGroup::Lobby => server.lobby_clients().collect(), - DestinationGroup::Protocol(proto) => server.protocol_clients(proto).collect(), - DestinationGroup::Room(id) => server.room_clients(id).collect(), + DestinationGroup::All => server.iter_client_ids().collect(), + DestinationGroup::Lobby => server.lobby_client_ids().collect(), + DestinationGroup::Protocol(proto) => server.protocol_client_ids(proto).collect(), + DestinationGroup::Room(id) => server.room_client_ids(id).collect(), }; if skip_self { @@ -460,13 +460,11 @@ response.warn(ROOM_CONFIG_SAVE_FAILED); } IoResult::LoadRoom(room_id, Some(contents)) => { - if let Some(ref mut room) = state.server.get_room_mut(room_id) { - match room.set_saves(&contents) { - Ok(_) => response.add(server_chat(ROOM_CONFIG_LOADED.to_string()).send_self()), - Err(e) => { - warn!("Error while deserializing the room configs: {}", e); - response.warn(ROOM_CONFIG_DESERIALIZE_FAILED); - } + match state.server.set_room_saves(room_id, &contents) { + Ok(_) => response.add(server_chat(ROOM_CONFIG_LOADED.to_string()).send_self()), + Err(e) => { + warn!("Error while deserializing the room configs: {}", e); + response.warn(ROOM_CONFIG_DESERIALIZE_FAILED); } } }