Updated PluginChecker

Made more consistent with other listeners
Sentropic · Dec 20, 2020 · e9c5dd0 · e9c5dd0
1 parent c63fdb5
commit e9c5dd0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/com/sucy/skill/SkillAPI.java b/src/main/java/com/sucy/skill/SkillAPI.java
@@ -167,7 +167,8 @@ public void onEnable() {
         listen(new DeathListener(), !VersionManager.isVersionAtLeast(11000));
         listen(new LingeringPotionListener(), VersionManager.isVersionAtLeast(VersionManager.V1_9_0));
         listen(new ExperienceListener(), settings.yieldsEnabled());
-        new PluginChecker(this);
+        listen(new PluginChecker(), true);
+
 
         // Set up tasks
         if (settings.isManaEnabled()) {

diff --git a/src/main/java/com/sucy/skill/hook/PluginChecker.java b/src/main/java/com/sucy/skill/hook/PluginChecker.java
@@ -26,10 +26,9 @@
  */
 package com.sucy.skill.hook;
 
-import com.sucy.skill.SkillAPI;
+import com.sucy.skill.listener.SkillAPIListener;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.plugin.PluginManager;
@@ -38,9 +37,7 @@
  * Handler for checking whether or not hooked plugins are present
  * and active before using related code.
  */
-public class PluginChecker implements Listener {
-    private static PluginChecker singleton;
-
+public class PluginChecker extends SkillAPIListener {
     private static boolean vault;
     private static boolean libsDisguises;
     private static boolean noCheatPlus;
@@ -51,11 +48,9 @@ public class PluginChecker implements Listener {
     private static boolean worldGuard;
     private static boolean parties;
 
-    public PluginChecker(SkillAPI plugin) {
-        if (singleton != null) return;
-        singleton = this;
+    @Override
+    public void init() {
         PluginManager pluginManager = Bukkit.getPluginManager();
-        pluginManager.registerEvents(this, plugin);
 
         vault = pluginManager.isPluginEnabled("Vault") && VaultHook.isValid();
         libsDisguises = pluginManager.isPluginEnabled("LibsDisguises");