Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes pet jumping bug.

See merge request veloren/veloren!206
This commit is contained in:
Joshua Barretto 2019-06-03 20:09:18 +00:00
commit 2946846a67
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/lib.rs
View File

@ -310,12 +310,6 @@ impl Client {
// 7) Finish the tick, pass control back to the frontend. // 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; self.tick += 1;
Ok(frontend_events) Ok(frontend_events)
} }

3
common/src/sys/inputs.rs
View File

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