From 455e7e08b8f2b2fe32d6ea4142ec76043f0b4507 Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Thu, 26 Sep 2019 18:48:37 +0200
Subject: [PATCH] Remove warnings

---
 common/src/comp/projectile.rs |  2 +-
 common/src/sys/combat.rs      | 20 +++++---------------
 common/src/sys/projectile.rs  | 21 ++-------------------
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs
index 3ee9a5b836..99d49c1550 100644
--- a/common/src/comp/projectile.rs
+++ b/common/src/comp/projectile.rs
@@ -1,4 +1,4 @@
-use specs::{Component, FlaggedStorage, NullStorage};
+use specs::{Component, FlaggedStorage};
 use specs_idvs::IDVStorage;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
diff --git a/common/src/sys/combat.rs b/common/src/sys/combat.rs
index bf6bb07787..fa366ff87e 100644
--- a/common/src/sys/combat.rs
+++ b/common/src/sys/combat.rs
@@ -1,7 +1,5 @@
 use crate::{
-    comp::{
-        ActionState::*, CharacterState, Controller, ForceUpdate, HealthSource, Ori, Pos, Stats, Vel,
-    },
+    comp::{ActionState::*, CharacterState, Controller, HealthSource, Ori, Pos, Stats},
     event::{EventBus, LocalEvent, ServerEvent},
     state::{DeltaTime, Uid},
 };
@@ -21,9 +19,6 @@ const BLOCK_EFFICIENCY: f32 = 0.9;
 const ATTACK_RANGE: f32 = 4.0;
 const BLOCK_ANGLE: f32 = 180.0;
 
-const KNOCKBACK_XY: f32 = 2.0;
-const KNOCKBACK_Z: f32 = 2.0;
-
 /// This system is responsible for handling accepted inputs like moving or attacking
 pub struct Sys;
 impl<'a> System<'a> for Sys {
@@ -36,10 +31,8 @@ impl<'a> System<'a> for Sys {
         ReadStorage<'a, Pos>,
         ReadStorage<'a, Ori>,
         ReadStorage<'a, Controller>,
-        WriteStorage<'a, Vel>,
         WriteStorage<'a, CharacterState>,
         WriteStorage<'a, Stats>,
-        WriteStorage<'a, ForceUpdate>,
     );
 
     fn run(
@@ -53,14 +46,12 @@ impl<'a> System<'a> for Sys {
             positions,
             orientations,
             controllers,
-            mut velocities,
             mut character_states,
-            mut stats,
-            mut force_updates,
+            stats,
         ): Self::SystemData,
     ) {
         let mut server_emitter = server_bus.emitter();
-        let mut local_emitter = local_bus.emitter();
+        let mut _local_emitter = local_bus.emitter();
 
         // Attacks
         for (entity, uid, pos, ori, _) in
@@ -87,14 +78,13 @@ impl<'a> System<'a> for Sys {
             if deal_damage {
                 if let Some(Attack { .. }) = &character_states.get(entity).map(|c| c.action) {
                     // Go through all other entities
-                    for (b, uid_b, pos_b, ori_b, character_b, mut vel_b, stat_b) in (
+                    for (b, uid_b, pos_b, ori_b, character_b, stat_b) in (
                         &entities,
                         &uids,
                         &positions,
                         &orientations,
                         &character_states,
-                        &mut velocities,
-                        &mut stats,
+                        &stats,
                     )
                         .join()
                     {
diff --git a/common/src/sys/projectile.rs b/common/src/sys/projectile.rs
index 76b3540cfa..da53ab2352 100644
--- a/common/src/sys/projectile.rs
+++ b/common/src/sys/projectile.rs
@@ -1,53 +1,37 @@
 use crate::{
-    comp::{
-        projectile, ActionState::*, CharacterState, Controller, ForceUpdate, HealthSource, Ori,
-        PhysicsState, Pos, Projectile, Stats, Vel,
-    },
+    comp::{projectile, HealthSource, Ori, PhysicsState, Projectile, Vel},
     event::{EventBus, ServerEvent},
-    state::{DeltaTime, Uid},
 };
 use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
-use std::time::Duration;
-use vek::*;
 
 /// This system is responsible for handling projectile effect triggers
 pub struct Sys;
 impl<'a> System<'a> for Sys {
     type SystemData = (
         Entities<'a>,
-        ReadStorage<'a, Uid>,
-        Read<'a, DeltaTime>,
         Read<'a, EventBus<ServerEvent>>,
-        ReadStorage<'a, Pos>,
         ReadStorage<'a, Vel>,
         ReadStorage<'a, PhysicsState>,
         WriteStorage<'a, Ori>,
         WriteStorage<'a, Projectile>,
-        WriteStorage<'a, Stats>,
     );
 
     fn run(
         &mut self,
         (
             entities,
-            uids,
-            dt,
             server_bus,
-            positions,
             velocities,
             physics_states,
             mut orientations,
             mut projectiles,
-            mut stats,
         ): Self::SystemData,
     ) {
         let mut server_emitter = server_bus.emitter();
 
         // Attacks
-        for (entity, uid, pos, vel, physics, ori, projectile) in (
+        for (entity, vel, physics, ori, projectile) in (
             &entities,
-            &uids,
-            &positions,
             &velocities,
             &physics_states,
             &mut orientations,
@@ -84,7 +68,6 @@ impl<'a> System<'a> for Sys {
                             entity,
                             cause: HealthSource::World,
                         }),
-                        _ => {}
                     }
                 }
             }