From 9966f08e783acbad22989663de177a35e3116688 Mon Sep 17 00:00:00 2001
From: Snowram <robin.gilh@gmail.com>
Date: Sun, 15 Nov 2020 02:17:41 +0100
Subject: [PATCH] Addressed comments

---
 common/src/sys/agent.rs              | 4 ++--
 server/src/events/entity_creation.rs | 3 +--
 voxygen/src/scene/mod.rs             | 6 ++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/common/src/sys/agent.rs b/common/src/sys/agent.rs
index 41768501de..a1b6004c2d 100644
--- a/common/src/sys/agent.rs
+++ b/common/src/sys/agent.rs
@@ -343,10 +343,10 @@ impl<'a> System<'a> for Sys {
                         ) {
                             controller.actions.push(ControlAction::Wield);
 
-                            let eye_offset = body.map_or(1.0, |b| b.eye_height());
+                            let eye_offset = body.map_or(0.0, |b| b.eye_height());
 
                             let tgt_eye_offset =
-                                bodies.get(*target).map_or(1.0, |b| b.eye_height());
+                                bodies.get(*target).map_or(0.0, |b| b.eye_height());
 
                             let distance_offset = match tactic {
                                 Tactic::Bow => 0.0004 * pos.0.distance_squared(tgt_pos.0),
diff --git a/server/src/events/entity_creation.rs b/server/src/events/entity_creation.rs
index 7824d45ec8..fbb914b0f9 100644
--- a/server/src/events/entity_creation.rs
+++ b/server/src/events/entity_creation.rs
@@ -118,8 +118,7 @@ pub fn handle_shoot(
         .ecs()
         .read_storage::<comp::Body>()
         .get(entity)
-        .map(|b| b.scale())
-        .unwrap_or(1.0);
+        .map_or(0.0, |b| b.scale());
 
     pos.z += eye_height;
 
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index 40154f9139..f8f6d8de32 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -472,16 +472,14 @@ impl Scene {
             .ecs()
             .read_storage::<comp::Body>()
             .get(scene_data.player_entity)
-            .map(|b| b.scale())
-            .unwrap_or(1.0);
+            .map_or(1.0, |b| b.scale());
 
         let eye_height = scene_data
             .state
             .ecs()
             .read_storage::<comp::Body>()
             .get(scene_data.player_entity)
-            .map(|b| b.eye_height())
-            .unwrap_or(1.0);
+            .map_or(0.0, |b| b.eye_height());
 
         // Add the analog input to camera
         self.camera