Updated thirdparty-check

Th3Shadowbroker · Jun 2, 2020 · 132eb30 · 132eb30
1 parent 61d4d25
commit 132eb30
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/src/main/java/dev/th3shadowbroker/ouroboros/mines/OuroborosMines.java b/src/main/java/dev/th3shadowbroker/ouroboros/mines/OuroborosMines.java
@@ -198,13 +198,15 @@ private void updateConfig() {
     }
 
     private void checkForSupportedPlugins() {
-        if (QuestsSupport.isAvailable()) {
+        boolean questsInstalled = getServer().getPluginManager().isPluginEnabled(QuestsSupport.PLUGIN_NAME);
+        if (questsInstalled) {
             getLogger().info("Quests support is enabled!");
             new QuestsSupport();
         }
 
-        if (JobsRebornSupport.isAvailable()) {
-            getLogger().info("JobsReborn support is enabled!");
+        boolean jobsRebornInstalled = getServer().getPluginManager().isPluginEnabled(JobsRebornSupport.PLUGIN_NAME);
+        if (jobsRebornInstalled) {
+            getLogger().info("Jobs support is enabled!");
             new JobsRebornSupport();
         }
     }

diff --git a/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/JobsRebornSupport.java b/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/JobsRebornSupport.java
@@ -32,7 +32,7 @@
 
 public class JobsRebornSupport implements Listener {
 
-    private static final String PLUGIN_NAME = "Jobs";
+    public static final String PLUGIN_NAME = "Jobs";
 
     public JobsRebornSupport() {
         Bukkit.getPluginManager().registerEvents(this, OuroborosMines.INSTANCE);
@@ -47,8 +47,4 @@ public void onMaterialMined(MaterialMinedEvent event) {
         addProgress(event.getPlayer(), event.getBlock());
     }
 
-    public static boolean isAvailable() {
-        return Bukkit.getPluginManager().isPluginEnabled(PLUGIN_NAME);
-    }
-
 }
diff --git a/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/QuestsSupport.java b/src/main/java/dev/th3shadowbroker/ouroboros/mines/thirdparty/QuestsSupport.java
@@ -32,7 +32,7 @@
 
 public class QuestsSupport implements Listener {
 
-    private static final String PLUGIN_NAME = "Quests";
+    public static final String PLUGIN_NAME = "Quests";
 
     public QuestsSupport() {
         Bukkit.getPluginManager().registerEvents(this, OuroborosMines.INSTANCE);
@@ -60,10 +60,6 @@ private void addProgress(Player player, Material material) {
         }
     }
 
-    public static boolean isAvailable() {
-        return Bukkit.getServer().getPluginManager().isPluginEnabled(PLUGIN_NAME);
-    }
-
     @EventHandler
     public void onMaterialMined(MaterialMinedEvent event) {
         addProgress(event.getPlayer(), event.getMaterial().getMaterial());