From f90861dbcece5c9ba49b740cd5cbc8f0aa290362 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 8 Feb 2024 16:09:57 +0100
Subject: [PATCH] Remap breeze wind charge

---
 .../rewriter/EntityPacketRewriter1_20_5.java  |  11 ++---------
 .../data/mappings-1.20.5to1.20.3.nbt          | Bin 113467 -> 113528 bytes
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java
index a25d9e87..bcf2062e 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5.java
@@ -23,7 +23,6 @@ import com.viaversion.viabackwards.protocol.protocol1_20_3to1_20_5.Protocol1_20_
 import com.viaversion.viabackwards.protocol.protocol1_20_3to1_20_5.storage.RegistryDataStorage;
 import com.viaversion.viabackwards.protocol.protocol1_20_3to1_20_5.storage.SecureChatStorage;
 import com.viaversion.viaversion.api.data.entity.DimensionData;
-import com.viaversion.viaversion.api.data.entity.TrackedEntity;
 import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
@@ -180,14 +179,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
         });
 
         protocol.registerClientbound(ClientboundPackets1_20_5.ENTITY_PROPERTIES, wrapper -> {
-            final int entityId = wrapper.passthrough(Type.VAR_INT);
-            final TrackedEntity entity = tracker(wrapper.user()).entity(entityId);
-            if (entity == null || !entity.entityType().isOrHasParent(EntityTypes1_20_5.LIVINGENTITY)) {
-                // Cannot add attributes to base entities in old version
-                wrapper.cancel();
-                return;
-            }
-
+            wrapper.passthrough(Type.VAR_INT); // Entity ID
             final int size = wrapper.passthrough(Type.VAR_INT);
             int newSize = size;
             for (int i = 0; i < size; i++) {
@@ -262,6 +254,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
         mapTypes();
 
         mapEntityTypeWithData(EntityTypes1_20_5.ARMADILLO, EntityTypes1_20_5.COW).tagName();
+        mapEntityTypeWithData(EntityTypes1_20_5.BREEZE_WIND_CHARGE, EntityTypes1_20_5.WIND_CHARGE).jsonName();
     }
 
     @Override
diff --git a/common/src/main/resources/assets/viabackwards/data/mappings-1.20.5to1.20.3.nbt b/common/src/main/resources/assets/viabackwards/data/mappings-1.20.5to1.20.3.nbt
index 41c06c5905f74c1ec50b933af3ee97ef3e91d4e9..c69785be128eafd3ec638f400f86f230fd674392 100644
GIT binary patch
delta 107
zcmdn}jqS%bwuUW?KQ^*3FfjLS|Fe<t027eOP`LfT7RG8uX$}S!Ljwy71|dT|BLh8C
yh49S06b0vu#G>@n>DJpA)s#3Ggp!I<Q>#+r%Yjny$zUl4ZX|Wv6SpzmVgUf9Xd|Kk

delta 44
vcmezIjcxZgwuUW?KQ^-b2ZHT?HZmSyf-nzkVXS7H9=459ZTq}!jJH?-VpJIo