From a8d7ab62e3ae0498e10d3637dc8bb55572e5ec2d Mon Sep 17 00:00:00 2001
From: EnZaXD <60033407+FlorianMichael@users.noreply.github.com>
Date: Mon, 6 May 2024 09:51:41 +0200
Subject: [PATCH] Add alpha to particle colors in 1.20.3->.5 (#3827)

---
 .../rewriter/EntityPacketRewriter1_20_5.java              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 f7a43b1e1..5d3128cd3 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
@@ -386,6 +386,10 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
         }
     }
 
+    private int withAlpha(final int rgb) {
+        return 255 << 24 | rgb & 16777215;
+    }
+
     @Override
     protected void registerRewrites() {
         filter().mapMetaType(typeId -> {
@@ -423,7 +427,7 @@ 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();
             final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect"));
-            particle.add(Type.INT, effectColor);
+            particle.add(Type.INT, withAlpha(effectColor));
             meta.setTypeAndValue(Types1_20_5.META_TYPES.particlesType, new Particle[]{particle});
         });
 
@@ -466,7 +470,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
 
         final Particle particle = particleMeta.value();
         if (particle.id() == protocol.getMappingData().getParticleMappings().mappedId("entity_effect")) {
-            particle.getArgument(0).setValue(color);
+            particle.getArgument(0).setValue(withAlpha(color));
         }
     }