From 5f685884ff6c25ff0977221a71d2bed5d5a71e4f Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Mon, 8 Apr 2024 13:33:52 +0200
Subject: [PATCH] Handle entity effect particle in spawn particle

---
 .../rewriter/BlockItemPacketRewriter1_20_5.java            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
index 060e115b6..0f169496e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -107,6 +107,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.logging.Level;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -196,12 +197,16 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             wrapper.passthrough(Type.FLOAT); // Offset X
             wrapper.passthrough(Type.FLOAT); // Offset Y
             wrapper.passthrough(Type.FLOAT); // Offset Z
-            wrapper.passthrough(Type.FLOAT); // Particle Data
+            final float data = wrapper.passthrough(Type.FLOAT);
             wrapper.passthrough(Type.INT); // Particle Count
 
             // Read data and add it to Particle
             final ParticleMappings mappings = protocol.getMappingData().getParticleMappings();
             final Particle particle = new Particle(mappings.getNewId(particleId));
+            if (particle.id() == protocol.getMappingData().getParticleMappings().mappedId("entity_effect")) {
+                particle.add(Type.INT, data != 0 ? ThreadLocalRandom.current().nextInt() : 0); // rgb
+            }
+
             if (mappings.isBlockParticle(particleId)) {
                 final int blockStateId = wrapper.read(Type.VAR_INT);
                 particle.add(Type.VAR_INT, protocol.getMappingData().getNewBlockStateId(blockStateId));