spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-08-31 22:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve /version command

Browse source
This commit is contained in:
md_5 2021-01-16 13:20:32 +11:00
parent 85b16b8a5f
commit b94b766f22
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/org/bukkit/command/defaults/VersionCommand.java
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 {