Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-26 01:51:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix cachedBuffer being overriden (#603)

Browse Source
This commit is contained in:
Moulberry 2022-01-27 00:28:41 +08:00 committed by GitHub
parent f66a5044e3
commit cd591dd388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minestom/server/utils/binary/BinaryBuffer.java
View File

@ -44,7 +44,9 @@ public final class BinaryBuffer {
final int size = buffer.readableBytes();
final var temp = ByteBuffer.allocateDirect(size)
.put(buffer.asByteBuffer(0, size));
return new BinaryBuffer(temp);
BinaryBuffer newBuffer = new BinaryBuffer(temp);
newBuffer.writerOffset = size;
return newBuffer;
}
public void write(ByteBuffer buffer, int index, int length) {
@ -57,7 +59,7 @@ public final class BinaryBuffer {
}
public void write(BinaryBuffer buffer) {
write(buffer.asByteBuffer(buffer.readerOffset, buffer.writerOffset));
write(buffer.asByteBuffer(buffer.readerOffset, buffer.writerOffset - buffer.readerOffset));
}
public int readVarInt() {
@ -138,8 +140,8 @@ public final class BinaryBuffer {
return this;
}
public ByteBuffer asByteBuffer(int reader, int writer) {
return nioBuffer.slice(reader, writer);
public ByteBuffer asByteBuffer(int reader, int length) {
return nioBuffer.slice(reader, length);
}
@ApiStatus.Internal
@ -161,7 +163,7 @@ public final class BinaryBuffer {
}
public void readChannel(ReadableByteChannel channel) throws IOException {
final int count = channel.read(nioBuffer.slice(readerOffset, capacity - readerOffset));
final int count = channel.read(nioBuffer.slice(writerOffset, capacity - writerOffset));
if (count == -1) {
// EOS
throw new IOException("Disconnected");