Fixed issue with detection of the correct version of SkinsRestorer wi…

…th newer versions of the plugin (#1488)
BG-Software-LLC · Dec 1, 2022 · ce62682 · ce62682
1 parent 6443994
commit ce62682
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/...insRestorer/src/main/java/com/bgsoftware/superiorskyblock/external/SkinsRestorerHook.java b/...insRestorer/src/main/java/com/bgsoftware/superiorskyblock/external/SkinsRestorerHook.java
@@ -31,18 +31,31 @@ public class SkinsRestorerHook {
 
     public static void register(SuperiorSkyblockPlugin plugin) {
         SkinsRestorerHook.plugin = plugin;
-        try {
-            Class.forName("net.skinsrestorer.bukkit.SkinsRestorer");
-            skinsRestorer = new SkinsRestorerNew();
-        } catch (Exception ex) {
-            skinsRestorer = new SkinsRestorerOld();
-        }
+
+        skinsRestorer = isNewVersionDetected() ? new SkinsRestorerNew() : new SkinsRestorerOld();
+
         if (skinsRestorer.isLocalMode()) {
             plugin.getProviders().registerSkinsListener(SkinsRestorerHook::setSkinTexture);
             plugin.getServer().getPluginManager().registerEvents(new SkinsListener(), plugin);
         }
     }
 
+    private static boolean isNewVersionDetected() {
+        try {
+            Class.forName("net.skinsrestorer.bukkit.SkinsRestorer");
+            return true;
+        } catch (Exception ignored) {
+        }
+
+        try {
+            Class.forName("net.skinsrestorer.bukkit.SkinsRestorerBukkit");
+            return true;
+        } catch (Exception ignored) {
+        }
+
+        return false;
+    }
+
     private static void setSkinTexture(SuperiorPlayer superiorPlayer) {
         if (Bukkit.isPrimaryThread()) {
             BukkitExecutor.async(() -> setSkinTexture(superiorPlayer));