From 621b791a33224155253f0470774715022e9f683f Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Wed, 21 Oct 2026 18:08:32 +0200 Subject: [PATCH] End crystals spin and bob in every dimension EndCrystal.tick advances the crystal's time wherever it is; only the fire at its block needs a dragon fight. Horizon advanced it only during the End fight, so a crystal placed elsewhere kept a fixed time and jumped back every tick (it flickered instead of turning). Fixes #1051 Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/dragon.rs | 10 ++++++---- crates/horizon-client/src/game/end.rs | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/crates/horizon-client/src/game/dragon.rs b/crates/horizon-client/src/game/dragon.rs index cbfad527b..d7dd37640 100644 --- a/crates/horizon-client/src/game/dragon.rs +++ b/crates/horizon-client/src/game/dragon.rs @@ -535,7 +535,6 @@ impl Game<'_> { if self.fight.crystal_scan >= 100 { self.count_crystals(); } - self.tick_crystals(); self.tick_dragon(); } /// EndSpikeFeature's crystals (with fire under them on the bedrock). @@ -583,9 +582,12 @@ impl Game<'_> { }) .count() as i32; } - /// `EndCrystal.tick`: the time and the fire below it in the End. - fn tick_crystals(&mut self) { - let fire = self.pack.assets.registry.default_state("minecraft:fire"); + /// `EndCrystal.tick` in every dimension: the time (the spin and bob), + /// and fire at its block where there is a dragon fight (the End). + pub(super) fn tick_crystals(&mut self) { + let fire = (self.dim == Dim::End) + .then(|| self.pack.assets.registry.default_state("minecraft:fire")) + .flatten(); for i in 0..self.crystals.len() { self.crystals[i].time += 1; let p = self.crystals[i].position; diff --git a/crates/horizon-client/src/game/end.rs b/crates/horizon-client/src/game/end.rs index a6d91d563..a7813c767 100644 --- a/crates/horizon-client/src/game/end.rs +++ b/crates/horizon-client/src/game/end.rs @@ -350,6 +350,7 @@ impl Game<'_> { self.tick_fight(); self.tick_dragon_fireballs(); } + self.tick_crystals(); self.tick_eyes(); if self.dim == Dim::End { self.end.flash.tick(self.world.game_time);