Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-11-15 15:16:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into acquirable

Browse Source
This commit is contained in:
TheMode 2021-04-16 02:36:46 +02:00
commit be0c425dfc
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -869,6 +869,7 @@ public abstract class Instance implements BlockModifier, Tickable, EventHandler,
if (isPlayer) {
final Player player = (Player) entity;
getWorldBorder().init(player);
player.getPlayerConnection().sendPacket(createTimePacket());
}
// Send all visible entities

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

@ -183,23 +183,25 @@ public class NettyPlayerConnection extends PlayerConnection {
return;
}
// Retrieve safe copy
final ByteBuf copy;
synchronized (tickBuffer) {
final ByteBuf copy = tickBuffer.copy();
ChannelFuture channelFuture = channel.write(new FramedPacket(copy));
channelFuture.addListener(future -> copy.release());
// Netty debug
if (MinecraftServer.shouldProcessNettyErrors()) {
channelFuture.addListener(future -> {
if (!future.isSuccess() && channel.isActive()) {
MinecraftServer.getExceptionManager().handleException(future.cause());
}
});
}
copy = tickBuffer.copy();
tickBuffer.clear();
}
// Write copied buffer to netty
ChannelFuture channelFuture = channel.write(new FramedPacket(copy));
channelFuture.addListener(future -> copy.release());
// Netty debug
if (MinecraftServer.shouldProcessNettyErrors()) {
channelFuture.addListener(future -> {
if (!future.isSuccess() && channel.isActive()) {
MinecraftServer.getExceptionManager().handleException(future.cause());
}
});
}
}
public void flush() {