Remove unneeded boat patch (backport of #10061 to 1.20.1) (#10096)

Co-authored-by: andan42 <49289986+andan42@users.noreply.github.com>
This commit is contained in:
Paint_Ninja 2024-10-07 02:52:29 +01:00 committed by GitHub
parent 29986615fe
commit f7e5db7149
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -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_() {