From 95b4b7422d875dd69e28000e02c780e2500adff1 Mon Sep 17 00:00:00 2001 From: Cosmic <84875247+Online5277@users.noreply.github.com> Date: Sat, 17 Oct 2026 14:25:35 -0400 Subject: [PATCH] Restore saved death and health on world entry (#729) --- crates/horizon-client/src/game.rs | 21 ++++++------ crates/horizon-client/src/motion.rs | 52 +++++++++++++++++++++++++---- crates/horizon-client/src/save.rs | 11 ++++++ 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 6de683c67..5cb9613a5 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -1158,7 +1158,7 @@ struct Game<'a> { tab_list: horizon_client::tab_list::TabList, subtitles: subtitle_hud::SubtitleState, adv: advancements::AdvState, - restore_player_environment: bool, + restore_player_state: bool, stats_ui: stats_screen::StatsUi, adv_ui: advancements_screen::AdvUi, camera_type: perspective::CameraType, @@ -3082,10 +3082,7 @@ impl Game<'_> { }; let mut player = PlayerMotion::new(self.motion, feet)?; player.yaw = self.yaw; - player.load_environment_once( - &mut self.restore_player_environment, - self.level.player_extra.as_ref(), - ); + player.load_saved_state_once(&mut self.restore_player_state, &self.level)?; let spectator = self.mode == horizon_client::command::args::GameMode::Spectator; player.may_fly = self.creative || spectator; player.invulnerable = self.creative || spectator; @@ -3101,10 +3098,12 @@ impl Game<'_> { .get(&s.item) .is_some_and(|i| i.glider && (i.max_damage == 0 || s.damage + 1 < i.max_damage)) }); - if self.level.health > 0.0 && self.ticks < 2 { - player.set_health(self.level.health, false)?; - player.health.food.food = self.level.food; - player.health.food.saturation = self.level.saturation; + // A saved death already dropped inventory/XP and counted the death. + if player.health.dead_or_dying() { + self.screen = Screen::Dead; + self.ui.died_at = Some(Instant::now()); + self.ui.death_text = None; + self.capture(false); } self.previous_position = feet; self.player = Some(player); @@ -6249,7 +6248,7 @@ impl Game<'_> { self.bosses = Default::default(); reset_world_progress(&mut self.adv, &mut self.stats); self.prefetch_advancement_tree(); - self.restore_player_environment = true; + self.restore_player_state = true; // RandomSequences: the world's data/minecraft/random_sequences.dat. self.rand_sequences = horizon_client::save::read_dat(&save_root.join("data/minecraft/random_sequences.dat")) @@ -10296,7 +10295,7 @@ impl<'a> Game<'a> { tab_list: Default::default(), subtitles: Default::default(), adv: Default::default(), - restore_player_environment: true, + restore_player_state: true, stats_ui: Default::default(), adv_ui: Default::default(), camera_type: Default::default(), diff --git a/crates/horizon-client/src/motion.rs b/crates/horizon-client/src/motion.rs index 0eb79d65c..c06aff25f 100644 --- a/crates/horizon-client/src/motion.rs +++ b/crates/horizon-client/src/motion.rs @@ -292,19 +292,25 @@ impl PlayerMotion { && movement.x * movement.x + movement.z * movement.z < limit * limit && sword } - pub fn load_environment_once( + /// Restore login state once; a later respawn starts with fresh health and food. + pub fn load_saved_state_once( &mut self, pending: &mut bool, - extra: Option<&horizon_world::nbt::Tag>, - ) { + level: &crate::save::Level, + ) -> Result<()> { if std::mem::take(pending) { + let extra = level.player_extra.as_ref(); self.fire_ticks = extra .and_then(|t| crate::save::number(t.get("Fire"))) .unwrap_or(-20) as i32; self.air = extra .and_then(|t| crate::save::number(t.get("Air"))) .unwrap_or(300) as i32; + self.set_health(level.health, false)?; + self.health.food.food = level.food; + self.health.food.saturation = level.saturation; } + Ok(()) } pub fn set_remaining_fire_ticks(&mut self, ticks: i32) { self.fire_ticks = if self.invulnerable { @@ -2329,8 +2335,13 @@ mod tests { #[test] fn resident_water_and_lava_are_not_treated_as_air() { - let root = Path::new(env!("CARGO_MANIFEST_DIR")).join("../../.local/horizon-client/26.3"); + let root = std::env::var_os("HORIZON_TEST_RESOURCES") + .map(std::path::PathBuf::from) + .unwrap_or_else(|| { + Path::new(env!("CARGO_MANIFEST_DIR")).join("../../.local/horizon-client/26.3") + }); if !root.join("movement-properties.nbt").exists() { + eprintln!("skipping resident water/lava test: prepared resources unavailable"); return; } let assets = Assets::load(&root).unwrap(); @@ -2536,12 +2547,41 @@ mod tests { ("Fire", horizon_world::nbt::Tag::Short(160)), ("Air", horizon_world::nbt::Tag::Short(8)), ]); + let mut level = crate::save::Level { + health: 13.0, + food: 11, + saturation: 2.25, + player_extra: Some(extra), + ..Default::default() + }; let mut pending = true; - w.player.load_environment_once(&mut pending, Some(&extra)); + w.player + .load_saved_state_once(&mut pending, &level) + .unwrap(); assert_eq!((w.player.fire_ticks, w.player.air), (160, 8)); + assert_eq!( + ( + w.player.health.health(), + w.player.health.food.food, + w.player.health.food.saturation + ), + (13.0, 11, 2.25) + ); let mut respawn = PlayerMotion::new(&resources, Vec3::new(20.5, 4.0, 20.5)).unwrap(); - respawn.load_environment_once(&mut pending, Some(&extra)); + respawn.load_saved_state_once(&mut pending, &level).unwrap(); assert_eq!((respawn.fire_ticks, respawn.air), (-20, 300)); + assert_eq!( + (respawn.health.health(), respawn.health.food.food), + (20.0, 20) + ); + // Reopening another world restores its state, including a saved death. + pending = true; + level.health = 0.0; + w.player + .load_saved_state_once(&mut pending, &level) + .unwrap(); + assert!(w.player.health.dead_or_dying()); + assert!(!pending); w.player.fluids.was_touching_water = false; assert!( w.player.moving_slowly(), diff --git a/crates/horizon-client/src/save.rs b/crates/horizon-client/src/save.rs index bd334b124..6db03f7fc 100644 --- a/crates/horizon-client/src/save.rs +++ b/crates/horizon-client/src/save.rs @@ -3206,6 +3206,17 @@ mod tests { third.ender_items[3].as_ref().map(|s| (&*s.item, s.count)), Some(("minecraft:diamond", 2)) ); + // A dead player's empty inventory replaces the previously loaded items. + let mut dead = third; + dead.health = 0.0; + dead.inventory.clear(); + dead.inventory_components.clear(); + dead.write(&dir).unwrap(); + let dead = Level::read(&dir).unwrap(); + assert_eq!(dead.health, 0.0); + assert!(dead.inventory.is_empty()); + assert!(dead.inventory_components.is_empty()); + assert!(dead.player_extra.unwrap().get("equipment").is_none()); assert!(dir.join("data/minecraft/world_gen_settings.dat").exists()); let _ = fs::remove_dir_all(&dir); }