From cb5fc9fb08ff67db5c89e02b5e936795566a40f5 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 8 May 2024 11:51:06 +0200
Subject: [PATCH] Fix empty effect handling Fixes #3832

---
 .../rewriter/EntityPacketRewriter1_20_5.java              | 8 +++++++-
 1 file changed, 7 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 5d3128cd3..f3affe70b 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
@@ -387,7 +387,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
     }
 
     private int withAlpha(final int rgb) {
-        return 255 << 24 | rgb & 16777215;
+        return 255 << 24 | rgb & 0xffffff;
     }
 
     @Override
@@ -426,6 +426,12 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
 
         filter().type(EntityTypes1_20_5.LIVINGENTITY).index(10).handler((event, meta) -> {
             final int effectColor = meta.value();
+            if (effectColor == 0) {
+                // No effect
+                meta.setTypeAndValue(Types1_20_5.META_TYPES.particlesType, new Particle[0]);
+                return;
+            }
+
             final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect"));
             particle.add(Type.INT, withAlpha(effectColor));
             meta.setTypeAndValue(Types1_20_5.META_TYPES.particlesType, new Particle[]{particle});