From af0903050d4cf73d2dfb9224b8122066333f0167 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Sat, 9 Nov 2019 21:30:46 -0500
Subject: [PATCH] Make sure in-place AES respects reader index

---
 .../natives/encryption/JavaVelocityCipher.java                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java b/native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java
index dc3cd2318..70ead996d 100644
--- a/native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java
+++ b/native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java
@@ -40,10 +40,10 @@ public class JavaVelocityCipher implements VelocityCipher {
     Preconditions.checkArgument(source.hasArray(), "No source array");
 
     int inBytes = source.readableBytes();
+    int baseOffset = source.arrayOffset() + source.readerIndex();
 
     try {
-      cipher.update(source.array(), source.arrayOffset(), inBytes, source.array(),
-          source.arrayOffset());
+      cipher.update(source.array(), baseOffset, inBytes, source.array(), baseOffset);
     } catch (ShortBufferException ex) {
       /* This _really_ shouldn't happen - AES CFB8 will work in place.
          If you run into this, that means that for whatever reason the Java Runtime has determined