From 8097a355dd39e435dd8a25e50b55ba536a8536e0 Mon Sep 17 00:00:00 2001
From: riku6460 <17585784+riku6460@users.noreply.github.com>
Date: Tue, 7 Apr 2026 21:27:43 +0900
Subject: [PATCH] Fix set_beacon packet handling in 1.19->1.18.2

Handle effect id 0 as null to avoid kicks.
It was sent by <=1.16.1 clients.
---
 .../v1_19to1_18_2/rewriter/BlockItemPacketRewriter1_19.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/BlockItemPacketRewriter1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/BlockItemPacketRewriter1_19.java
index 4b7ab491..f4182440 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/BlockItemPacketRewriter1_19.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/BlockItemPacketRewriter1_19.java
@@ -159,7 +159,7 @@ public void register() {
 
         protocol.registerServerbound(ServerboundPackets1_17.SET_BEACON, wrapper -> {
             final int primaryEffect = wrapper.read(Types.VAR_INT);
-            if (primaryEffect != -1) {
+            if (primaryEffect > 0) {
                 wrapper.write(Types.BOOLEAN, true);
                 wrapper.write(Types.VAR_INT, primaryEffect);
             } else {
@@ -167,7 +167,7 @@ public void register() {
             }
 
             final int secondaryEffect = wrapper.read(Types.VAR_INT);
-            if (secondaryEffect != -1) {
+            if (secondaryEffect > 0) {
                 wrapper.write(Types.BOOLEAN, true);
                 wrapper.write(Types.VAR_INT, secondaryEffect);
             } else {