diff options
Diffstat (limited to 'src/server/navigation.rs')
| -rw-r--r-- | src/server/navigation.rs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/server/navigation.rs b/src/server/navigation.rs index e14c340..67d6758 100644 --- a/src/server/navigation.rs +++ b/src/server/navigation.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use std::io::Write; use crate::mass::{Mass, MassType}; -use crate::server::connection::{receive, ServerConnection}; +use crate::server::connection::ServerConnection; impl ServerConnection { pub fn server_navigation(&mut self, masses: &mut HashMap<String, Mass>) { @@ -15,7 +15,6 @@ impl ServerConnection { ref mut navigation, .. } = ship.mass_type { - let navigation = navigation.as_mut().unwrap(); navigation.verify_target(ship.position.clone(), &masses); let mut within_range: HashMap<&String, &Mass> = masses .iter() @@ -29,12 +28,8 @@ impl ServerConnection { let send = serde_json::to_string(&within_range).unwrap() + "\n"; self.open = self.stream.write(send.as_bytes()).is_ok(); - match receive(&mut self.buff_r) { - Some(recv) => { - navigation.give_target(recv); - } - None => self.open = false, - } + let recv = self.receive(); + navigation.give_recv(recv); } } |