diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java index 9522c993..73615bfa 100644 --- a/src/me/libraryaddict/disguise/DisguiseAPI.java +++ b/src/me/libraryaddict/disguise/DisguiseAPI.java @@ -119,7 +119,7 @@ public class DisguiseAPI { public static Disguise getDisguise(Entity disguised) { if (disguised == null) return null; - return DisguiseUtilities.getDisguise(disguised.getEntityId()); + return DisguiseUtilities.getMainDisguise(disguised.getEntityId()); } /** diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java index c5904f06..6a6fde84 100644 --- a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java +++ b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java @@ -161,18 +161,14 @@ public class DisguiseUtilities { } } - @Deprecated - public static TargetedDisguise getDisguise(int entityId) { + public static TargetedDisguise getMainDisguise(int entityId) { TargetedDisguise toReturn = null; if (getDisguises().containsKey(entityId)) { for (TargetedDisguise disguise : getDisguises().get(entityId)) { - if (disguise.getDisguiseTarget() == TargetType.SHOW_TO_EVERYONE_BUT_THESE_PLAYERS - && disguise.getObservers().isEmpty()) { + if (disguise.getDisguiseTarget() == TargetType.SHOW_TO_EVERYONE_BUT_THESE_PLAYERS) { return disguise; } - if (toReturn == null) { - toReturn = disguise; - } + toReturn = disguise; } } return toReturn;