From 13cf2f5e850637853d817cfcea166dc28082dda4 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 15 Jun 2014 19:46:37 +1200 Subject: [PATCH] Removed method, make sure that playerNames are case insensitive when looking them up --- .../libraryaddict/disguise/utilities/DisguiseUtilities.java | 5 +++-- .../libraryaddict/disguise/utilities/ReflectionManager.java | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java index 506b4869..16762de3 100644 --- a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java +++ b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java @@ -362,7 +362,8 @@ public class DisguiseUtilities { return getProfileFromMojang(playerName, (Object) runnableIfCantReturn); } - private static WrappedGameProfile getProfileFromMojang(final String playerName, final Object runnable) { + private static WrappedGameProfile getProfileFromMojang(String name, final Object runnable) { + final String playerName = name.toLowerCase(); if (gameProfiles.containsKey(playerName)) { if (gameProfiles.get(playerName) != null) { return gameProfiles.get(playerName); @@ -372,7 +373,7 @@ public class DisguiseUtilities { Player player = Bukkit.getPlayerExact(playerName); if (player != null) { WrappedGameProfile gameProfile = ReflectionManager.getGameProfile(player); - if (ReflectionManager.hasSkinBlob(gameProfile)) { + if (!gameProfile.getProperties().isEmpty()) { gameProfiles.put(playerName, gameProfile); return gameProfile; } diff --git a/src/me/libraryaddict/disguise/utilities/ReflectionManager.java b/src/me/libraryaddict/disguise/utilities/ReflectionManager.java index 365399fc..3a53fc75 100644 --- a/src/me/libraryaddict/disguise/utilities/ReflectionManager.java +++ b/src/me/libraryaddict/disguise/utilities/ReflectionManager.java @@ -14,7 +14,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.collect.ImmutableMap; -import me.libraryaddict.disguise.disguisetypes.DisguiseType; import org.bukkit.Art; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -530,10 +529,6 @@ public class ReflectionManager { return null; } - public static boolean hasSkinBlob(WrappedGameProfile gameProfile) { - return !gameProfile.getProperties().isEmpty(); - } - private static String methodSignaturePart(Class param) { if (param.isArray()) { return "[" + methodSignaturePart(param.getComponentType());