MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Handle empty packets too

Browse Source
This commit is contained in:
Andrew Steinborn
2020-05-31 09:54:47 -04:00
parent c856635ac5
commit f27aa8e3ba
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java
View File

@@ -33,8 +33,10 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
if (reader.result == DecodeResult.SUCCESS) { if (reader.result == DecodeResult.SUCCESS) {
if (reader.readVarint < 0) { if (reader.readVarint < 0) {
throw BAD_LENGTH_CACHED; throw BAD_LENGTH_CACHED;
} } else if (reader.readVarint == 0) {
// skip over the empty packet and ignore it
in.readerIndex(varintEnd + 1);
} else {
int minimumRead = reader.bytesRead + reader.readVarint; int minimumRead = reader.bytesRead + reader.readVarint;
if (in.isReadable(minimumRead)) { if (in.isReadable(minimumRead)) {
out.add(in.retainedSlice(varintEnd + 1, reader.readVarint)); out.add(in.retainedSlice(varintEnd + 1, reader.readVarint));
@@ -42,6 +44,7 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
} else { } else {
return; return;
} }
}
} else if (reader.result == DecodeResult.TOO_BIG) { } else if (reader.result == DecodeResult.TOO_BIG) {
throw VARINT_BIG_CACHED; throw VARINT_BIG_CACHED;
} else if (reader.result == DecodeResult.TOO_SHORT) { } else if (reader.result == DecodeResult.TOO_SHORT) {