Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sort ProtocolVersions version list, fix base protocol registration

This commit is contained in:
Nassim Jahnke 2024-02-14 17:57:00 +01:00
parent 302716054d
commit c124c1c809
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
View File

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

1
common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
View File

@ -135,6 +135,7 @@ public class ProtocolManagerImpl implements ProtocolManager {
public void registerProtocols() {
// Base Protocol
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_16(), Range.atLeast(ProtocolVersion.v1_16));