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 9494b7c9..60c22294 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 @@ -110,6 +110,7 @@ public class ServerVersion { String lcServerVersion = serverVersion.trim().toLowerCase(); for (String candidate : new String[] { parseVersionDelimiters(lcServerVersion, "(mc:", ")"), + parseVersionDelimiters(lcServerVersion, "mcpc-plus-", "-"), parseVersionDelimiters(lcServerVersion, "git-bukkit-", "-r"), parseVersionDelimiters(lcServerVersion, "", "-r"), // TODO: Other server mods + custom builds !?. diff --git a/NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java b/NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java index b66fd1bd..9a79708e 100644 --- a/NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java +++ b/NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java @@ -15,7 +15,8 @@ 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)"} + {"1.8", "git-Spigot-081dfa5-7658819 (MC: 1.8)"}, + {"1.7.10", "random-123-Cauldron-MCPC-PLUS-1.7.10-4-5-6-7-aed425aed1"} }) { String parsed = ServerVersion.parseMinecraftVersion(pair[1]); if (pair[0] == null) {