Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-10-06 10:27:33 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
themode 2021-03-08 02:11:18 +01:00
parent e730f60c0a
commit 6f9a92ac76
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/net/minestom/server/network/player/NettyPlayerConnection.java
View File

@ -72,16 +72,7 @@ public class NettyPlayerConnection extends PlayerConnection {
public void update() { public void update() {
// Flush // Flush
if (channel.isActive()) { if (channel.isActive()) {
writeWaitingPackets();
// Write all waiting packets
synchronized (tickBuffer) {
final ByteBuf copy = tickBuffer.copy();
this.channel.write(new FramedPacket(copy)).addListener(future -> {
copy.release();
});
tickBuffer.clear();
}
this.channel.flush(); this.channel.flush();
} }
// Network stats // Network stats
@ -183,9 +174,18 @@ public class NettyPlayerConnection extends PlayerConnection {
tickBuffer.writeBytes(buffer); tickBuffer.writeBytes(buffer);
} }
return; return;
} else if (message instanceof ByteBuf) {
synchronized (tickBuffer) {
tickBuffer.writeBytes((ByteBuf) message);
}
return;
} }
throw new UnsupportedOperationException("type " + message.getClass() + " is not supported");
}
ChannelFuture channelFuture = channel.write(message); public void writeAndFlush(@NotNull Object message) {
writeWaitingPackets();
ChannelFuture channelFuture = channel.writeAndFlush(message);
if (MinecraftServer.shouldProcessNettyErrors()) { if (MinecraftServer.shouldProcessNettyErrors()) {
channelFuture.addListener(future -> { channelFuture.addListener(future -> {
@ -196,15 +196,24 @@ public class NettyPlayerConnection extends PlayerConnection {
} }
} }
public void writeAndFlush(@NotNull Object message) { private void writeWaitingPackets() {
ChannelFuture channelFuture = channel.writeAndFlush(message); synchronized (tickBuffer) {
final ByteBuf copy = tickBuffer.copy();
if (MinecraftServer.shouldProcessNettyErrors()) { ChannelFuture channelFuture = channel.write(new FramedPacket(copy)).addListener(future -> {
channelFuture.addListener(future -> { copy.release();
if (!future.isSuccess() && channel.isActive()) {
MinecraftServer.getExceptionManager().handleException(future.cause());
}
}); });
// Netty debug
if (MinecraftServer.shouldProcessNettyErrors()) {
channelFuture.addListener(future -> {
if (!future.isSuccess() && channel.isActive()) {
MinecraftServer.getExceptionManager().handleException(future.cause());
}
});
}
tickBuffer.clear();
} }
} }