diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManager.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManager.java index 3f553c78d..9f1d0e527 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManager.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/ProtocolManager.java @@ -139,7 +139,7 @@ public interface ProtocolManager { @Deprecated default @Nullable List getProtocolPath(int clientVersion, int serverVersion) { - return getProtocolPath(ProtocolVersion.getProtocol(VersionType.RELEASE, clientVersion), ProtocolVersion.getProtocol(VersionType.RELEASE, serverVersion)); + return getProtocolPath(ProtocolVersion.getProtocol(clientVersion), ProtocolVersion.getProtocol(serverVersion)); } /** diff --git a/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java b/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java index 12252042b..4072f58d6 100644 --- a/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java +++ b/common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java @@ -162,7 +162,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf private BlockedProtocolVersions loadBlockedProtocolVersions() { List blockProtocols = getListSafe("block-protocols", Integer.class, "Invalid blocked version protocol found in config: '%s'"); List blockVersions = getListSafe("block-versions", String.class, "Invalid blocked version found in config: '%s'"); - ObjectSet blockedProtocols = blockProtocols.stream().map(integer -> ProtocolVersion.getProtocol(VersionType.RELEASE, integer)).collect(ObjectOpenHashSet::of, ObjectSet::add, ObjectSet::addAll); + ObjectSet blockedProtocols = blockProtocols.stream().map(ProtocolVersion::getProtocol).collect(ObjectOpenHashSet::of, ObjectSet::add, ObjectSet::addAll); ProtocolVersion lowerBound = ProtocolVersion.unknown; ProtocolVersion upperBound = ProtocolVersion.unknown; for (String s : blockVersions) { diff --git a/common/src/main/java/com/viaversion/viaversion/platform/AbstractProtocolDetectorService.java b/common/src/main/java/com/viaversion/viaversion/platform/AbstractProtocolDetectorService.java index b1833ddff..b792917c9 100644 --- a/common/src/main/java/com/viaversion/viaversion/platform/AbstractProtocolDetectorService.java +++ b/common/src/main/java/com/viaversion/viaversion/platform/AbstractProtocolDetectorService.java @@ -45,20 +45,20 @@ public abstract class AbstractProtocolDetectorService implements ProtocolDetecto lock.readLock().unlock(); } if (detectedProtocol != -1) { - return ProtocolVersion.getProtocol(VersionType.RELEASE, detectedProtocol); + return ProtocolVersion.getProtocol(detectedProtocol); } // Step 2. Check config (CME moment?) final Map servers = configuredServers(); final Integer protocol = servers.get(serverName); if (protocol != null) { - return ProtocolVersion.getProtocol(VersionType.RELEASE, protocol); + return ProtocolVersion.getProtocol(protocol); } // Step 3. Use Default (CME moment intensifies?) final Integer defaultProtocol = servers.get("default"); if (defaultProtocol != null) { - return ProtocolVersion.getProtocol(VersionType.RELEASE, defaultProtocol); + return ProtocolVersion.getProtocol(defaultProtocol); } // Step 4: Use the proxy's lowest supported... *cries*