3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-10-03 08:41:05 +02:00

Sort ProtocolVersions version list, fix base protocol registration

Dieser Commit ist enthalten in:
Nassim Jahnke 2024-02-14 17:57:00 +01:00
Ursprung 302716054d
Commit c124c1c809
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
2 geänderte Dateien mit 2 neuen und 1 gelöschten Zeilen

Datei anzeigen

@ -108,6 +108,7 @@ public class ProtocolVersion implements Comparable<ProtocolVersion> {
*/ */
public static void register(ProtocolVersion protocolVersion) { public static void register(ProtocolVersion protocolVersion) {
VERSION_LIST.add(protocolVersion); VERSION_LIST.add(protocolVersion);
VERSION_LIST.sort(ProtocolVersion::compareTo);
final Int2ObjectMap<ProtocolVersion> versions = VERSIONS.computeIfAbsent(protocolVersion.versionType, $ -> new Int2ObjectOpenHashMap<>()); final Int2ObjectMap<ProtocolVersion> versions = VERSIONS.computeIfAbsent(protocolVersion.versionType, $ -> new Int2ObjectOpenHashMap<>());
versions.put(protocolVersion.version, protocolVersion); versions.put(protocolVersion.version, protocolVersion);
@ -403,7 +404,6 @@ public class ProtocolVersion implements Comparable<ProtocolVersion> {
return this.compareTo(other) <= 0; return this.compareTo(other) <= 0;
} }
/** /**
* Returns whether this protocol version is between the given protocol versions, inclusive. * Returns whether this protocol version is between the given protocol versions, inclusive.
* *

Datei anzeigen

@ -135,6 +135,7 @@ public class ProtocolManagerImpl implements ProtocolManager {
public void registerProtocols() { public void registerProtocols() {
// Base Protocol // Base Protocol
BASE_PROTOCOL.initialize(); BASE_PROTOCOL.initialize();
BASE_PROTOCOL.register(Via.getManager().getProviders());
registerBaseProtocol(new BaseProtocol1_7(), Range.closedOpen(ProtocolVersion.v1_7_1, ProtocolVersion.v1_16)); registerBaseProtocol(new BaseProtocol1_7(), Range.closedOpen(ProtocolVersion.v1_7_1, ProtocolVersion.v1_16));
registerBaseProtocol(new BaseProtocol1_16(), Range.atLeast(ProtocolVersion.v1_16)); registerBaseProtocol(new BaseProtocol1_16(), Range.atLeast(ProtocolVersion.v1_16));