From ccc4faeb59da4baa10e6a54c45c6df6273497bc8 Mon Sep 17 00:00:00 2001 From: oryxel1 Date: Thu, 4 Sep 2025 22:45:13 +0700 Subject: [PATCH] Fixed bell collision and sea pickle collision. --- .../collision/fixes/BellCollision.java | 70 +++++++++++++++++++ .../collision/fixes/SeaPickleCollision.java | 63 +++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 core/src/main/java/org/geysermc/geyser/translator/collision/fixes/BellCollision.java create mode 100644 core/src/main/java/org/geysermc/geyser/translator/collision/fixes/SeaPickleCollision.java diff --git a/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/BellCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/BellCollision.java new file mode 100644 index 000000000..830bf2b41 --- /dev/null +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/BellCollision.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2025 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Geyser + */ + +package org.geysermc.geyser.translator.collision.fixes; + +import lombok.EqualsAndHashCode; +import org.geysermc.geyser.level.block.property.Properties; +import org.geysermc.geyser.level.block.type.BlockState; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.level.physics.CollisionManager; +import org.geysermc.geyser.level.physics.Direction; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.collision.BlockCollision; +import org.geysermc.geyser.translator.collision.CollisionRemapper; + +@EqualsAndHashCode(callSuper = true) +@CollisionRemapper(regex = "^bell$", passDefaultBoxes = true) +public class BellCollision extends BlockCollision { + private final boolean standing; + + public BellCollision(BlockState state, BoundingBox[] boxes) { + super(boxes); + + this.standing = state.getValue(Properties.BELL_ATTACHMENT).equals("floor"); + } + + @Override + public void correctPosition(GeyserSession session, int x, int y, int z, BoundingBox playerCollision) { + super.correctPosition(session, x, y, z, playerCollision); + if (!this.standing) { + return; + } + + final double maxPushDistance = 0.1875F + CollisionManager.COLLISION_TOLERANCE * 1.01F; + + // Check for bell collision bug (bell on Java is 0.1875 block higher than Bedrock) + for (BoundingBox boundingBox : this.boundingBoxes) { + if (!boundingBox.checkIntersection(x, y, z, playerCollision)) { + continue; + } + + boundingBox = boundingBox.clone(); + boundingBox.translate(x, y, z); + + boundingBox.pushOutOfBoundingBox(playerCollision, Direction.UP, maxPushDistance); + } + } +} diff --git a/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/SeaPickleCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/SeaPickleCollision.java new file mode 100644 index 000000000..1e8db5951 --- /dev/null +++ b/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/SeaPickleCollision.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2025 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Geyser + */ + +package org.geysermc.geyser.translator.collision.fixes; + +import lombok.EqualsAndHashCode; +import org.geysermc.geyser.level.block.type.BlockState; +import org.geysermc.geyser.level.physics.Axis; +import org.geysermc.geyser.level.physics.BoundingBox; +import org.geysermc.geyser.level.physics.CollisionManager; +import org.geysermc.geyser.level.physics.Direction; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.translator.collision.BlockCollision; +import org.geysermc.geyser.translator.collision.CollisionRemapper; + +@EqualsAndHashCode(callSuper = true) +@CollisionRemapper(regex = "^sea_pickle$", passDefaultBoxes = true) +public class SeaPickleCollision extends BlockCollision { + public SeaPickleCollision(BlockState state, BoundingBox[] boxes) { + super(boxes); + } + + @Override + public void correctPosition(GeyserSession session, int x, int y, int z, BoundingBox playerCollision) { + super.correctPosition(session, x, y, z, playerCollision); + + for (BoundingBox boundingBox : this.boundingBoxes) { + if (!boundingBox.checkIntersection(x, y, z, playerCollision)) { + continue; + } + + final double maxY = boundingBox.getMax(Axis.Y); + + boundingBox = boundingBox.clone(); + boundingBox.translate(x, y, z); + + // Check for sea pickle bug (sea pickle have no collision on Bedrock but does on Java). + boundingBox.pushOutOfBoundingBox(playerCollision, Direction.UP, maxY + CollisionManager.COLLISION_TOLERANCE * 1.01F); + } + } +}