diff --git a/client/src/lib.rs b/client/src/lib.rs index 02d024d0b4..f8001fa101 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -294,10 +294,6 @@ impl Client { .ecs_mut() .write_storage::() .remove(self.entity); - self.state - .ecs_mut() - .write_storage::() - .remove(self.entity); self.state .ecs_mut() .write_storage::() diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs index 5da08e22bd..4a3534fbb6 100644 --- a/voxygen/src/session.rs +++ b/voxygen/src/session.rs @@ -131,6 +131,7 @@ impl PlayState for SessionState { } Event::InputUpdate(GameInput::Jump, true) => { self.client.borrow_mut().jump(); + } Event::InputUpdate(GameInput::MoveForward, state) => self.key_state.up = state, Event::InputUpdate(GameInput::MoveBack, state) => self.key_state.down = state, Event::InputUpdate(GameInput::MoveLeft, state) => self.key_state.left = state, diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs index 22d119b80a..8930ae7a4f 100644 --- a/voxygen/src/window.rs +++ b/voxygen/src/window.rs @@ -113,16 +113,25 @@ impl Window { key_map.insert(settings.controls.map, GameInput::Map); key_map.insert(settings.controls.bag, GameInput::Bag); key_map.insert(settings.controls.quest_log, GameInput::QuestLog); - key_map.insert(settings.controls.character_window, GameInput::CharacterWindow); + key_map.insert( + settings.controls.character_window, + GameInput::CharacterWindow, + ); key_map.insert(settings.controls.social, GameInput::Social); key_map.insert(settings.controls.spellbook, GameInput::Spellbook); key_map.insert(settings.controls.settings, GameInput::Settings); key_map.insert(settings.controls.help, GameInput::Help); - key_map.insert(settings.controls.toggle_interface, GameInput::ToggleInterface); + key_map.insert( + settings.controls.toggle_interface, + GameInput::ToggleInterface, + ); key_map.insert(settings.controls.toggle_debug, GameInput::ToggleDebug); key_map.insert(settings.controls.fullscreen, GameInput::Fullscreen); key_map.insert(settings.controls.screenshot, GameInput::Screenshot); - key_map.insert(settings.controls.toggle_ingame_ui, GameInput::ToggleIngameUi); + key_map.insert( + settings.controls.toggle_ingame_ui, + GameInput::ToggleIngameUi, + ); key_map.insert(settings.controls.attack, GameInput::Attack); Ok(Self {