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

Merge branch 'dev/1.1.0' into natives-java-improvements

Browse Source 
# Conflicts:
#	native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java
This commit is contained in:
Andrew Steinborn
2019-09-07 00:06:13 -04:00
parent cc6d060fc5 dbfbd1e2a9
commit 35856fec04
53 changed files with 1422 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
native/src/main/java/com/velocitypowered/natives/encryption/NativeVelocityCipher.java
View File

@@ -56,11 +56,16 @@ public class NativeVelocityCipher implements VelocityCipher {
int len = source.readableBytes();
ByteBuf out = ctx.alloc().directBuffer(len);
impl.process(this.ctx, source.memoryAddress() + source.readerIndex(), len,
out.memoryAddress(), encrypt);
source.skipBytes(len);
out.writerIndex(len);
return out;
try {
impl.process(this.ctx, source.memoryAddress() + source.readerIndex(), len,
out.memoryAddress(), encrypt);
source.skipBytes(len);
out.writerIndex(len);
return out;
} catch (Exception e) {
out.release();
throw e;
}
}
@Override