From 23da447d7b04d9450951d1c01824322280cf62b6 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 9 May 2014 03:02:26 +1200 Subject: [PATCH] Add a . to the end of the bukkit version. Might help MCPC --- .../disguise/utilities/ReflectionManager.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/me/libraryaddict/disguise/utilities/ReflectionManager.java b/src/me/libraryaddict/disguise/utilities/ReflectionManager.java index f9e9950b..93677944 100644 --- a/src/me/libraryaddict/disguise/utilities/ReflectionManager.java +++ b/src/me/libraryaddict/disguise/utilities/ReflectionManager.java @@ -21,7 +21,7 @@ public class ReflectionManager { static { if (getBukkitVersion().startsWith("v1_")) { try { - int version = Integer.parseInt(getBukkitVersion().split("_")[1]); + int version = Integer.parseInt(getBukkitVersion().replace(".", "").split("_")[1]); if (version == 7) { currentVersion = LibVersion.V1_7; } else { @@ -34,6 +34,8 @@ public class ReflectionManager { } catch (Exception ex) { ex.printStackTrace(); } + } else { + currentVersion = V1_7; } } @@ -56,6 +58,9 @@ public class ReflectionManager { private static Field pingField; static { + if (bukkitVersion.length() > 0) { + bukkitVersion += "."; + } for (Method method : getNmsClass("EntityLiving").getDeclaredMethods()) { try { if (method.getReturnType() == float.class && Modifier.isProtected(method.getModifiers()) @@ -174,7 +179,7 @@ public class ReflectionManager { public static Class getCraftClass(String className) { try { - return Class.forName("org.bukkit.craftbukkit." + getBukkitVersion() + "." + className); + return Class.forName("org.bukkit.craftbukkit." + getBukkitVersion() + className); } catch (Exception e) { e.printStackTrace(); } @@ -193,7 +198,7 @@ public class ReflectionManager { public static String getEnumArt(Art art) { try { - Class craftArt = Class.forName("org.bukkit.craftbukkit." + getBukkitVersion() + ".CraftArt"); + Class craftArt = Class.forName("org.bukkit.craftbukkit." + getBukkitVersion() + "CraftArt"); Object enumArt = craftArt.getMethod("BukkitToNotch", Art.class).invoke(null, art); for (Field field : enumArt.getClass().getFields()) { if (field.getType() == String.class) { @@ -235,7 +240,7 @@ public class ReflectionManager { public static Class getNmsClass(String className) { try { - return Class.forName("net.minecraft.server." + getBukkitVersion() + "." + className); + return Class.forName("net.minecraft.server." + getBukkitVersion() + className); } catch (Exception e) { // e.printStackTrace(); }