From 3665eef30846c5e52c5e8dc6f7ad7005449f3cf8 Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Sun, 15 Sep 2024 17:14:26 +0200 Subject: [PATCH] use original client values --- .../rewriter/BlockItemPacketRewriter1_16.java | 4 ++-- .../rewriter/BlockItemPacketRewriter1_20_2.java | 2 +- .../rewriter/EntityPacketRewriter1_20_5.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/BlockItemPacketRewriter1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/BlockItemPacketRewriter1_16.java index d8d31154..1af4e165 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/BlockItemPacketRewriter1_16.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/BlockItemPacketRewriter1_16.java @@ -148,9 +148,9 @@ protected void registerPackets() { do { slot = wrapper.read(Types.BYTE); Item item = handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_13_2)); - int rawSlot = slot & Byte.MAX_VALUE; + int rawSlot = slot & 127; equipmentData.add(new EquipmentData(rawSlot, item)); - } while ((slot & Byte.MIN_VALUE) != 0); + } while ((slot & -128) != 0); // Send first data in the current packet EquipmentData firstData = equipmentData.get(0); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java index cc266d6c..7d30e05e 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java @@ -192,7 +192,7 @@ public void register() { do { slot = wrapper.passthrough(Types.BYTE); wrapper.write(Types.ITEM1_13_2, handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_20_2))); - } while ((slot & Byte.MIN_VALUE) != 0); + } while ((slot & -128) != 0); }); } }); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java index 968a3557..69127488 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java @@ -77,11 +77,11 @@ public void registerPackets() { do { slot = wrapper.read(Types.BYTE); final Item item = protocol.getItemRewriter().handleItemToClient(wrapper.user(), wrapper.read(Types1_20_5.ITEM)); - final int rawSlot = slot & Byte.MAX_VALUE; + final int rawSlot = slot & 127; if (rawSlot == 6) { - final boolean lastSlot = (slot & Byte.MIN_VALUE) == 0; - slot = (byte) (lastSlot ? 4 : 4 | Byte.MIN_VALUE); // Map body slot index to chest slot index for horses, also wolves + final boolean lastSlot = (slot & -128) == 0; + slot = (byte) (lastSlot ? 4 : 4 | -128); // Map body slot index to chest slot index for horses, also wolves if (type != null && type.isOrHasParent(EntityTypes1_20_5.LLAMA)) { // Cancel equipment and set correct entity data instead @@ -92,7 +92,7 @@ public void registerPackets() { wrapper.write(Types.BYTE, slot); wrapper.write(Types.ITEM1_20_2, item); - } while ((slot & Byte.MIN_VALUE) != 0); + } while ((slot & -128) != 0); }); protocol.registerClientbound(ClientboundPackets1_20_5.HORSE_SCREEN_OPEN, wrapper -> {