From 85ab5d7741e672f62248001117f0c647428241d1 Mon Sep 17 00:00:00 2001 From: Myles Date: Sun, 23 Sep 2018 18:52:26 +0100 Subject: [PATCH] Use Channel instead of SocketChannel For better compatibility with third party software. --- .../myles/ViaVersion/api/data/UserConnection.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java b/common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java index 4517c2305..aa9019262 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java +++ b/common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java @@ -1,10 +1,10 @@ package us.myles.ViaVersion.api.data; import io.netty.buffer.ByteBuf; +import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.socket.SocketChannel; import lombok.Data; import lombok.NonNull; import net.md_5.bungee.api.ChatColor; @@ -21,14 +21,8 @@ import java.util.concurrent.ConcurrentHashMap; @Data public class UserConnection { - /** - * The channel of the user. - * /!\ In some unofficial platforms this is a client channel - * - * TODO - Weak this field to {@link io.netty.channel.Channel}? - */ @NonNull - private final SocketChannel channel; + private final Channel channel; Map storedObjects = new ConcurrentHashMap<>(); private boolean active = true; private boolean pendingDisconnect = false; @@ -44,8 +38,8 @@ public class UserConnection { private int warnings = 0; - public UserConnection(SocketChannel socketChannel) { - this.channel = socketChannel; + public UserConnection(Channel channel) { + this.channel = channel; } /**