Bukkit
Public
Commits
| 178 178 | }).start(); |
| 179 179 | } |
| 180 180 | } finally { |
| 181 181 | versionLock.unlock(); |
| 182 182 | } |
| 183 183 | } |
| 184 184 | |
| 185 185 | private void obtainVersion() { |
| 186 186 | String version = Bukkit.getVersion(); |
| 187 187 | if (version == null) version = "Custom"; |
| 188 + | version = "git-Spigot-5ffe41c-89ebcc2"; |
| 188 189 | if (version.startsWith("git-Spigot-")) { |
| 189 190 | String[] parts = version.substring("git-Spigot-".length()).split("-"); |
| 190 - | int cbVersions = getDistance("craftbukkit", parts[0]); |
| 191 - | int spigotVersions = getDistance("spigot", parts[1]); |
| 191 + | int cbVersions = getDistance("craftbukkit", parts[1]); |
| 192 + | int spigotVersions = getDistance("spigot", parts[0]); |
| 192 193 | if (cbVersions == -1 || spigotVersions == -1) { |
| 193 194 | setVersionMessage("Error obtaining version information"); |
| 194 195 | } else { |
| 195 - | if (cbVersions != 0 && spigotVersions != 0) { |
| 196 + | if (cbVersions == 0 && spigotVersions == 0) { |
| 196 197 | setVersionMessage("You are running the latest version"); |
| 197 198 | } else { |
| 198 - | setVersionMessage("You are " + (cbVersions + spigotVersions) + " behind"); |
| 199 + | setVersionMessage("You are " + (cbVersions + spigotVersions) + " version(s) behind"); |
| 199 200 | } |
| 200 201 | } |
| 201 202 | |
| 202 203 | } else if (version.startsWith("git-Bukkit-")) { |
| 203 204 | int cbVersions = getDistance("craftbukkit", version.substring("git-Bukkit-".length())); |
| 204 205 | if (cbVersions == -1) { |
| 205 206 | setVersionMessage("Error obtaining version information"); |
| 206 207 | } else { |
| 207 - | if (cbVersions != 0) { |
| 208 + | if (cbVersions == 0) { |
| 208 209 | setVersionMessage("You are running the latest version"); |
| 209 210 | } else { |
| 210 - | setVersionMessage("You are " + cbVersions + " behind"); |
| 211 + | setVersionMessage("You are " + cbVersions + " version(s) behind"); |
| 211 212 | } |
| 212 213 | } |
| 213 214 | } else { |
| 214 215 | setVersionMessage("Unknown version, custom build?"); |
| 215 216 | } |
| 216 217 | } |
| 217 218 | |
| 218 219 | private void setVersionMessage(String msg) { |
| 219 220 | lastCheck = System.currentTimeMillis(); |
| 220 221 | versionMessage = msg; |