Skip to content

Fix data palette reading/writing #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
basaigh merged 1 commit into from
Mar 25, 2025
Merged

Fix data palette reading/writing #891

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,16 +1275,11 @@ public static DataPalette readDataPalette(ByteBuf buf, PaletteType paletteType)
int bitsPerEntry = buf.readByte() & 0xFF;
Palette palette = MinecraftTypes.readPalette(buf, paletteType, bitsPerEntry);
BitStorage storage;
if (!(palette instanceof SingletonPalette)) {
if (palette instanceof SingletonPalette) {
storage = null;
} else {
storage = new BitStorage(bitsPerEntry, paletteType.getStorageSize());
MinecraftTypes.readFixedSizeLongArray(buf, storage.getData());
} else {
// Eat up - can be seen on Hypixel as of 1.19.0
int length = MinecraftTypes.readVarInt(buf);
for (int i = 0; i < length; i++) {
buf.readLong();
}
storage = null;
}

return new DataPalette(palette, storage, paletteType);
Expand All @@ -1302,7 +1297,6 @@ public static void writeDataPalette(ByteBuf buf, DataPalette palette) {
if (palette.getPalette() instanceof SingletonPalette) {
buf.writeByte(0); // Bits per entry
MinecraftTypes.writeVarInt(buf, palette.getPalette().idToState(0));
MinecraftTypes.writeVarInt(buf, 0); // Data length
return;
}

Expand Down