Fix collision problem with glass pane and iron bars (#4302)

* Fix collision problem,the wide for bedrock is 0.5 but for java is 0.5625 when only one side connect. * Fixed an issue where the collision box was abnormal at the corner when two sides of the glass panel were connected. * Merge similar methods, adjust code. * More lenient judgment; reduce redundant code to avoid repeated calls.
2023-12-07 16:57:30 +08:00 · 2023-12-07 16:57:30 +08:00 · 3971650856
parent 9d6dd58fd8
commit 3971650856
1 changed files with 112 additions and 0 deletions
--- a/core/src/main/java/org/geysermc/geyser/translator/collision/GlassPaneAndIronBarsCollision.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/collision/GlassPaneAndIronBarsCollision.java
@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2019-2022 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;
+
+import lombok.EqualsAndHashCode;
+import org.geysermc.geyser.level.physics.BoundingBox;
+import org.geysermc.geyser.session.GeyserSession;
+
+@EqualsAndHashCode(callSuper = true)
+@CollisionRemapper(regex = "glass_pane$|iron_bars$", usesParams = true, passDefaultBoxes = true)
+public class GlassPaneAndIronBarsCollision extends BlockCollision {
+    /**
+     * 1 = north
+     * 2 = east
+     * 3 = south
+     * 4 = west
+     * 5 = north, east
+     * 6 = east, south
+     * 7 = south, west
+     * 8 = west, north
+     */
+    private int facing;
+
+    public GlassPaneAndIronBarsCollision(String params, BoundingBox[] defaultBoxes) {
+        super(defaultBoxes);
+        //east=true,north=true,south=true,west=true
+        if (params.contains("north=true") && params.contains("east=true")) {
+            facing = 5;
+        } else if (params.contains("east=true") && params.contains("south=true")) {
+            facing = 6;
+        } else if (params.contains("south=true") && params.contains("west=true")) {
+            facing = 7;
+        } else if (params.contains("west=true") && params.contains("north=true")) {
+            facing = 8;
+        } else if (params.contains("north=true")) {
+            facing = 1;
+        } else if (params.contains("east=true")) {
+            facing = 2;
+        } else if (params.contains("south=true")) {
+            facing = 3;
+        } else if (params.contains("west=true")) {
+            facing = 4;
+        }
+    }
+
+    @Override
+    public boolean correctPosition(GeyserSession session, int x, int y, int z, BoundingBox playerCollision) {
+        boolean result = super.correctPosition(session, x, y, z, playerCollision);
+        playerCollision.setSizeX(playerCollision.getSizeX() - 0.0001);
+        playerCollision.setSizeY(playerCollision.getSizeY() - 0.0001);
+        playerCollision.setSizeZ(playerCollision.getSizeZ() - 0.0001);
+
+        if (this.checkIntersection(x, y, z, playerCollision)) {
+            double newMiddleX = x;
+            double newMiddleZ = z;
+
+            switch (facing) {
+                case 1 -> newMiddleZ += 0.8625; // North
+                case 2 -> newMiddleX += 0.1375; // East
+                case 3 -> newMiddleZ += 0.1375; // South
+                case 4 -> newMiddleX += 0.8625; // West
+                case 5 -> { // North, East
+                    newMiddleZ += 0.8625;
+                    newMiddleX += 0.1375;
+                }
+                case 6 -> { // East, South
+                    newMiddleX += 0.1375;
+                    newMiddleZ += 0.1375;
+                }
+                case 7 -> { // South, West
+                    newMiddleZ += 0.1375;
+                    newMiddleX += 0.8625;
+                }
+                case 8 -> { // West, North
+                    newMiddleX += 0.8625;
+                    newMiddleZ += 0.8625;
+                }
+            }
+
+            playerCollision.setMiddleX(newMiddleX);
+            playerCollision.setMiddleZ(newMiddleZ);
+        }
+
+        playerCollision.setSizeX(playerCollision.getSizeX() + 0.0001);
+        playerCollision.setSizeY(playerCollision.getSizeY() + 0.0001);
+        playerCollision.setSizeZ(playerCollision.getSizeZ() + 0.0001);
+        return result;
+    }
+}