From 542db422ade5fa52a7fbc4e752727ca6b4403450 Mon Sep 17 00:00:00 2001
From: Paint_Ninja <PaintNinja@users.noreply.github.com>
Date: Mon, 7 Oct 2024 02:27:38 +0100
Subject: [PATCH] Remove unneeded boat patch (backport of #10061 to 1.20.6)
 (#10086)

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 9eb6d9ba4a..c119dfd8f6 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() {
-@@ -859,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 {