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

Light cleanup

Browse Source
This commit is contained in:
TheMode 2021-08-04 14:47:19 +02:00
parent 7320d83175
commit 58f0f3ec89
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package net.minestom.server.network.player;
import net.kyori.adventure.translation.GlobalTranslator;
import net.minestom.server.MinecraftServer;
import net.minestom.server.adventure.MinestomAdventure;
import net.minestom.server.entity.Player;
import net.minestom.server.entity.PlayerSkin;
import net.minestom.server.network.ConnectionState;
import net.minestom.server.network.PacketProcessor;
@ -15,6 +16,7 @@ import net.minestom.server.network.socket.Worker;
import net.minestom.server.utils.PacketUtils;
import net.minestom.server.utils.Utils;
import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -179,11 +181,12 @@ public class NettyPlayerConnection extends PlayerConnection {
if (!channel.isConnected())
return;
if (shouldSendPacket(serverPacket)) {
if (getPlayer() != null) {
final Player player = getPlayer();
if (player != null) {
// Flush happen during #update()
if ((MinestomAdventure.AUTOMATIC_COMPONENT_TRANSLATION && !skipTranslating) && serverPacket instanceof ComponentHoldingServerPacket) {
serverPacket = ((ComponentHoldingServerPacket) serverPacket).copyWithOperator(component ->
GlobalTranslator.render(component, Objects.requireNonNullElseGet(getPlayer().getLocale(), MinestomAdventure::getDefaultLocale)));
GlobalTranslator.render(component, Objects.requireNonNullElseGet(player.getLocale(), MinestomAdventure::getDefaultLocale)));
}
attemptWrite(serverPacket);
} else {
@ -273,6 +276,7 @@ public class NettyPlayerConnection extends PlayerConnection {
*
* @param remoteAddress the new connection remote address
*/
@ApiStatus.Internal
public void setRemoteAddress(@NotNull SocketAddress remoteAddress) {
this.remoteAddress = remoteAddress;
}
@ -345,7 +349,6 @@ public class NettyPlayerConnection extends PlayerConnection {
return protocolVersion;
}
/**
* Used in {@link net.minestom.server.network.packet.client.handshake.HandshakePacket} to change the internal fields.
*

7
src/main/java/net/minestom/server/network/socket/Server.java
View File

@ -14,12 +14,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
public class Server {
public final class Server {
public static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
public static final int WORKER_COUNT = Integer.getInteger("minestom.workers",
Runtime.getRuntime().availableProcessors() * 2);
public static final int SOCKET_BUFFER_SIZE = Integer.getInteger("minestom.buffer-size", 65535);
public static final int MAX_PACKET_SIZE = 2097151; // 3 bytes var-int
public static final int MAX_PACKET_SIZE = 2_097_151; // 3 bytes var-int
public static final boolean NO_DELAY = true;
private volatile boolean stop;
@ -45,7 +45,6 @@ public class Server {
serverSocket.configureBlocking(false);
serverSocket.register(selector, SelectionKey.OP_ACCEPT);
serverSocket.socket().setReceiveBufferSize(SOCKET_BUFFER_SIZE);
LOGGER.info("Server starting, wait for connections");
new Thread(() -> {
while (!stop) {
@ -56,7 +55,7 @@ public class Server {
e.printStackTrace();
}
}
}).start();
}, "Ms-entrypoint").start();
}
public boolean isOpen() {

10
src/main/java/net/minestom/server/network/socket/Worker.java
View File

@ -98,14 +98,18 @@ public final class Worker {
}
}
static class Thread extends java.lang.Thread {
/**
* Thread responsible for reading players socket and forwarding packets into
* players' packet queue.
*/
static final class Thread extends java.lang.Thread {
private static final AtomicInteger COUNTER = new AtomicInteger();
private Thread(Runnable runnable) {
super(null, runnable, "net-worker-" + COUNTER.getAndIncrement());
super(null, runnable, "Ms-worker-" + COUNTER.getAndIncrement());
}
protected static void start(Server server, Consumer<Context> runnable) {
static void start(Server server, Consumer<Context> runnable) {
new Thread(() -> {
Context context = new Context();
while (server.isOpen()) {