Ensure input buffer isn't modified by VV

ViaVersion · Sep 2, 2024 · fb905a1 · fb905a1
1 parent 4959d65
commit fb905a1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/java/net/raphimc/vialegacy/api/util/PacketUtil.java b/src/main/java/net/raphimc/vialegacy/api/util/PacketUtil.java
@@ -19,6 +19,7 @@
 
 import com.viaversion.viaversion.api.protocol.packet.PacketType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.protocol.packet.PacketWrapperImpl;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -29,7 +30,13 @@ public static int calculateLength(final PacketWrapper wrapper) {
         wrapper.setPacketType(null);
 
         final ByteBuf lengthBuffer = Unpooled.buffer();
+        if (wrapper instanceof PacketWrapperImpl impl && impl.getInputBuffer() != null) {
+            impl.getInputBuffer().markReaderIndex();
+        }
         wrapper.writeToBuffer(lengthBuffer);
+        if (wrapper instanceof PacketWrapperImpl impl && impl.getInputBuffer() != null) {
+            impl.getInputBuffer().resetReaderIndex();
+        }
         final int length = lengthBuffer.readableBytes();
         lengthBuffer.release();