Fix avatar arm handling in 1.21.11->1.21.9

Author: kennytv

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_11to1_21_9/rewriter/EntityPacketRewriter1_21_11.java

@@ -54,15 +54,23 @@ public void registerPackets() {
     protected void registerRewrites() {
         final EntityDataTypes1_21_11 unmappedDataTypes = VersionedTypes.V1_21_11.entityDataTypes;
         final EntityDataTypes1_21_9 entityDataTypes = VersionedTypes.V1_21_9.entityDataTypes;
-        filter().mapDataType(id -> {
-            if (id == unmappedDataTypes.humanoidArmType.typeId() || id == unmappedDataTypes.zombieNautilusVariantType.typeId()) {
-                return null;
+        filter().handler((event, data) -> {
+            if (data.dataType() == unmappedDataTypes.humanoidArmType) {
+                final int arm = data.value();
+                data.setTypeAndValue(entityDataTypes.byteType, (byte) arm);
+                return;
+            } else if (data.dataType() == unmappedDataTypes.zombieNautilusVariantType) {
+                event.cancel();
+                return;
             }
+
+            int id = data.dataType().typeId();
             if (id > unmappedDataTypes.zombieNautilusVariantType.typeId()) {
                 id--;
             }
-            return entityDataTypes.byId(id);
+            data.setDataType(entityDataTypes.byId(id));
         });
+
         registerEntityDataTypeHandler1_20_3(
             entityDataTypes.itemType,
             entityDataTypes.blockStateType,
@@ -73,10 +81,6 @@ protected void registerRewrites() {
             entityDataTypes.optionalComponentType
         );
 
-        filter().type(EntityTypes1_21_11.AVATAR).index(15).handler(((event, data) -> {
-            final int arm = data.value();
-            data.setTypeAndValue(entityDataTypes.byteType, (byte) arm);
-        }));
         filter().type(EntityTypes1_21_11.WOLF).index(21).handler(this::absoluteToRelativeTicks);
         filter().type(EntityTypes1_21_11.BEE).index(18).handler(this::absoluteToRelativeTicks);