From d0eeae92d3a3e971a0a63066d767f3457827b0e3 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 5 Sep 2024 09:34:37 +0200
Subject: [PATCH] 24w37a

---
 .../rewriter/ComponentRewriter1_21_2.java      |   7 ++-----
 .../rewriter/EntityPacketRewriter1_21_2.java   |  11 +++++------
 .../data/mappings-1.21.2to1.21.nbt             | Bin 993 -> 1009 bytes
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/ComponentRewriter1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/ComponentRewriter1_21_2.java
index cd4ce9ed..f981716b 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/ComponentRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/ComponentRewriter1_21_2.java
@@ -63,15 +63,12 @@ public final class ComponentRewriter1_21_2 extends TranslatableRewriter<Clientbo
         TagUtil.removeNamespaced(componentsTag, "equippable");
         TagUtil.removeNamespaced(componentsTag, "glider");
         TagUtil.removeNamespaced(componentsTag, "tooltip_style");
+        TagUtil.removeNamespaced(componentsTag, "death_protection");
+        TagUtil.removeNamespaced(componentsTag, "damage_resistant");
     }
 
     @Override
     protected SerializerVersion inputSerializerVersion() {
         return SerializerVersion.V1_20_5;
     }
-
-    @Override
-    protected SerializerVersion outputSerializerVersion() {
-        return SerializerVersion.V1_20_5;
-    }
 }
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 567c53a6..4994bb01 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
@@ -17,6 +17,7 @@
  */
 package com.viaversion.viabackwards.protocol.v1_21_2to1_21.rewriter;
 
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.Protocol1_21_2To1_21;
 import com.viaversion.viaversion.api.minecraft.RegistryEntry;
@@ -111,11 +112,8 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
             double movementY = wrapper.read(Types.DOUBLE);
             double movementZ = wrapper.read(Types.DOUBLE);
 
-            // Unpack y and x rot
-            final byte yaw = wrapper.read(Types.BYTE);
-            final byte pitch = wrapper.read(Types.BYTE);
-            wrapper.write(Types.FLOAT, yaw * 360F / 256F);
-            wrapper.write(Types.FLOAT, pitch * 360F / 256F);
+            wrapper.passthrough(Types.FLOAT); // Y rot
+            wrapper.passthrough(Types.FLOAT); // X rot
 
             // Just keep the new values in there
             final int relativeArguments = wrapper.read(Types.INT);
@@ -234,7 +232,8 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
                     wrapper.passthrough(Types.VAR_INT); // Latency
                 }
                 if (actions.get(5)) {
-                    wrapper.passthrough(Types.TAG); // Display name
+                    final Tag displayName = wrapper.passthrough(Types.TAG);
+                    protocol.getComponentRewriter().processTag(wrapper.user(), displayName);
                 }
 
                 // New one
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 1d91b1d8ba45c37ae43c4a29068500c30e2939c4..19f807f36f95caa9a578cabae88bcd6fdb4672fb 100644
GIT binary patch
delta 70
zcmaFJ{*iq{Et8NlHv>~*2?GNI9}u$xF~{W7j0%%iGx6{OIf_8pl6;Wt<O571JpX|J
O$Pok4n{P02G6DcIrxSGm

delta 104
zcmey!{*Zk`EmO1;Hv>~*2?GNI4-m5hF$WNf0kJp`O8~JX5K9BG3=qo#u^bS~1F-^7
aV@W=c!Sf#ofHXUZh5;a7bn^=)PDTJ&b{J>?