SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix invalid calls to 1.12 methods

Browse Source
This commit is contained in:
libraryaddict
2020-07-04 18:01:30 +12:00
parent 1a256855e2
commit 6565fc5f4f
3 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
View File

@@ -1121,7 +1121,9 @@ public class ReflectionManager {
Method toMinecraft = getCraftMethod("util.CraftMagicNumbers", "getMaterialFromInternalName",
String.class);
return (Material) toMinecraft.invoke(null, name);
Object instance = toMinecraft.getDeclaringClass().getField("INSTANCE").get(null);
return (Material) toMinecraft.invoke(instance, name);
}
Object mcKey = getNmsConstructor("MinecraftKey", String.class).newInstance(name);
@@ -1140,7 +1142,12 @@ public class ReflectionManager {
return (Material) getMaterial.invoke(null, item);
}
catch (Exception ex) {
DisguiseUtilities.getLogger().severe("Error when trying to convert '" + name + "' into a Material");
ex.printStackTrace();
if (ex.getCause() != null) {
ex.getCause().printStackTrace();
}
}
return null;