OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix world border edge collision (#10053)

Browse source 
The collision shape of the border is determined by flooring the min values and ceiling the max values, so the isCollidingWithBorder() function should mirror such behavior.
This commit is contained in:
Lulu13022002 2023-12-20 06:31:07 +01:00 committed by GitHub
parent 5385b21fd3
commit 086ca616d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
patches/server/0719-Collision-optimisations.patch
View file

@ -105,10 +105,10 @@ index be668387f65a633c6ac497fca632a4767a1bf3a2..e08f4e39db4ee3fed62e37364d17dcc5
} }
diff --git a/src/main/java/io/papermc/paper/util/CollisionUtil.java b/src/main/java/io/papermc/paper/util/CollisionUtil.java diff --git a/src/main/java/io/papermc/paper/util/CollisionUtil.java b/src/main/java/io/papermc/paper/util/CollisionUtil.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..acd8470b108432ac82e1d2f6efcaabd5540214c2 index 0000000000000000000000000000000000000000..ee0331a6bc40cdde08d926fd8eb1dc642630c2e5
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/util/CollisionUtil.java +++ b/src/main/java/io/papermc/paper/util/CollisionUtil.java
@@ -0,0 +1,1850 @@ @@ -0,0 +1,1851 @@
+package io.papermc.paper.util; +package io.papermc.paper.util;
+ +
+import io.papermc.paper.util.collisions.CachedShapeData; +import io.papermc.paper.util.collisions.CachedShapeData;
@ -1655,11 +1655,12 @@ index 0000000000000000000000000000000000000000..acd8470b108432ac82e1d2f6efcaabd5
+ +
+ public static boolean isCollidingWithBorder(final WorldBorder worldborder, final double boxMinX, final double boxMaxX, + public static boolean isCollidingWithBorder(final WorldBorder worldborder, final double boxMinX, final double boxMaxX,
+ final double boxMinZ, final double boxMaxZ) { + final double boxMinZ, final double boxMaxZ) {
+ final double borderMinX = worldborder.getMinX(); // -X + // border size is rounded like the collide voxel shape of the border
+ final double borderMaxX = worldborder.getMaxX(); // +X + final double borderMinX = Math.floor(worldborder.getMinX()); // -X
+ final double borderMaxX = Math.ceil(worldborder.getMaxX()); // +X
+ +
+ final double borderMinZ = worldborder.getMinZ(); // -Z + final double borderMinZ = Math.floor(worldborder.getMinZ()); // -Z
+ final double borderMaxZ = worldborder.getMaxZ(); // +Z + final double borderMaxZ = Math.ceil(worldborder.getMaxZ()); // +Z
+ +
+ // inverted check for world border enclosing the specified box expanded by -EPSILON + // inverted check for world border enclosing the specified box expanded by -EPSILON
+ return (borderMinX - boxMinX) > CollisionUtil.COLLISION_EPSILON || (borderMaxX - boxMaxX) < -CollisionUtil.COLLISION_EPSILON || + return (borderMinX - boxMinX) > CollisionUtil.COLLISION_EPSILON || (borderMaxX - boxMaxX) < -CollisionUtil.COLLISION_EPSILON ||