Fixes.

PaperMC · Sep 2, 2024 · 2784ef5 · 2784ef5
1 parent f86eb9a
commit 2784ef5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 76 deletions.
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java
@@ -115,9 +115,10 @@ public enum ProtocolUtils {
   private static final int[] VAR_INT_LENGTHS = new int[65];
 
   static {
-    for (int i = 0; i <= 64; ++i) {
-      VAR_INT_LENGTHS[i] = (63 - i) / 7;
+    for (int i = 0; i <= 32; ++i) {
+      VAR_INT_LENGTHS[i] = (int) Math.ceil((31d - (i - 1)) / 7d);
     }
+    VAR_INT_LENGTHS[32] = 1; // Special case for the number 0.
   }
 
   private static DecoderException badVarint() {
@@ -139,8 +140,8 @@ public static int readVarInt(ByteBuf buf) {
     }
 
     // we can read at least one byte, and this should be a common case
-    int k = buf.readUnsignedByte();
-    if (k < 0x80) {
+    int k = buf.readByte();
+    if ((k & 0x80) != 128) {
       return k;
     }
 

diff --git a/...src/main/java/com/velocitypowered/proxy/protocol/netty/TwentyOneBitVarintByteDecoder.java b/...src/main/java/com/velocitypowered/proxy/protocol/netty/TwentyOneBitVarintByteDecoder.java