Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-12-22 16:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
RaphiMC 2024-04-04 00:14:22 +02:00
commit 68839a8d22
No known key found for this signature in database
GPG Key ID: 0F6BB0657A03AC94
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/florianmichael/viafabricplus/protocoltranslator/util/ProtocolVersionDetector.java
View File

@ -21,6 +21,8 @@ package de.florianmichael.viafabricplus.protocoltranslator.util;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import net.lenni0451.mcping.MCPing;
import net.lenni0451.mcping.responses.MCPingResponse;
import net.minecraft.util.Formatting;
import net.raphimc.vialoader.util.ProtocolVersionList;
import java.net.InetSocketAddress;
@ -59,7 +61,15 @@ 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 protocol : ProtocolVersionList.getProtocolsNewToOld()) {
for (String version : protocol.getIncludedVersions()) {
if (response.version.name.contains(version)) {
return protocol;
}
}
}
throw new RuntimeException("Unable to detect the server version\nServer sent an invalid protocol id: "
+ response.version.protocol + " (" + response.version.name + Formatting.RESET + ")");
}
}
}