Upstream/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2025-03-02 03:51:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved version auto detect

Browse Source
This commit is contained in:
RaphiMC 2024-04-03 23:37:43 +02:00
parent 825c825dc0
commit 3c46a0355c
No known key found for this signature in database
GPG Key ID: 0F6BB0657A03AC94
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/raphimc/viaproxy/util/ProtocolVersionDetector.java
View File

@ -21,6 +21,7 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import net.lenni0451.mcping.MCPing;
import net.lenni0451.mcping.pings.sockets.impl.factories.SocketChannelSocketFactory;
import net.lenni0451.mcping.responses.MCPingResponse;
import net.raphimc.vialoader.util.ProtocolVersionList;
import java.net.SocketAddress;
@ -51,7 +52,14 @@ public class ProtocolVersionDetector {
if (ProtocolVersion.isRegistered(response.version.protocol)) { // If the protocol is registered, we can use it
return ProtocolVersion.getProtocol(response.version.protocol);
} else {
throw new RuntimeException("Unsupported protocol version: " + response.version.protocol);
for (ProtocolVersion protocolVersion : ProtocolVersionList.getProtocolsNewToOld()) {
for (String version : protocolVersion.getIncludedVersions()) {
if (response.version.name.contains(version)) {
return protocolVersion;
}
}
}
throw new RuntimeException("Unable to detect the server version\nServer sent an invalid protocol id: " + response.version.protocol + " (" + response.version.name + "§r)");
}
}
}