Merge pull request #632 from booky10/fix/bits-overflow-global-palette

Fix bits overflowing when using global palette with bit storage
retrooper · Dec 21, 2023 · c15b88e · c15b88e
2 parents f013520 + 1a2d39d
commit c15b88e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...main/java/com/github/retrooper/packetevents/protocol/world/chunk/palette/DataPalette.java b/...main/java/com/github/retrooper/packetevents/protocol/world/chunk/palette/DataPalette.java
@@ -27,7 +27,9 @@
 import org.jetbrains.annotations.Nullable;
 
 public class DataPalette {
-    public static final int GLOBAL_PALETTE_BITS_PER_ENTRY = 14;
+
+    // this is the amount of bits required to store the biggest state id number
+    public static final int GLOBAL_PALETTE_BITS_PER_ENTRY = 15;
 
     public @NotNull Palette palette;
     public BaseStorage storage;
@@ -187,4 +189,4 @@ private static Palette createPalette(int bitsPerEntry, PaletteType paletteType)
     private static int index(int x, int y, int z) {
         return y << 8 | z << 4 | x;
     }
-}
+}
diff --git a/.../main/java/com/github/retrooper/packetevents/protocol/world/chunk/storage/BitStorage.java b/.../main/java/com/github/retrooper/packetevents/protocol/world/chunk/storage/BitStorage.java
@@ -107,13 +107,24 @@ public int getSize() {
 
     @Override
     public int get(int index) {
+        if (index < 0 || index > this.size - 1L) {
+            throw new IllegalStateException("Illegal index: " + index + " < 0 || " + index + " > " + this.size + " - 1");
+        }
+
         int cellIndex = cellIndex(index);
         int bitIndex = bitIndex(index, cellIndex);
         return (int) (this.data[cellIndex] >> bitIndex & this.maxValue);
     }
 
     @Override
     public void set(int index, int value) {
+        if (index < 0 || index > this.size - 1L) {
+            throw new IllegalStateException("Illegal index: " + index + " < 0 || " + index + " > " + this.size + " - 1");
+        }
+        if (value < 0 || value > this.maxValue) {
+            throw new IllegalStateException("Illegal value: " + value + " < 0 || " + value + " > " + this.maxValue);
+        }
+
         int cellIndex = cellIndex(index);
         int bitIndex = bitIndex(index, cellIndex);
         this.data[cellIndex] = this.data[cellIndex] & ~(this.maxValue << bitIndex) | ((long) value & this.maxValue) << bitIndex;