From 7739b0d91c9b0b4d599c4e2cca1ba4f33c87952f Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Wed, 22 Oct 2025 17:21:41 +0200 Subject: [PATCH] Fix: Jump being locked in wrong conditions --- .../type/living/animal/horse/AbstractHorseEntity.java | 8 +++++--- .../geysermc/geyser/level/physics/CollisionManager.java | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java index 5af8e621e..35e3d17ae 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java @@ -87,9 +87,11 @@ public class AbstractHorseEntity extends AnimalEntity { setFlag(EntityFlag.CAN_POWER_JUMP, saddled); super.updateSaddled(saddled); - // We want to allow player to press jump again if pressing jump doesn't dismount the entity. - this.session.setLockInput(InputLocksFlag.JUMP, this.doesJumpDismount()); - this.session.updateInputLocks(); + if (this.passengers.contains(session.getPlayerEntity())) { + // We want to allow player to press jump again if pressing jump doesn't dismount the entity. + this.session.setLockInput(InputLocksFlag.JUMP, this.doesJumpDismount()); + this.session.updateInputLocks(); + } } @Override diff --git a/core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java b/core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java index 244d2ee01..65e882e55 100644 --- a/core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java +++ b/core/src/main/java/org/geysermc/geyser/level/physics/CollisionManager.java @@ -35,7 +35,6 @@ import org.cloudburstmc.math.vector.Vector3f; import org.cloudburstmc.math.vector.Vector3i; import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag; import org.cloudburstmc.protocol.bedrock.packet.MovePlayerPacket; -import org.cloudburstmc.protocol.bedrock.packet.UpdateClientInputLocksPacket; import org.geysermc.erosion.util.BlockPositionIterator; import org.geysermc.geyser.entity.EntityDefinitions; import org.geysermc.geyser.entity.type.player.PlayerEntity;