Improve /version command

By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2021-01-16 13:20:32 +11:00
parent 9e79e1d303
commit fe61d84f47

View File

@@ -187,10 +187,10 @@ public class VersionCommand extends BukkitCommand {
private void obtainVersion() { private void obtainVersion() {
String version = Bukkit.getVersion(); String version = Bukkit.getVersion();
if (version == null) version = "Custom"; if (version == null) version = "Custom";
if (version.startsWith("git-Spigot-")) { String[] parts = version.substring(0, version.indexOf(' ')).split("-");
String[] parts = version.substring("git-Spigot-".length()).split("-"); if (parts.length == 4) {
int cbVersions = getDistance("craftbukkit", parts[1].substring(0, parts[1].indexOf(' '))); int cbVersions = getDistance("craftbukkit", parts[3]);
int spigotVersions = getDistance("spigot", parts[0]); int spigotVersions = getDistance("spigot", parts[2]);
if (cbVersions == -1 || spigotVersions == -1) { if (cbVersions == -1 || spigotVersions == -1) {
setVersionMessage("Error obtaining version information"); setVersionMessage("Error obtaining version information");
} else { } else {
@@ -201,9 +201,8 @@ public class VersionCommand extends BukkitCommand {
} }
} }
} else if (version.startsWith("git-Bukkit-")) { } else if (parts.length == 3) {
version = version.substring("git-Bukkit-".length()); int cbVersions = getDistance("craftbukkit", parts[2]);
int cbVersions = getDistance("craftbukkit", version.substring(0, version.indexOf(' ')));
if (cbVersions == -1) { if (cbVersions == -1) {
setVersionMessage("Error obtaining version information"); setVersionMessage("Error obtaining version information");
} else { } else {