1 files changed, 43 insertions, 28 deletions

diff --git a/src/server/construction.rs b/src/server/construction.rs
index 94a6b0f..70038ae 100644
--- a/src/server/construction.rs
+++ b/src/server/construction.rs
@@ -1,47 +1,65 @@
 extern crate serde_json;
 
+use std::collections::HashMap;
 use std::io::BufRead;
 use std::io::Write;
-use std::collections::HashMap;
 
-use mass::{Mass, MassType};
-use modules::construction::Construction;
-use server::connection::ServerConnection;
-use modules::construction::ConstructionStatus;
-use modules::types::ModuleType;
+use crate::mass::{Mass, MassType};
+use crate::modules::construction::Construction;
+use crate::modules::construction::ConstructionStatus;
+use crate::modules::types::ModuleType;
+use crate::server::connection::ServerConnection;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ConstructionData {
-    pub status      : ConstructionStatus,
-    pub has_refined : bool,
+    pub status: ConstructionStatus,
+    pub has_refined: bool,
 }
 
 impl ServerConnection {
-    pub fn server_construction(&mut self, masses : &mut HashMap<String, Mass>) {
+    pub fn server_construction(&mut self, masses: &mut HashMap<String, Mass>) {
         let mut ship = masses.remove(&self.name).unwrap();
         let ship_clone = ship.clone();
+        let mut construct = false;
 
-        if let MassType::Ship{ref mut construction, ..} = ship.mass_type {
-            let mut construction = construction.as_mut().unwrap();
+        if let MassType::Ship {
+            ref mut construction,
+            ..
+        } = ship.mass_type
+        {
+            let construction = construction.as_mut().unwrap();
             let construction_data = get_construction_data(ship_clone.clone(), construction);
 
-            if self.open {
-                if self.txrx_construction(&construction_data) {
-                    construction.toggle();
-                }
+            if self.open && self.txrx_construction(&construction_data) {
+                construction.toggle();
             }
 
             if construction_data.status == ConstructionStatus::Constructed {
-                println!("inserted");
                 construction.take();
-                masses.insert("Station".to_string(), Mass::new_station(ModuleType::Refinery, ship_clone.position, ship_clone.velocity));
+                masses.insert(
+                    "Station".to_string(),
+                    Mass::new_station(
+                        ModuleType::Refinery,
+                        ship_clone.position,
+                        ship_clone.velocity,
+                    ),
+                );
+                construct = true;
             }
         }
 
+        if construct {
+            ship.take("Refined Mineral");
+            ship.take("Refined Mineral");
+            ship.take("Refined Mineral");
+            ship.take("Refined Mineral");
+            ship.take("Refined Mineral");
+        }
+
         masses.insert(self.name.clone(), ship);
     }
 
-    fn txrx_construction(&mut self, construction_data : &ConstructionData) -> bool {
+    fn txrx_construction(&mut self, construction_data: &ConstructionData) -> bool {
         let send = serde_json::to_string(construction_data).unwrap() + "\n";
         if let Err(_err) = self.stream.write(send.as_bytes()) {
             self.open = false;
@@ -52,14 +70,14 @@ impl ServerConnection {
             match recv.as_bytes() {
                 b"c\n" => {
                     if construction_data.has_refined {
-                        return true
+                        return true;
                     }
-                },
+                }
                 _ => {
                     if result == 0 {
                         self.open = false;
                     }
-                },
+                }
             }
         }
 
@@ -67,14 +85,11 @@ impl ServerConnection {
     }
 }
 
-fn get_construction_data(ship : Mass, construction : &Construction) -> ConstructionData {
-    let mut has_refined = false;
-    if ship.refined_count() >= 5 {
-        has_refined = true;
-    }
+fn get_construction_data(ship: Mass, construction: &Construction) -> ConstructionData {
+    let has_refined = ship.refined_count() >= 5;
 
     ConstructionData {
-        status      : construction.status.clone(),
-        has_refined : has_refined,
+        status: construction.status.clone(),
+        has_refined,
     }
 }