Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-23 02:25:19 +01:00
Code Issues Projects Releases Wiki Activity

Use getters instead of inlining

Browse Source
This commit is contained in:
KennyTV 2020-10-21 14:17:51 +02:00
parent 1129c17489
commit c8029bdbdf
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
View File

@ -71,7 +71,7 @@ public class ProtocolVersion {
public static ProtocolVersion register(int version, int snapshotVersion, String name, @Nullable VersionRange versionRange) { public static ProtocolVersion register(int version, int snapshotVersion, String name, @Nullable VersionRange versionRange) {
ProtocolVersion protocol = new ProtocolVersion(version, snapshotVersion, name, versionRange); ProtocolVersion protocol = new ProtocolVersion(version, snapshotVersion, name, versionRange);
versionList.add(protocol); versionList.add(protocol);
versions.put(protocol.version, protocol); versions.put(protocol.getVersion(), protocol);
if (protocol.isSnapshot()) { if (protocol.isSnapshot()) {
versions.put(protocol.getFullSnapshotVersion(), protocol); versions.put(protocol.getFullSnapshotVersion(), protocol);
} }
@ -103,19 +103,19 @@ public class ProtocolVersion {
@Nullable @Nullable
public static ProtocolVersion getClosest(String protocol) { public static ProtocolVersion getClosest(String protocol) {
for (ProtocolVersion version : versions.values()) { for (ProtocolVersion version : versions.values()) {
String name = version.name; String name = version.getName();
if (name.equals(protocol)) { if (name.equals(protocol)) {
return version; return version;
} }
if (version.versionWildcard) { if (version.isVersionWildcard()) {
// Test against the major version as well as with the ".x" prefix // Test against the major version as well as with the ".x" prefix
String majorVersion = name.substring(0, name.length() - 2); String majorVersion = name.substring(0, name.length() - 2);
if (majorVersion.equals(protocol) || (protocol.startsWith(name.substring(0, name.length() - 1)))) { if (majorVersion.equals(protocol) || (protocol.startsWith(name.substring(0, name.length() - 1)))) {
return version; return version;
} }
} else if (version.isRange()) { } else if (version.isRange()) {
if (version.includedVersions.contains(protocol)) { if (version.getIncludedVersions().contains(protocol)) {
return version; return version;
} }
} }