Phase 534 update

IdealisticAI · Apr 16, 2024 · a0efe1e · a0efe1e
1 parent bb7c252
commit a0efe1e
Show file tree

Hide file tree

Showing 176 changed files with 5,977 additions and 9,312 deletions.
diff --git a/src/main/java/com/vagdedes/spartan/Register.java b/src/main/java/com/vagdedes/spartan/Register.java
@@ -25,14 +25,12 @@
 public class Register extends JavaPlugin {
 
     public static Plugin plugin = null;
-    private static boolean enabled = false;
 
     public static final PluginManager manager = Bukkit.getPluginManager();
     private static final Set<Class<?>> listeners = new LinkedHashSet<>(40);
 
     public void onEnable() {
         plugin = this;
-        enabled = true;
         enable(new Piracy(), Piracy.class);
 
         /*PluginDescriptionFile description = plugin.getDescription();
@@ -76,7 +74,6 @@ public void onEnable() {
         enable(new EventsHandler7(), EventsHandler7.class);
         enable(new EventsHandler8(), EventsHandler8.class);
         enable(new EventsHandler9(), EventsHandler9.class);
-        enable(new EventsHandler10(), EventsHandler10.class);
 
         if (!MultiVersion.folia) {
             enable(new EventsHandler_non_folia(), EventsHandler_non_folia.class);
@@ -101,7 +98,6 @@ public void onEnable() {
 
     public void onDisable() {
         // Always First
-        enabled = false;
         plugin.setNaggable(false);
 
         // Separator
@@ -120,19 +116,17 @@ public static void enable(Listener l, Class<?> c) {
     }
 
     public static void disablePlugin() {
-        enabled = false;
-
-        if (plugin != null && plugin.isEnabled()) {
+        if (isPluginEnabled()) {
             manager.disablePlugin(plugin);
         }
     }
 
-    public static boolean isPluginEnabled() {
-        return isPluginLoaded() && plugin.isEnabled();
+    public static boolean isPluginLoaded() {
+        return plugin != null;
     }
 
-    public static boolean isPluginLoaded() {
-        return enabled && plugin != null;
+    public static boolean isPluginEnabled() {
+        return isPluginLoaded() && plugin.isEnabled();
     }
 
     public static Class<?>[] getListeners() {