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

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

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java
index f9d53bce..8d91dd6b 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java
@@ -149,6 +149,13 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
             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
+                meta.setValue(boatType - 1);
+            }
+        });
+
         filter().type(Entity1_19_4Types.TEXT_DISPLAY).index(22).handler(((event, meta) -> {
             // Send as custom display name
             event.setIndex(2);