From 0ca1d0ebd0b078f2cc64551e0ec20154eb7ae476 Mon Sep 17 00:00:00 2001 From: andan42 <49289986+andan42@users.noreply.github.com> Date: Thu, 8 Aug 2024 07:49:40 +0300 Subject: [PATCH] Removed unneeded boat patch related to MC-119811 (#10061) --- .../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 ae7f88ac78..c0be4dcaaa 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() { -@@ -904,6 +_,16 @@ - @Override - public ItemStack getPickResult() { - return new ItemStack(this.getDropItem()); -+ } -+ -+ // 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 static enum Status {