summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-27 22:41:26 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-27 22:42:00 +0000
commitc713921b66101ca0c48a995ef82d3f8a580f94d7 (patch)
treeee745ed597399288880bfd6a0b795f304f10d4c2 /src/main
parent0b440145d31a6415ee48b85e029532965c82d977 (diff)
downloadbukkit-c713921b66101ca0c48a995ef82d3f8a580f94d7.tar
bukkit-c713921b66101ca0c48a995ef82d3f8a580f94d7.tar.gz
bukkit-c713921b66101ca0c48a995ef82d3f8a580f94d7.tar.lz
bukkit-c713921b66101ca0c48a995ef82d3f8a580f94d7.tar.xz
bukkit-c713921b66101ca0c48a995ef82d3f8a580f94d7.zip
Fix the version check
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/command/defaults/VersionCommand.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index 183602d1..d939b5f6 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -185,17 +185,18 @@ public class VersionCommand extends BukkitCommand {
private void obtainVersion() {
String version = Bukkit.getVersion();
if (version == null) version = "Custom";
+ version = "git-Spigot-5ffe41c-89ebcc2";
if (version.startsWith("git-Spigot-")) {
String[] parts = version.substring("git-Spigot-".length()).split("-");
- int cbVersions = getDistance("craftbukkit", parts[0]);
- int spigotVersions = getDistance("spigot", parts[1]);
+ int cbVersions = getDistance("craftbukkit", parts[1]);
+ int spigotVersions = getDistance("spigot", parts[0]);
if (cbVersions == -1 || spigotVersions == -1) {
setVersionMessage("Error obtaining version information");
} else {
- if (cbVersions != 0 && spigotVersions != 0) {
+ if (cbVersions == 0 && spigotVersions == 0) {
setVersionMessage("You are running the latest version");
} else {
- setVersionMessage("You are " + (cbVersions + spigotVersions) + " behind");
+ setVersionMessage("You are " + (cbVersions + spigotVersions) + " version(s) behind");
}
}
@@ -204,10 +205,10 @@ public class VersionCommand extends BukkitCommand {
if (cbVersions == -1) {
setVersionMessage("Error obtaining version information");
} else {
- if (cbVersions != 0) {
+ if (cbVersions == 0) {
setVersionMessage("You are running the latest version");
} else {
- setVersionMessage("You are " + cbVersions + " behind");
+ setVersionMessage("You are " + cbVersions + " version(s) behind");
}
}
} else {