From 3621d76d8f38c534c4b54af982e66153ca822b9c Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Fri, 9 Jun 2023 04:17:32 +0200 Subject: [PATCH] Fix collision between AABB and a dot (#8733) --- ...Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index 91fbbc59b0..2f8bc394c4 100644 --- a/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -975,7 +975,7 @@ index 0000000000000000000000000000000000000000..a87f6380b2c387fb0cdd40d5087b5c93 +} diff --git a/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java b/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java new file mode 100644 -index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc9ecdfe0a +index 0000000000000000000000000000000000000000..3d2fa2466fe40e0b9d7749498684587a11dfa80a --- /dev/null +++ b/src/main/java/io/papermc/paper/voxel/AABBVoxelShape.java @@ -0,0 +1,200 @@ @@ -1159,7 +1159,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc + + @Override + public double collide(Direction.Axis enumdirection_enumaxis, AABB axisalignedbb, double d0) { -+ if (CollisionUtil.isEmpty(this.aabb) || CollisionUtil.isEmpty(axisalignedbb)) { ++ if (CollisionUtil.isEmpty(this.aabb)) { + return d0; + } + switch (enumdirection_enumaxis.ordinal()) {