Merge pull request #30 from Bilbotech/patch-1

update headIcon
Ethan-Vann · Sep 27, 2023 · 2219c90 · 2219c90
2 parents ed894f2 + 5a1b709
commit 2219c90
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/main/java/com/example/EthanApiPlugin/EthanApiPlugin.java b/src/main/java/com/example/EthanApiPlugin/EthanApiPlugin.java
@@ -180,20 +180,20 @@ public static int pathLength(Player player) {
     public static HeadIcon getHeadIcon(NPC npc) {
         Method getHeadIconArrayMethod = null;
         for (Method declaredMethod : npc.getComposition().getClass().getDeclaredMethods()) {
-            if (declaredMethod.getReturnType() == short[].class && declaredMethod.getParameterTypes().length == 0&& declaredMethod.getName().length()==2) {
+            if (declaredMethod.getReturnType() == short[].class && declaredMethod.getParameterTypes().length == 0) {
                 getHeadIconArrayMethod = declaredMethod;
-                break;
+                if (getHeadIconArrayMethod == null) {
+                    continue;
+                }
+                getHeadIconArrayMethod.setAccessible(true);
+                short[] headIconArray = (short[]) getHeadIconArrayMethod.invoke(npc.getComposition());
+                if (headIconArray == null || headIconArray.length == 0) {
+                    continue;
+                }
+                return HeadIcon.values()[headIconArray[0]];
             }
         }
-        if (getHeadIconArrayMethod == null) {
-            return null;
-        }
-        getHeadIconArrayMethod.setAccessible(true);
-        short[] headIconArray = (short[]) getHeadIconArrayMethod.invoke(npc.getComposition());
-        if (headIconArray == null || headIconArray.length == 0) {
-            return null;
-        }
-        return HeadIcon.values()[headIconArray[0]];
+        return null;
     }
 
     @Deprecated