Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-01-15 12:01:51 +01:00
Code Issues Projects Releases Wiki Activity

Ensure to detect the Minecraft version from the spigot server string.

Browse Source
This commit is contained in:
asofold 2015-01-17 03:21:30 +01:00
parent 40d3328c87
commit a4240dcb69
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/ServerVersion.java
View File

@ -25,6 +25,7 @@ public class ServerVersion {
*/ */
public static String parseMinecraftVersion(String... versionCandidates) { public static String parseMinecraftVersion(String... versionCandidates) {
for (String serverVersion : versionCandidates) { for (String serverVersion : versionCandidates) {
serverVersion = serverVersion.trim();
for (String minecraftVersion : new String[]{ for (String minecraftVersion : new String[]{
collectVersion(serverVersion, 0), collectVersion(serverVersion, 0),
parseMinecraftVersionGeneric(serverVersion), parseMinecraftVersionGeneric(serverVersion),
@ -108,7 +109,7 @@ public class ServerVersion {
private static String parseMinecraftVersionGeneric(String serverVersion) { private static String parseMinecraftVersionGeneric(String serverVersion) {
String lcServerVersion = serverVersion.trim().toLowerCase(); String lcServerVersion = serverVersion.trim().toLowerCase();
for (String candidate : new String[] { for (String candidate : new String[] {
// git-bukkit-MC_VERSION-rX.Y parseVersionDelimiters(lcServerVersion, "(mc:", ")"),
parseVersionDelimiters(lcServerVersion, "git-bukkit-", "-r"), parseVersionDelimiters(lcServerVersion, "git-bukkit-", "-r"),
parseVersionDelimiters(lcServerVersion, "", "-r"), parseVersionDelimiters(lcServerVersion, "", "-r"),
// TODO: Other server mods + custom builds !?. // TODO: Other server mods + custom builds !?.
@ -133,7 +134,7 @@ public class ServerVersion {
String candidate = input.substring(preIndex + prefix.length()); String candidate = input.substring(preIndex + prefix.length());
int postIndex = suffix.isEmpty() ? candidate.length() : candidate.indexOf(suffix); int postIndex = suffix.isEmpty() ? candidate.length() : candidate.indexOf(suffix);
if (postIndex != -1) { if (postIndex != -1) {
return collectVersion(candidate.substring(0, postIndex), 0); return collectVersion(candidate.substring(0, postIndex).trim(), 0);
} }
} }
return null; return null;

1
NCPCore/src/test/java/fr/neatmonster/nocheatplus/TestMinecraftVersion.java
View File

@ -15,6 +15,7 @@ public class TestMinecraftVersion {
{"1.7.5", "1.7.5"}, {"1.7.5", "1.7.5"},
{"1.7.5", "1.7.5-R0.1-SNAPSHOT"}, {"1.7.5", "1.7.5-R0.1-SNAPSHOT"},
{"1.7.2", "git-Bukkit-1.7.2-R0.3-14-g8f8716c-b3042jnks"}, {"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]); String parsed = ServerVersion.parseMinecraftVersion(pair[1]);
if (pair[0] == null) { if (pair[0] == null) {