From e79f763226ffb2a65ae10eb00f8ee7f710c00611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Korg=C3=B3l?= <kpiotr2005@gmail.com>
Date: Wed, 3 Jul 2019 22:28:13 +0200
Subject: [PATCH] Small cleanup to block placing and breaking

---
 voxygen/src/session.rs | 72 +++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index afa52093d0..6e9f3f1fce 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -112,12 +112,16 @@ impl PlayState for SessionState {
                     Event::InputUpdate(GameInput::Attack, state) => {
                         // Check the existence of CanBuild component. If it's here, use LMB to
                         // place blocks, if not, use it to attack
-                        let mut client = self.client.borrow_mut();
-                        match client
-                            .state()
-                            .read_component_cloned::<comp::CanBuild>(client.entity())
-                        {
-                            Some(_build_perms) => {
+                        if state {
+                            let mut client = self.client.borrow_mut();
+                            if client
+                                .state()
+                                .read_storage::<comp::CanBuild>()
+                                .get(client.entity())
+                                .is_some()
+                            {
+                                println!("Placing block");
+
                                 let (view_mat, _, cam_pos) =
                                     self.scene.camera().compute_dependents(&client);
                                 let cam_dir =
@@ -130,35 +134,34 @@ impl PlayState for SessionState {
                                     (ray.0, if let Ok(Some(_)) = ray.1 { true } else { false })
                                 };
 
-                                if state {
-                                    if b {
-                                        let pos = (cam_pos + cam_dir * (d - 0.01))
-                                            .map(|e| e.floor() as i32);
-                                        client.place_block(pos, Block::new(1, Rgb::broadcast(255))); // TODO: Handle block color with a command
-                                    }
+                                if b {
+                                    let pos =
+                                        (cam_pos + cam_dir * (d - 0.01)).map(|e| e.floor() as i32);
+                                    client.place_block(pos, Block::new(1, Rgb::broadcast(255))); // TODO: Handle block color with a command
                                 }
-                            }
-                            None => {
-                                if state {
-                                    if let ClientState::Character = current_client_state {
-                                        self.controller.attack = state
-                                    } else {
-                                        self.controller.respawn = state; // TODO: Don't do both
-                                    }
+                            } else {
+                                if let ClientState::Character = current_client_state {
+                                    self.controller.attack = state
                                 } else {
-                                    self.controller.attack = state;
-                                    self.controller.respawn = state;
+                                    self.controller.respawn = state; // TODO: Don't do both
                                 }
                             }
+                        } else {
+                            self.controller.attack = state;
+                            self.controller.respawn = state;
                         }
                     }
                     Event::InputUpdate(GameInput::SecondAttack, state) => {
-                        let mut client = self.client.borrow_mut();
-                        match client
-                            .state()
-                            .read_component_cloned::<comp::CanBuild>(client.entity())
-                        {
-                            Some(_build_perms) => {
+                        if state {
+                            let mut client = self.client.borrow_mut();
+                            if client
+                                .state()
+                                .read_storage::<comp::CanBuild>()
+                                .get(client.entity())
+                                .is_some()
+                            {
+                                println!("Placing block");
+
                                 let (view_mat, _, cam_pos) =
                                     self.scene.camera().compute_dependents(&client);
                                 let cam_dir =
@@ -171,15 +174,12 @@ impl PlayState for SessionState {
                                     (ray.0, if let Ok(Some(_)) = ray.1 { true } else { false })
                                 };
 
-                                if state {
-                                    if b {
-                                        let pos = (cam_pos + cam_dir * d).map(|e| e.floor() as i32);
-                                        client.remove_block(pos); // TODO: Handle block color with a command
-                                    }
+                                if b {
+                                    let pos = (cam_pos + cam_dir * d).map(|e| e.floor() as i32);
+                                    client.remove_block(pos);
                                 }
-                            }
-                            None => {
-                                // TODO: Handle secondary attack here
+                            } else {
+                                // TODO: Handle secondary attack
                             }
                         }
                     }