From 3b0d1d961af02e0aabb8062b067ce2a143387abe Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 28 Sep 2023 09:34:26 +1000
Subject: [PATCH] Fix secondary effect reading in serverbound beacon Fixes
 #3455

---
 .../rewriter/BlockItemPacketRewriter1_20_2.java            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
index 478958e0d..9bd619525 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
@@ -62,8 +62,11 @@ public final class BlockItemPacketRewriter1_20_2 extends ItemRewriter<Clientboun
         blockRewriter.registerEffect(ClientboundPackets1_19_4.EFFECT, 1010, 2001);
 
         protocol.registerServerbound(ServerboundPackets1_20_2.SET_BEACON_EFFECT, wrapper -> {
-            if (wrapper.passthrough(Type.BOOLEAN)) {
-                // Effects start at 1 before 1.20.2
+            // Effects start at 1 before 1.20.2
+            if (wrapper.passthrough(Type.BOOLEAN)) { // Primary effect
+                wrapper.write(Type.VAR_INT, wrapper.read(Type.VAR_INT) + 1);
+            }
+            if (wrapper.passthrough(Type.BOOLEAN)) { // Secondary effect
                 wrapper.write(Type.VAR_INT, wrapper.read(Type.VAR_INT) + 1);
             }
         });