From 8601d34f2064e47def7adcfd61a4cd23fdfb0571 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Tue, 27 Oct 2026 11:13:01 +0100 Subject: [PATCH] Merge main into fix/particles-option-level The shulker's teleport particles (event 2016, from main) take the engine's own particle level like the other block_teleportation calls. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/level_particles.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/horizon-client/src/game/level_particles.rs b/crates/horizon-client/src/game/level_particles.rs index c972a6476..000b77e9a 100644 --- a/crates/horizon-client/src/game/level_particles.rs +++ b/crates/horizon-client/src/game/level_particles.rs @@ -15,8 +15,7 @@ impl Game<'_> { /// Event 2016: `Shulker.teleportSomewhere`'s particles between the /// shell's old and new cells. pub(super) fn shulker_teleport_particles(&mut self, pos: [i32; 3], data: i32) { - self.particles - .block_teleportation(pos, data, [8, 8, 8], self.settings.particles); + self.particles.block_teleportation(pos, data, [8, 8, 8]); } /// Event 2017: `TeleportRandomlyConsumeEffect`'s directional particles. pub(super) fn consume_teleport_particles(&mut self, pos: [i32; 3], data: i32) {