diff --git a/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java b/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java index 5aca97746..8e0e47a8e 100644 --- a/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java +++ b/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java @@ -83,6 +83,7 @@ public class ChunkBatch implements InstanceBatch { /** * Execute the batch in the dedicated pool and run the callback during the next instance update when blocks are placed + * (which means that the callback can be called 50ms after, and in a determinable thread) * * @param callback the callback to execute once the blocks are placed */ @@ -93,7 +94,7 @@ public class ChunkBatch implements InstanceBatch { } /** - * Execute the batch in the dedicated pool and run the callback once blocks are placed (in the current thread) + * Execute the batch in the dedicated pool and run the callback once blocks are placed (in the block batch pool) * * @param callback the callback to execute once the blocks are placed */ diff --git a/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java b/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java index b05ebe2b8..288e09436 100644 --- a/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java @@ -11,6 +11,11 @@ import net.minestom.server.utils.binary.BinaryReader; public class HandshakePacket implements ClientPreplayPacket { + /** + * Text sent if a player tries to connect with an invalid version of the client + */ + private static final ColoredText INVALID_VERSION_TEXT = ColoredText.of(ChatColor.RED, "Invalid Version, please use " + MinecraftServer.VERSION_NAME); + private int protocolVersion; private String serverAddress; private int serverPort; @@ -33,7 +38,7 @@ public class HandshakePacket implements ClientPreplayPacket { case 2: connection.setConnectionState(ConnectionState.LOGIN); if (protocolVersion != MinecraftServer.PROTOCOL_VERSION) { - connection.sendPacket(new LoginDisconnect(ColoredText.of(ChatColor.RED, "Invalid Version").toString())); + connection.sendPacket(new LoginDisconnect(INVALID_VERSION_TEXT.toString())); connection.disconnect(); } break; diff --git a/src/main/java/net/minestom/server/network/packet/server/login/LoginDisconnect.java b/src/main/java/net/minestom/server/network/packet/server/login/LoginDisconnect.java index 7b9e1d29d..9d5a99f9c 100644 --- a/src/main/java/net/minestom/server/network/packet/server/login/LoginDisconnect.java +++ b/src/main/java/net/minestom/server/network/packet/server/login/LoginDisconnect.java @@ -4,20 +4,21 @@ import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.utils.binary.BinaryWriter; public class LoginDisconnect implements ServerPacket { - private String kickMessage; - public LoginDisconnect(String kickMessage) { - this.kickMessage = kickMessage; - } + private String kickMessage; - @Override - public void write(BinaryWriter writer) { - writer.writeSizedString(kickMessage); - } + public LoginDisconnect(String kickMessage) { + this.kickMessage = kickMessage; + } - @Override - public int getId() { - return 0x00; - } + @Override + public void write(BinaryWriter writer) { + writer.writeSizedString(kickMessage); + } + + @Override + public int getId() { + return 0x00; + } }