From ad109b0cdaa91dd737d0ea451acd416995887752 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Tue, 21 Jan 2014 06:35:42 +1300
Subject: [PATCH] Tiny tiny code cleanup

---
 src/me/libraryaddict/disguise/DisguiseAPI.java         |  2 +-
 .../disguise/utilities/DisguiseUtilities.java          | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

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;