From 45710652f9f08e34121a22b57a5d6e8ced03cc6a Mon Sep 17 00:00:00 2001
From: kforbro <kforbro@gmail.com>
Date: Fri, 17 Jul 2026 20:04:51 +0300
Subject: [PATCH] Fix collision for copper bars and turtle eggs

---
 ...on.java => GlassPaneAndBarsCollision.java} |  6 +--
 .../collision/fixes/TurtleEggCollision.java   | 51 +++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)
 rename core/src/main/java/org/geysermc/geyser/translator/collision/fixes/{GlassPaneAndIronBarsCollision.java => GlassPaneAndBarsCollision.java} (93%)
 create mode 100644 core/src/main/java/org/geysermc/geyser/translator/collision/fixes/TurtleEggCollision.java

diff --git a/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/GlassPaneAndIronBarsCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/GlassPaneAndBarsCollision.java
similarity index 93%
rename from core/src/main/java/org/geysermc/geyser/translator/collision/fixes/GlassPaneAndIronBarsCollision.java
rename to core/src/main/java/org/geysermc/geyser/translator/collision/fixes/GlassPaneAndBarsCollision.java
index f568acccfe6..9e01b480410 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/GlassPaneAndIronBarsCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/GlassPaneAndBarsCollision.java
@@ -35,8 +35,8 @@
 import org.geysermc.geyser.translator.collision.CollisionRemapper;
 
 @EqualsAndHashCode(callSuper = true)
-@CollisionRemapper(regex = "glass_pane$|iron_bars$", usesParams = true, passDefaultBoxes = true)
-public class GlassPaneAndIronBarsCollision extends BlockCollision {
+@CollisionRemapper(regex = "glass_pane$|iron_bars$|copper_bars$", usesParams = true, passDefaultBoxes = true)
+public class GlassPaneAndBarsCollision extends BlockCollision {
     /**
      * 1 = north
      * 2 = east
@@ -49,7 +49,7 @@ public class GlassPaneAndIronBarsCollision extends BlockCollision {
      */
     private int facing;
 
-    public GlassPaneAndIronBarsCollision(BlockState state, BoundingBox[] defaultBoxes) {
+    public GlassPaneAndBarsCollision(BlockState state, BoundingBox[] defaultBoxes) {
         super(defaultBoxes);
         if (state.getValue(Properties.NORTH) && state.getValue(Properties.EAST)) {
             facing = 5;
diff --git a/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/TurtleEggCollision.java b/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/TurtleEggCollision.java
new file mode 100644
index 00000000000..5ea31a2ceb1
--- /dev/null
+++ b/core/src/main/java/org/geysermc/geyser/translator/collision/fixes/TurtleEggCollision.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019-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.BoundingBox;
+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 = "^turtle_egg$", passDefaultBoxes = true)
+public class TurtleEggCollision extends BlockCollision {
+    public TurtleEggCollision(BlockState state, BoundingBox[] boxes) {
+        super(boxes);
+    }
+
+    @Override
+    protected void correctPosition(GeyserSession session, int x, int y, int z, BoundingBox blockCollision, BoundingBox playerCollision, double ulpX, double ulpZ) {
+        // Bedrock's box is narrower than Java's with multiple eggs, so push the player out by the 0.1375 difference.
+        blockCollision.pushOutOfBoundingBox(playerCollision, Direction.NORTH, 0.1375 + ulpZ);
+        blockCollision.pushOutOfBoundingBox(playerCollision, Direction.SOUTH, 0.1375 + ulpZ);
+        blockCollision.pushOutOfBoundingBox(playerCollision, Direction.EAST, 0.1375 + ulpX);
+        blockCollision.pushOutOfBoundingBox(playerCollision, Direction.WEST, 0.1375 + ulpX);
+    }
+}