Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-11-16 11:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly read unused light data in 1.17->1.16

Browse Source 
Some servers for some reason do this
This commit is contained in:
Nassim Jahnke 2024-08-18 15:13:51 +02:00
parent ef2621c917
commit 0b3a792a51
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/com/viaversion/viabackwards/protocol/v1_17to1_16_4/rewriter/BlockItemPacketRewriter1_17.java
View File

@ -247,13 +247,14 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
private void writeLightArrays(PacketWrapper wrapper, BitSet bitMask, int cutBitMask,
int startFromSection, int sectionHeight) {
wrapper.read(Types.VAR_INT); // Length - throw it away
int packetContentsLength = wrapper.read(Types.VAR_INT);
int read = 0;
List<byte[]> light = new ArrayList<>();
// Remove lower bounds
for (int i = 0; i < startFromSection; i++) {
if (bitMask.get(i)) {
read++;
wrapper.read(Types.BYTE_ARRAY_PRIMITIVE);
}
}
@ -261,6 +262,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
// Add the important 18 sections
for (int i = 0; i < 18; i++) {
if (isSet(cutBitMask, i)) {
read++;
light.add(wrapper.read(Types.BYTE_ARRAY_PRIMITIVE));
}
}
@ -268,6 +270,14 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
// Remove upper bounds
for (int i = startFromSection + 18; i < sectionHeight + 2; i++) {
if (bitMask.get(i)) {
read++;
wrapper.read(Types.BYTE_ARRAY_PRIMITIVE);
}
}
if (read != packetContentsLength) {
// Read the rest if the server for some reason sends more than are actually consumed
for (int i = read; i < packetContentsLength; i++) {
wrapper.read(Types.BYTE_ARRAY_PRIMITIVE);
}
}