From a7ff22eea05de72275341d7346252fc5d2ecdbb6 Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Sun, 25 Oct 2026 23:05:12 +0100 Subject: [PATCH 1/2] Give a server player's new body its effects at once after a level change A server's player gets a new body when it joins, respawns or changes level, but what the old body had been given by its effects (the applied attribute modifiers and the armor protection table) was kept in its per-player record. apply_effect_status then saw nothing to change, so after a trip to another dimension Speed kept its icon while the body's movement speed fell back from 0.14 to 0.10, until the effect was reapplied. Vanilla keeps the same ServerPlayer through ServerPlayer.teleport into another level, with its attributes and MobEffect modifiers. A new body now starts with nothing applied, and its effects are applied as soon as it is created, before the movement that brought it is handled. --- crates/horizon-client/src/game/lan_actions.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index 9d4d868e0..41f92106c 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -250,8 +250,10 @@ impl Game<'_> { } let mut play = host.play.remove(&conn).unwrap_or_default(); if fresh { - // A new body (joined, respawned, changed level): nothing on it yet. + // A new body (joined, respawned, changed level): nothing on it yet, + // its effects' modifiers and armor protection included. play.equipped = None; + play.potions = Default::default(); } let g = &mut host.hub.guests[i]; // The guest's body. @@ -384,6 +386,12 @@ impl Game<'_> { self.apply_equipment(); play.equipped = Some(equipped); } + // The player's effects are on the new body before anything it does + // (the movement that brought it, a landing): vanilla keeps the same + // entity through a level change, with its attributes and effects. + if fresh { + self.apply_effect_status(); + } self.update_totem_ready(); Some(GuestSwap { conn, From 19a5098b140f4ca6eab01b0e73f5d8688cd52d85 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Mon, 26 Oct 2026 01:03:41 +0100 Subject: [PATCH 2/2] Leave a respawned body's reset to the swap that builds it Respawning drops the guest's body, so the next swap builds a fresh one, which now clears what the old body was given (equipment, effects and armor protection) itself. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/lan_actions.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index 41f92106c..00ea51de8 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -1707,10 +1707,6 @@ impl Game<'_> { }; xp.respawn(self.ui.rules.bool("keep_inventory") || g.game_mode == SPECTATOR); (g.xp_level, g.xp_progress, g.xp_total) = (xp.level, xp.progress, xp.total); - // A new body: nothing given to the old one carries over. - if let Some(play) = host.play.get_mut(&conn) { - play.potions = Default::default(); - } let clock_rate = self.network_clock_rate(); let ctx = TickCtx { world: &mut self.world,