From 9a74e70cc031dc22473501ea8a4342d7472b4c17 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Tue, 3 Aug 2021 12:13:43 +0200 Subject: [PATCH] fix: boats' bounding boxes must be deflated, not inflated (#6314) Fixes GH-6312. Signed-off-by: Mariell Hoversholm --- patches/server/0736-Improve-boat-collision-performance.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0736-Improve-boat-collision-performance.patch b/patches/server/0736-Improve-boat-collision-performance.patch index c06ebdb9d6d..246d0e5b09c 100644 --- a/patches/server/0736-Improve-boat-collision-performance.patch +++ b/patches/server/0736-Improve-boat-collision-performance.patch @@ -68,7 +68,7 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..99124b70d82140b108d424a5206657ef this.status = Boat.Status.IN_WATER; } else { diff --git a/src/main/java/net/minecraft/world/item/BoatItem.java b/src/main/java/net/minecraft/world/item/BoatItem.java -index c0864c833fd313e6ba9339ecc7f9e2359954bda3..87e0faaab1ec98123fd735112d15da332a830554 100644 +index c0864c833fd313e6ba9339ecc7f9e2359954bda3..9a11248b13d231c1797e14f843cb8cbec0d35a6e 100644 --- a/src/main/java/net/minecraft/world/item/BoatItem.java +++ b/src/main/java/net/minecraft/world/item/BoatItem.java @@ -67,7 +67,7 @@ public class BoatItem extends Item { @@ -76,7 +76,7 @@ index c0864c833fd313e6ba9339ecc7f9e2359954bda3..87e0faaab1ec98123fd735112d15da33 entityboat.setType(this.type); entityboat.setYRot(user.getYRot()); - if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(-0.1D))) { -+ if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(net.minecraft.Util.COLLISION_EPSILON))) { ++ if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(-net.minecraft.Util.COLLISION_EPSILON))) { // Paper return InteractionResultHolder.fail(itemstack); } else { if (!world.isClientSide) {