From 267d306569ecebf47a645cffd791ff5adac1a783 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sun, 23 Dec 2018 23:30:26 -0500 Subject: [PATCH] Remove all uses of (mark|reset)ReaderIndex() This is removed in Netty 5.x: netty/netty#8636 --- .../proxy/protocol/netty/MinecraftVarintFrameDecoder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java index 6bc48a3b..923609d8 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java @@ -16,12 +16,12 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder { return; } - in.markReaderIndex(); + int origReaderIndex = in.readerIndex(); byte[] lenBuf = new byte[3]; for (int i = 0; i < lenBuf.length; i++) { if (!in.isReadable()) { - in.resetReaderIndex(); + in.readerIndex(origReaderIndex); return; } @@ -33,7 +33,7 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder { } if (in.readableBytes() < packetLength) { - in.resetReaderIndex(); + in.readerIndex(origReaderIndex); return; }