Fix API (#552)

SkinsRestorer · Jun 21, 2021 · 07c2ff3 · 07c2ff3
1 parent d810b0f
commit 07c2ff3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 42 deletions.
diff --git a/src/main/java/net/skinsrestorer/bukkit/SkinApplierBukkit.java b/src/main/java/net/skinsrestorer/bukkit/SkinApplierBukkit.java
@@ -36,7 +36,6 @@
 
 import java.io.File;
 import java.util.function.Consumer;
-import java.util.logging.Level;
 
 @RequiredArgsConstructor
 public class SkinApplierBukkit {
@@ -84,29 +83,31 @@ private Consumer<Player> detectRefresh(SkinsRestorer plugin) {
      * @param property Property Object
      */
     protected void applySkin(Player player, IProperty property) {
-        SkinApplyBukkitEvent applyEvent = new SkinApplyBukkitEvent(player, property);
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            SkinApplyBukkitEvent applyEvent = new SkinApplyBukkitEvent(player, property);
 
-        Bukkit.getPluginManager().callEvent(applyEvent);
+            Bukkit.getPluginManager().callEvent(applyEvent);
 
-        if (applyEvent.isCancelled())
-            return;
-
-        // delay 1 server tick so we override online-mode
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
-            try {
-                if (property == null)
-                    return;
-
-                Object ep = ReflectionUtil.invokeMethod(player.getClass(), player, "getHandle");
-                Object profile = ReflectionUtil.invokeMethod(ep.getClass(), ep, "getProfile");
-                Object propMap = ReflectionUtil.invokeMethod(profile.getClass(), profile, "getProperties");
-                ReflectionUtil.invokeMethod(propMap, "clear");
-                ReflectionUtil.invokeMethod(propMap.getClass(), propMap, "put", new Class[]{Object.class, Object.class}, "textures", property);
+            if (applyEvent.isCancelled())
+                return;
 
-                Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> updateSkin(player));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            // delay 1 server tick so we override online-mode
+            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
+                try {
+                    if (property == null)
+                        return;
+
+                    Object ep = ReflectionUtil.invokeMethod(player.getClass(), player, "getHandle");
+                    Object profile = ReflectionUtil.invokeMethod(ep.getClass(), ep, "getProfile");
+                    Object propMap = ReflectionUtil.invokeMethod(profile.getClass(), profile, "getProperties");
+                    ReflectionUtil.invokeMethod(propMap, "clear");
+                    ReflectionUtil.invokeMethod(propMap.getClass(), propMap, "put", new Class[]{Object.class, Object.class}, "textures", property);
+
+                    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> updateSkin(player));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            });
         });
     }
 

diff --git a/src/main/java/net/skinsrestorer/shared/utils/ReflectionUtil.java b/src/main/java/net/skinsrestorer/shared/utils/ReflectionUtil.java
@@ -153,19 +153,6 @@ private static Method getMethod(Class<?> clazz, String mname, Class<?>... args)
         return m;
     }
 
-    private static Constructor<?> findConstructor(Class clazz, Predicate<Constructor<?>> assertion) throws ReflectionException {
-        for (Constructor<?> cstr : clazz.getDeclaredConstructors()) {
-            try {
-                if (assertion.test(cstr)) {
-                    return cstr;
-                }
-            } catch (Exception ignored) {
-            }
-        }
-
-        throw new ReflectionException(String.format("Constructor for class \"%s\" not found.", clazz.getName()));
-    }
-
     public static Class<?> getNMSClass(String clazz, String fullClassName) throws ReflectionException {
         try {
             return forNameWithFallback(clazz, fullClassName);
@@ -214,14 +201,6 @@ private static Object getFieldByType(Object obj, Class<?> superClass, String typ
         }
     }
 
-    public static Object invokeConstructor(Class<?> clazz, Predicate<Constructor<?>> assertion, Object... initargs) throws ReflectionException {
-        try {
-            return findConstructor(clazz, assertion).newInstance(initargs);
-        } catch (Exception e) {
-            throw new ReflectionException(e);
-        }
-    }
-
     public static Object invokeConstructor(Class<?> clazz, Class<?>[] args, Object... initargs) throws ReflectionException {
         try {
             return getConstructor(clazz, args).newInstance(initargs);