From f1bde8ba2aa3bb1991726a3621271b5ed63302c4 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 18 Mar 2023 12:28:00 +0100
Subject: [PATCH] Handle shifted 1.19.4 boat types

---
 .../protocol1_19_4to1_19_3/packets/EntityPackets.java      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java
index d13b947bd..4cbde16dc 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java
@@ -169,6 +169,13 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3
             meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState));
         });
 
+        filter().filterFamily(Entity1_19_4Types.BOAT).index(11).handler((event, meta) -> {
+            final int boatType = meta.value();
+            if (boatType > 4) { // Cherry added
+                meta.setValue(boatType + 1);
+            }
+        });
+
         filter().filterFamily(Entity1_19_4Types.ABSTRACT_HORSE).removeIndex(18); // Owner UUID
     }