Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #44 from md-5/bugfix/version 

Fix server version detection logic
This commit is contained in:
asofold 2017-12-21 23:11:29 +01:00 committed by GitHub
parent af44f13fbd df3344409b
commit a752851148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/cbreflect/reflect/ReflectBase.java
View File

@ -39,7 +39,7 @@ public class ReflectBase {
obcPackageName = null;
}
// nms
clazz = ServerVersion.getNMSMinecraftServer();
clazz = ServerVersion.getNMSMinecraftServer().getClass();
name = clazz.getPackage().getName();
if (name.equals("net.minecraft.server") || name.indexOf("net.") == 0 && name.indexOf(".minecraft.") != -1 && name.indexOf(".server.") != -1) {
nmsPackageName = name;

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

@ -69,11 +69,11 @@ public class ServerVersion {
return null;
}
public static Class<?> getNMSMinecraftServer() {
public static Object getNMSMinecraftServer() {
final Server server = Bukkit.getServer();
try {
final Object obj = ReflectionUtil.invokeMethodNoArgs(server, "getHandle");
return obj.getClass();
final Object obj = ReflectionUtil.invokeMethodNoArgs(server, "getServer");
return obj;
}
catch (Throwable t) {
return null;
@ -81,12 +81,12 @@ public class ServerVersion {
}
public static String fetchNMSMinecraftServerVersion() {
final Class<?> clazz = getNMSMinecraftServer();
if (clazz == null) {
final Object server = getNMSMinecraftServer();
if (server == null) {
return null;
}
try {
return (String) ReflectionUtil.invokeMethodNoArgs(clazz, "getVersion", String.class);
return (String) ReflectionUtil.invokeMethodNoArgs(server, "getVersion", String.class);
}
catch (Throwable t) {
return null;