From 16aa6a51a20e0bbe38655ce91115edf44e5fa251 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 30 Oct 2024 10:20:56 +0100
Subject: [PATCH] Fix issues with creaking entity data Fixes #904

---
 .../rewriter/EntityPacketRewriter1_21_2.java  |  10 ++--------
 .../data/mappings-1.21.2to1.21.nbt            | Bin 6356 -> 6387 bytes
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
index 4f8b4486..0b19f6ac 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
@@ -587,12 +587,6 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
         filter().type(EntityTypes1_21_2.CREAKING).cancel(17); // Active
         filter().type(EntityTypes1_21_2.CREAKING).cancel(16); // Can move
 
-        filter().type(EntityTypes1_21_2.CREAKING_TRANSIENT).handler((event, data) -> {
-            if (event.index() > 7) {
-                event.cancel();
-            }
-        });
-
         filter().type(EntityTypes1_21_2.ABSTRACT_BOAT).addIndex(11); // Boat type
         filter().type(EntityTypes1_21_2.SALMON).removeIndex(17); // Data type
         filter().type(EntityTypes1_21_2.AGEABLE_WATER_CREATURE).removeIndex(16); // Baby
@@ -609,7 +603,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
     public void onMappingDataLoaded() {
         mapTypes();
 
-        mapEntityTypeWithData(EntityTypes1_21_2.CREAKING, EntityTypes1_21_2.WARDEN).jsonName();
-        mapEntityTypeWithData(EntityTypes1_21_2.CREAKING_TRANSIENT, EntityTypes1_21_2.TEXT_DISPLAY);
+        mapEntityTypeWithData(EntityTypes1_21_2.CREAKING, EntityTypes1_21_2.WARDEN).tagName();
+        mapEntityTypeWithData(EntityTypes1_21_2.CREAKING_TRANSIENT, EntityTypes1_21_2.WARDEN).tagName();
     }
 }
diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.21.2to1.21.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.21.2to1.21.nbt
index c80ce0d82de00745a0a191a67630466559e66864..8a4277e7b96101c23285ae879cf7dde74030206e 100644
GIT binary patch
delta 712
zcmca&_}OqnGD|%JL&C2C#PtJdIneHUYWbdlJOB*;0R;nXKQD^!H@{}P#Kr;?Dw%wc
pHw47s+APVJ%Pz{nAe3B`nwXuLmmXhIl$ckXnVMI!xkfaC82|!Lf{_3K

delta 96
zcmextc*Sr-GRx$L+}4vnaO;qP1vkHDyTr!w9|$HN<P8BcHcRs5vTt50>c<QKK&>oE