Skip to content

Commit bee9170

Browse files
Fix data palette reading/writing
1 parent 2249d72 commit bee9170

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftTypes.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -1275,16 +1275,11 @@ public static DataPalette readDataPalette(ByteBuf buf, PaletteType paletteType)
12751275
int bitsPerEntry = buf.readByte() & 0xFF;
12761276
Palette palette = MinecraftTypes.readPalette(buf, paletteType, bitsPerEntry);
12771277
BitStorage storage;
1278-
if (!(palette instanceof SingletonPalette)) {
1278+
if (palette instanceof SingletonPalette) {
1279+
storage = null;
1280+
} else {
12791281
storage = new BitStorage(bitsPerEntry, paletteType.getStorageSize());
12801282
MinecraftTypes.readFixedSizeLongArray(buf, storage.getData());
1281-
} else {
1282-
// Eat up - can be seen on Hypixel as of 1.19.0
1283-
int length = MinecraftTypes.readVarInt(buf);
1284-
for (int i = 0; i < length; i++) {
1285-
buf.readLong();
1286-
}
1287-
storage = null;
12881283
}
12891284

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

0 commit comments

Comments
 (0)