From 74b9eb9f45d55ed1d35c4f51289fc44f68f981cd Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 30 Oct 2024 16:47:34 +0100
Subject: [PATCH] Fix boat entity type check As per usual plugins sending data
 for untracked entities Fixes #4222

---
 .../v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java
index b717e09b7..8de0551dc 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/EntityPacketRewriter1_21_2.java
@@ -502,7 +502,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
 
         final EntityTracker1_21_2 tracker = tracker(connection);
         final EntityType entityType = tracker.entityType(entityId);
-        if (entityType != null && !entityType.isOrHasParent(EntityTypes1_21_2.ABSTRACT_BOAT)) {
+        if (entityType == null || !entityType.isOrHasParent(EntityTypes1_21_2.ABSTRACT_BOAT)) {
             return;
         }