From fe4986b042a865c8db65e14f8b9ea6ba7c9c7d90 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 22 May 2024 10:11:09 +0200
Subject: [PATCH] Fix sniffer entity data removal Fixes #757

---
 .../rewriter/EntityPacketRewriter1_14.java          | 13 +------------
 .../rewriter/EntityPacketRewriter1_19_3.java        |  2 +-
 .../rewriter/EntityPacketRewriter1_19_4.java        | 10 +++++-----
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java
index 1ebe89d0..fb18f3e6 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/EntityPacketRewriter1_14.java
@@ -351,18 +351,7 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
         filter().type(EntityTypes1_14.CAT).cancel(19);
         filter().type(EntityTypes1_14.CAT).cancel(20);
 
-        filter().handler((event, meta) -> {
-            EntityType type = event.entityType();
-            if (type == null) return;
-            if (type.isOrHasParent(EntityTypes1_14.ABSTRACT_ILLAGER) || type == EntityTypes1_14.RAVAGER || type == EntityTypes1_14.WITCH) {
-                int index = event.index();
-                if (index == 14) {
-                    event.cancel();
-                } else if (index > 14) {
-                    event.setIndex(index - 1);
-                }
-            }
-        });
+        filter().type(EntityTypes1_14.ABSTRACT_RAIDER).removeIndex(14); // Celebrating
 
         filter().type(EntityTypes1_14.AREA_EFFECT_CLOUD).index(10).handler((event, meta) -> {
             rewriteParticle(event.user(), (Particle) meta.getValue());
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java
index 1d980089..f5033b9d 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java
@@ -240,7 +240,7 @@ public final class EntityPacketRewriter1_19_3 extends EntityRewriter<Clientbound
         registerMetaTypeHandler(Types1_19.ENTITY_DATA_TYPES.itemType, null, Types1_19.ENTITY_DATA_TYPES.optionalBlockStateType, Types1_19.ENTITY_DATA_TYPES.particleType,
             Types1_19.ENTITY_DATA_TYPES.componentType, Types1_19.ENTITY_DATA_TYPES.optionalComponentType);
 
-        filter().index(6).handler((event, meta) -> {
+        filter().dataType(Types1_19.ENTITY_DATA_TYPES.poseType).handler((event, meta) -> {
             // Sitting pose added
             final int pose = meta.value();
             if (pose == 10) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java
index afc4178e..d0297fc4 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java
@@ -173,12 +173,12 @@ public final class EntityPacketRewriter1_19_4 extends EntityRewriter<Clientbound
             }
         });
 
-        filter().type(EntityTypes1_19_4.INTERACTION).removeIndex(8); // Width
-        filter().type(EntityTypes1_19_4.INTERACTION).removeIndex(9); // Height
-        filter().type(EntityTypes1_19_4.INTERACTION).removeIndex(10); // Response
+        filter().type(EntityTypes1_19_4.INTERACTION).cancel(8); // Width
+        filter().type(EntityTypes1_19_4.INTERACTION).cancel(9); // Height
+        filter().type(EntityTypes1_19_4.INTERACTION).cancel(10); // Response
 
-        filter().type(EntityTypes1_19_4.SNIFFER).removeIndex(17); // State
-        filter().type(EntityTypes1_19_4.SNIFFER).removeIndex(18); // Drop seed at tick
+        filter().type(EntityTypes1_19_4.SNIFFER).cancel(17); // State
+        filter().type(EntityTypes1_19_4.SNIFFER).cancel(18); // Drop seed at tick
 
         filter().type(EntityTypes1_19_4.ABSTRACT_HORSE).addIndex(18); // Owner UUID
     }