From 35b43264c09405c987b48de78b6ca19f29dc7849 Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Thu, 14 Feb 2019 12:05:57 -0600
Subject: simplified receive pattern even more and moved all controls to the
 module

---
 src/server/navigation.rs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/server/navigation.rs')

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);
             }
         }
 
-- 
cgit v1.2.3