From 31211c221447a69141ca491facabcad9289a27c6 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 8 May 2024 20:28:55 +0200
Subject: [PATCH] Fix tipped arrow and area effect cloud color

---
 .../rewriter/EntityPacketRewriter1_20_5.java     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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 f3affe70b..a17096758 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,7 +444,14 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
             if (metaIndex == 9) {
                 // If the color is found first
                 final Metadata particleData = event.metaAtIndex(11);
-                addColor(particleData, 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));
+                } else {
+                    addColor(particleData, meta.value());
+                }
 
                 event.cancel();
                 return;
@@ -463,6 +470,13 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
             }
         });
 
+        filter().type(EntityTypes1_20_5.ARROW).index(10).handler((event, meta) -> {
+            final int color = meta.value();
+            if (color != -1) {
+                meta.setValue(withAlpha(color));
+            }
+        });
+
         filter().type(EntityTypes1_20_5.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
             final int blockState = meta.value();
             meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState));