Upstream/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-02 08:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ViaProxy doing nothing when the client version is invalid in status protocol

Browse Source
This commit is contained in:
RaphiMC 2023-02-02 17:13:33 +01:00
parent 3d64b3cc57
commit da798dec48
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/raphimc/viaproxy/proxy/client2proxy/Client2ProxyHandler.java
View File

@ -142,13 +142,14 @@ public class Client2ProxyHandler extends SimpleChannelInboundHandler<IPacket> {
String address = packet.address.split("\0")[0]; String address = packet.address.split("\0")[0];
final VersionEnum clientVersion = VersionEnum.fromProtocolVersion(ProtocolVersion.getProtocol(packet.protocolVersion)); final VersionEnum clientVersion = VersionEnum.fromProtocolVersion(ProtocolVersion.getProtocol(packet.protocolVersion));
if (ConnectionState.LOGIN.equals(packet.intendedState)) { this.proxyConnection.setClientVersion(clientVersion);
if (clientVersion == VersionEnum.UNKNOWN) throw CloseAndReturn.INSTANCE; this.proxyConnection.setConnectionState(packet.intendedState);
if ((ConnectionState.LOGIN.equals(packet.intendedState) || ConnectionState.STATUS.equals(packet.intendedState)) && clientVersion == VersionEnum.UNKNOWN) {
this.proxyConnection.kickClient("§cYour client version is not supported by ViaProxy!");
} else if (!ConnectionState.STATUS.equals(packet.intendedState)) { } else if (!ConnectionState.STATUS.equals(packet.intendedState)) {
throw CloseAndReturn.INSTANCE; throw CloseAndReturn.INSTANCE;
} }
this.proxyConnection.setClientVersion(clientVersion);
this.proxyConnection.setConnectionState(packet.intendedState);
this.customPayloadPacketId = MCPackets.C2S_PLUGIN_MESSAGE.getId(clientVersion.getVersion()); this.customPayloadPacketId = MCPackets.C2S_PLUGIN_MESSAGE.getId(clientVersion.getVersion());
this.chatSessionUpdatePacketId = MCPackets.C2S_CHAT_SESSION_UPDATE.getId(clientVersion.getVersion()); this.chatSessionUpdatePacketId = MCPackets.C2S_CHAT_SESSION_UPDATE.getId(clientVersion.getVersion());