From d7ccecefe0ae78119288671506c249af826ad3ad Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Mon, 7 Oct 2024 02:39:52 +0100 Subject: [PATCH] Remove unneeded boat patch (backport of #10061 to 1.20.4) (#10087) Co-authored-by: andan42 <49289986+andan42@users.noreply.github.com> --- .../world/entity/vehicle/Boat.java.patch | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/entity/vehicle/Boat.java.patch b/patches/minecraft/net/minecraft/world/entity/vehicle/Boat.java.patch index 11b0a10397..e0ef539c4c 100644 --- a/patches/minecraft/net/minecraft/world/entity/vehicle/Boat.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/vehicle/Boat.java.patch @@ -63,20 +63,3 @@ } protected int getMaxPassengers() { -@@ -817,6 +_,16 @@ - - public boolean isUnderWater() { - return this.status == Boat.Status.UNDER_WATER || this.status == Boat.Status.UNDER_FLOWING_WATER; -+ } -+ -+ // Forge: Fix MC-119811 by instantly completing lerp on board -+ @Override -+ protected void addPassenger(Entity passenger) { -+ super.addPassenger(passenger); -+ if (this.isControlledByLocalInstance() && this.lerpSteps > 0) { -+ this.lerpSteps = 0; -+ this.absMoveTo(this.lerpX, this.lerpY, this.lerpZ, (float)this.lerpYRot, (float)this.lerpXRot); -+ } - } - - public ItemStack getPickResult() {