From 3dfc3bb15b6b9bf4926f8d51feb43aa8b430cd3b Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 9 May 2024 17:21:53 +0200
Subject: [PATCH] Actually add properties tag in 1.20.5->1.20.4 item handler

---
 .../rewriter/EntityPacketRewriter1_20_5.java        | 13 ++++++++-----
 .../rewriter/StructuredDataConverter.java           |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
index a17096758..54dc1ccd4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
@@ -444,13 +444,16 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
             if (metaIndex == 9) {
                 // If the color is found first
                 final Metadata particleData = event.metaAtIndex(11);
+                final int color = meta.value();
                 if (particleData == null) {
-                    // Add default particle with data
-                    final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect"));
-                    particle.add(Type.INT, withAlpha(meta.value()));
-                    event.createExtraMeta(new Metadata(10, Types1_20_5.META_TYPES.particleType, particle));
+                    if (color != 0) {
+                        // Add default particle with data
+                        final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect"));
+                        particle.add(Type.INT, withAlpha(color));
+                        event.createExtraMeta(new Metadata(10, Types1_20_5.META_TYPES.particleType, particle));
+                    }
                 } else {
-                    addColor(particleData, meta.value());
+                    addColor(particleData, color);
                 }
 
                 event.cancel();
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
index 008975de9..6d2cb5fd0 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
@@ -264,6 +264,7 @@ public final class StructuredDataConverter {
                 values.add(propertyTag);
                 propertiesTag.put(property.name(), values);
             }
+            profileTag.put("Properties", propertiesTag);
         });
         register(StructuredDataKey.INSTRUMENT, (data, tag) -> {
             // Can't do anything with direct values