Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Create NettyPlayerConnection when the channel is active instead of checking for every packet

This commit is contained in:
themode 2021-03-11 23:44:05 +01:00
parent 1f18378b83
commit 39b388d624
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minestom/server/network/ConnectionManager.java
View File

@ -439,7 +439,6 @@ public final class ConnectionManager {
@NotNull UUID uuid, @NotNull String username,
boolean register) {
final Player player = getPlayerProvider().createPlayer(uuid, username, connection);
startPlayState(player, register);
return player;

28
src/main/java/net/minestom/server/network/PacketProcessor.java
View File

@ -50,13 +50,16 @@ public final class PacketProcessor {
this.playPacketsHandler = new ClientPlayPacketsHandler();
}
public void process(@NotNull ChannelHandlerContext channel, @NotNull InboundPacket packet) {
final SocketChannel socketChannel = (SocketChannel) channel.channel();
public void process(@NotNull ChannelHandlerContext context, @NotNull InboundPacket packet) {
final SocketChannel socketChannel = (SocketChannel) context.channel();
// Create the netty player connection object if not existing
PlayerConnection playerConnection = connectionPlayerConnectionMap.computeIfAbsent(
channel, c -> new NettyPlayerConnection(socketChannel)
);
PlayerConnection playerConnection = connectionPlayerConnectionMap.get(context);
if (playerConnection == null) {
// Should never happen
context.close();
return;
}
// Prevent the client from sending packets when disconnected (kick)
if (!playerConnection.isOnline() || !socketChannel.isActive()) {
@ -108,16 +111,21 @@ public final class PacketProcessor {
/**
* Retrieves a player connection from its channel.
*
* @param channel the connection channel
* @param context the connection context
* @return the connection of this channel, null if not found
*/
@Nullable
public PlayerConnection getPlayerConnection(ChannelHandlerContext channel) {
return connectionPlayerConnectionMap.get(channel);
public PlayerConnection getPlayerConnection(ChannelHandlerContext context) {
return connectionPlayerConnectionMap.get(context);
}
public void removePlayerConnection(@NotNull ChannelHandlerContext channel) {
connectionPlayerConnectionMap.remove(channel);
public void createPlayerConnection(@NotNull ChannelHandlerContext context) {
final PlayerConnection playerConnection = new NettyPlayerConnection((SocketChannel) context.channel());
connectionPlayerConnectionMap.put(context, playerConnection);
}
public void removePlayerConnection(@NotNull ChannelHandlerContext context) {
connectionPlayerConnectionMap.remove(context);
}
/**

1
src/main/java/net/minestom/server/network/netty/channel/ClientChannel.java
View File

@ -28,6 +28,7 @@ public class ClientChannel extends SimpleChannelInboundHandler<InboundPacket> {
@Override
public void channelActive(@NotNull ChannelHandlerContext ctx) {
//System.out.println("CONNECTION");
packetProcessor.createPlayerConnection(ctx);
}
@Override