mirror of
https://github.com/Minestom/Minestom.git
synced 2024-09-30 23:47:37 +02:00
Light cleanup
This commit is contained in:
parent
7320d83175
commit
58f0f3ec89
@ -3,6 +3,7 @@ package net.minestom.server.network.player;
|
|||||||
import net.kyori.adventure.translation.GlobalTranslator;
|
import net.kyori.adventure.translation.GlobalTranslator;
|
||||||
import net.minestom.server.MinecraftServer;
|
import net.minestom.server.MinecraftServer;
|
||||||
import net.minestom.server.adventure.MinestomAdventure;
|
import net.minestom.server.adventure.MinestomAdventure;
|
||||||
|
import net.minestom.server.entity.Player;
|
||||||
import net.minestom.server.entity.PlayerSkin;
|
import net.minestom.server.entity.PlayerSkin;
|
||||||
import net.minestom.server.network.ConnectionState;
|
import net.minestom.server.network.ConnectionState;
|
||||||
import net.minestom.server.network.PacketProcessor;
|
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.PacketUtils;
|
||||||
import net.minestom.server.utils.Utils;
|
import net.minestom.server.utils.Utils;
|
||||||
import net.minestom.server.utils.validate.Check;
|
import net.minestom.server.utils.validate.Check;
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
@ -179,11 +181,12 @@ public class NettyPlayerConnection extends PlayerConnection {
|
|||||||
if (!channel.isConnected())
|
if (!channel.isConnected())
|
||||||
return;
|
return;
|
||||||
if (shouldSendPacket(serverPacket)) {
|
if (shouldSendPacket(serverPacket)) {
|
||||||
if (getPlayer() != null) {
|
final Player player = getPlayer();
|
||||||
|
if (player != null) {
|
||||||
// Flush happen during #update()
|
// Flush happen during #update()
|
||||||
if ((MinestomAdventure.AUTOMATIC_COMPONENT_TRANSLATION && !skipTranslating) && serverPacket instanceof ComponentHoldingServerPacket) {
|
if ((MinestomAdventure.AUTOMATIC_COMPONENT_TRANSLATION && !skipTranslating) && serverPacket instanceof ComponentHoldingServerPacket) {
|
||||||
serverPacket = ((ComponentHoldingServerPacket) serverPacket).copyWithOperator(component ->
|
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);
|
attemptWrite(serverPacket);
|
||||||
} else {
|
} else {
|
||||||
@ -273,6 +276,7 @@ public class NettyPlayerConnection extends PlayerConnection {
|
|||||||
*
|
*
|
||||||
* @param remoteAddress the new connection remote address
|
* @param remoteAddress the new connection remote address
|
||||||
*/
|
*/
|
||||||
|
@ApiStatus.Internal
|
||||||
public void setRemoteAddress(@NotNull SocketAddress remoteAddress) {
|
public void setRemoteAddress(@NotNull SocketAddress remoteAddress) {
|
||||||
this.remoteAddress = remoteAddress;
|
this.remoteAddress = remoteAddress;
|
||||||
}
|
}
|
||||||
@ -345,7 +349,6 @@ public class NettyPlayerConnection extends PlayerConnection {
|
|||||||
return protocolVersion;
|
return protocolVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used in {@link net.minestom.server.network.packet.client.handshake.HandshakePacket} to change the internal fields.
|
* Used in {@link net.minestom.server.network.packet.client.handshake.HandshakePacket} to change the internal fields.
|
||||||
*
|
*
|
||||||
|
@ -14,12 +14,12 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class Server {
|
public final class Server {
|
||||||
public static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
|
public static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
|
||||||
public static final int WORKER_COUNT = Integer.getInteger("minestom.workers",
|
public static final int WORKER_COUNT = Integer.getInteger("minestom.workers",
|
||||||
Runtime.getRuntime().availableProcessors() * 2);
|
Runtime.getRuntime().availableProcessors() * 2);
|
||||||
public static final int SOCKET_BUFFER_SIZE = Integer.getInteger("minestom.buffer-size", 65535);
|
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;
|
public static final boolean NO_DELAY = true;
|
||||||
|
|
||||||
private volatile boolean stop;
|
private volatile boolean stop;
|
||||||
@ -45,7 +45,6 @@ public class Server {
|
|||||||
serverSocket.configureBlocking(false);
|
serverSocket.configureBlocking(false);
|
||||||
serverSocket.register(selector, SelectionKey.OP_ACCEPT);
|
serverSocket.register(selector, SelectionKey.OP_ACCEPT);
|
||||||
serverSocket.socket().setReceiveBufferSize(SOCKET_BUFFER_SIZE);
|
serverSocket.socket().setReceiveBufferSize(SOCKET_BUFFER_SIZE);
|
||||||
|
|
||||||
LOGGER.info("Server starting, wait for connections");
|
LOGGER.info("Server starting, wait for connections");
|
||||||
new Thread(() -> {
|
new Thread(() -> {
|
||||||
while (!stop) {
|
while (!stop) {
|
||||||
@ -56,7 +55,7 @@ public class Server {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}).start();
|
}, "Ms-entrypoint").start();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isOpen() {
|
public boolean isOpen() {
|
||||||
|
@ -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 static final AtomicInteger COUNTER = new AtomicInteger();
|
||||||
|
|
||||||
private Thread(Runnable runnable) {
|
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(() -> {
|
new Thread(() -> {
|
||||||
Context context = new Context();
|
Context context = new Context();
|
||||||
while (server.isOpen()) {
|
while (server.isOpen()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user