Merge branch 'midge/pet-jump-fix' into 'master'

Fixes pet jumping bug.

See merge request veloren/veloren!206

client/src/lib.rs

@@ -310,12 +310,6 @@ impl Client {
 
         // 7) Finish the tick, pass control back to the frontend.
 
-        // Cleanup
-        self.state
-            .ecs_mut()
-            .write_storage::<comp::Jumping>()
-            .remove(self.entity);
-
         self.tick += 1;
         Ok(frontend_events)
     }

common/src/sys/inputs.rs

@@ -30,7 +30,7 @@ impl<'a> System<'a> for Sys {
         WriteStorage<'a, AnimationInfo>,
         WriteStorage<'a, Stats>,
         ReadStorage<'a, Control>,
-        ReadStorage<'a, Jumping>,
+        WriteStorage<'a, Jumping>,
         WriteStorage<'a, Respawning>,
         WriteStorage<'a, Gliding>,
         WriteStorage<'a, Attacking>,
@@ -87,6 +87,7 @@ impl<'a> System<'a> for Sys {
 
                 if jumps.get(entity).is_some() {
                     vel.0.z += 16.0;
+                    jumps.remove(entity);
                 }
 
                 (false, 0.15)