From 50022ee13a75c29564854be0aeafd1c528bf2a66 Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Tue, 11 Aug 2020 11:03:12 +1200
Subject: [PATCH] Give getDisguise a perf boost

---
 .../disguise/utilities/DisguiseUtilities.java | 53 +++++++++++--------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index b228b9cc..82f17ca8 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -2807,39 +2807,46 @@ public class DisguiseUtilities {
     }
 
     public static Disguise getDisguise(Player observer, int entityId) {
+        Entity entity = null;
+
         // If the entity ID is the same as self disguises id, then it needs to be set to the observers id
         if (entityId == DisguiseAPI.getSelfDisguiseId()) {
-            entityId = observer.getEntityId();
+            entity = observer;
+        } else {
+            for (Entity e : observer.getWorld().getEntities()) {
+                if (e.getEntityId() != entityId) {
+                    continue;
+                }
+
+                entity = e;
+                break;
+            }
+
+            if (entity == null) {
+                return null;
+            }
         }
 
         if (getFutureDisguises().containsKey(entityId)) {
-            for (World world : Bukkit.getWorlds()) {
-                for (Entity entity : world.getEntities()) {
-                    if (entity.getEntityId() != entityId) {
-                        continue;
-                    }
-
-                    onFutureDisguise(entity);
-                }
-            }
+            onFutureDisguise(entity);
         }
 
-        for (Set<TargetedDisguise> disguises : getDisguises().values()) {
-            for (TargetedDisguise dis : disguises) {
-                if (dis.getEntity() == null || !dis.isDisguiseInUse()) {
-                    continue;
-                }
+        TargetedDisguise[] disguises = getDisguises(entity.getUniqueId());
 
-                if (dis.getEntity().getEntityId() != entityId) {
-                    continue;
-                }
+        if (disguises == null) {
+            return null;
+        }
 
-                if (!dis.canSee(observer)) {
-                    continue;
-                }
-
-                return dis;
+        for (TargetedDisguise dis : disguises) {
+            if (!dis.isDisguiseInUse()) {
+                continue;
             }
+
+            if (!dis.canSee(observer)) {
+                continue;
+            }
+
+            return dis;
         }
 
         return null;