Skip to content

Minecraft: Java Edition 26.3 rewritten from scratch in Rust, checked against vanilla with 281 differential harnesses. Get it with the Horizon launcher.

Toggled sneak and sprint do not outlive the world

Federico Tagliani243c194bb78b
diff --git a/crates/horizon-client-input/src/keymapping.rs b/crates/horizon-client-input/src/keymapping.rs
index a2d82fb76..5f4388d90 100644
--- a/crates/horizon-client-input/src/keymapping.rs
+++ b/crates/horizon-client-input/src/keymapping.rs
@@ -207,6 +207,20 @@ impl ToggleKeys {
#[cfg(test)]
mod tests {
+ /// `KeyMapping.resetToggleKeys` (a new `LocalPlayer`): a sneak and a sprint toggled on in one
+ /// world are off in the next.
+ #[test]
+ fn resetting_the_toggle_keys_puts_every_mapping_up() {
+ let mut keys = ToggleKeys::default();
+ keys.key(0, KeyAction::Press, false, true);
+ keys.key(1, KeyAction::Press, false, true);
+ assert!(keys.is_down(0) && keys.is_down(1));
+ for key in &mut keys.0 {
+ key.reset();
+ }
+ assert!(!keys.is_down(0) && !keys.is_down(1));
+ }
+
use super::*;
#[test]
fn toggle_flips_on_press_and_ignores_release() {
diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs
index 61916910c..7aef913a0 100644
--- a/crates/horizon-client/src/game.rs
+++ b/crates/horizon-client/src/game.rs
@@ -7491,6 +7491,17 @@ impl Game<'_> {
Ok(())
}
/// Keep the held-key state of toggled sneak and sprint in step with their mapping.
+ /// `KeyMapping.resetToggleKeys`: every toggle mapping up, and the latched sneak and sprint
+ /// keys with it.
+ fn reset_toggle_keys(&mut self) {
+ for key in &mut self.toggles.0 {
+ key.reset();
+ }
+ self.sync_toggle(0);
+ self.sync_toggle(1);
+ self.left = false;
+ self.right = false;
+ }
fn sync_toggle(&mut self, slot: usize) {
let key = [KeyCode::ShiftLeft, KeyCode::ControlLeft][slot];
if self.toggles.is_down(slot) {
@@ -12177,6 +12188,9 @@ impl Game<'_> {
self.streaming.paused = true;
self.world = World::new(self.res.facts().air, 0);
self.player = None;
+ // `LocalPlayer`'s constructor: `KeyMapping.resetToggleKeys`, so a sneak or sprint toggled
+ // in this world is not still on in the next one.
+ self.reset_toggle_keys();
self.sleeping = None;
self.sleep_timer = 0;
self.player_beds.clear();