From a4240dcb694234fce3413cd86fda6f030ae97de8 Mon Sep 17 00:00:00 2001
From: asofold <asofold@web.de>
Date: Sat, 17 Jan 2015 03:21:30 +0100
Subject: [PATCH] Ensure to detect the Minecraft version from the spigot server
 string.

---
 .../nocheatplus/compat/versions/ServerVersion.java           | 5 +++--
 .../fr/neatmonster/nocheatplus/TestMinecraftVersion.java     | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/ServerVersion.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/ServerVersion.java
index 435ab81c..9494b7c9 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/ServerVersion.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/ServerVersion.java
@@ -25,6 +25,7 @@ public class ServerVersion {
      */
     public static String parseMinecraftVersion(String... versionCandidates) {
         for (String serverVersion : versionCandidates) {
+            serverVersion = serverVersion.trim();
             for (String minecraftVersion : new String[]{
                     collectVersion(serverVersion, 0),
                     parseMinecraftVersionGeneric(serverVersion),
@@ -108,7 +109,7 @@ public class ServerVersion {
     private static String parseMinecraftVersionGeneric(String serverVersion) {
         String lcServerVersion = serverVersion.trim().toLowerCase();
         for (String candidate : new String[] {
-                // git-bukkit-MC_VERSION-rX.Y
+                parseVersionDelimiters(lcServerVersion, "(mc:", ")"),
                 parseVersionDelimiters(lcServerVersion, "git-bukkit-", "-r"),
                 parseVersionDelimiters(lcServerVersion, "", "-r"),
                 // TODO: Other server mods + custom builds !?.
@@ -133,7 +134,7 @@ public class ServerVersion {
             String candidate = input.substring(preIndex + prefix.length());
             int postIndex = suffix.isEmpty() ? candidate.length() : candidate.indexOf(suffix);
             if (postIndex != -1) {
-                return collectVersion(candidate.substring(0, postIndex), 0);
+                return collectVersion(candidate.substring(0, postIndex).trim(), 0);
             }
         }
         return null;
diff --git a/NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java b/NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java
index 2f804f96..b66fd1bd 100644
--- a/NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java
+++ b/NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java
@@ -15,6 +15,7 @@ public class TestMinecraftVersion {
                 {"1.7.5", "1.7.5"},
                 {"1.7.5", "1.7.5-R0.1-SNAPSHOT"},
                 {"1.7.2", "git-Bukkit-1.7.2-R0.3-14-g8f8716c-b3042jnks"},
+                {"1.8", "git-Spigot-081dfa5-7658819 (MC: 1.8)"}
         }) {
             String parsed = ServerVersion.parseMinecraftVersion(pair[1]);
             if (pair[0] == null) {