From f7e5db71490323192dff8fc784ceb69fea081d36 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Mon, 7 Oct 2024 02:52:29 +0100 Subject: [PATCH] Remove unneeded boat patch (backport of #10061 to 1.20.1) (#10096) 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 79bf0d6dcd..9f92542ea8 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 m_213801_() { -@@ -858,6 +_,16 @@ - - public boolean m_5842_() { - return this.f_38279_ == Boat.Status.UNDER_WATER || this.f_38279_ == Boat.Status.UNDER_FLOWING_WATER; -+ } -+ -+ // Forge: Fix MC-119811 by instantly completing lerp on board -+ @Override -+ protected void m_20348_(Entity passenger) { -+ super.m_20348_(passenger); -+ if (this.m_6109_() && this.f_38267_ > 0) { -+ this.f_38267_ = 0; -+ this.m_19890_(this.f_38268_, this.f_38269_, this.f_38270_, (float)this.f_38271_, (float)this.f_38272_); -+ } - } - - public ItemStack m_142340_() {