From f652cb1d1c9998670115f209c567fc7a16a89b08 Mon Sep 17 00:00:00 2001
From: xGinko <rachel.audrey@mail.de>
Date: Tue, 9 Jul 2024 04:39:28 +0200
Subject: [PATCH] update onDisable method

---
 .../villageroptimizer/VillagerOptimizer.java      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java b/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
index 94cf88e..d5b6339 100644
--- a/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
+++ b/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
@@ -117,14 +117,16 @@ public final class VillagerOptimizer extends JavaPlugin {
     public void onDisable() {
         VillagerOptimizerModule.ENABLED_MODULES.forEach(VillagerOptimizerModule::disable);
         VillagerOptimizerModule.ENABLED_MODULES.clear();
-        if (scheduling != null) {
-            scheduling.cancelGlobalTasks();
-            scheduling = null;
-        }
+        VillagerOptimizerCommand.COMMANDS.forEach(VillagerOptimizerCommand::disable);
+        VillagerOptimizerCommand.COMMANDS.clear();
         if (wrapperCache != null) {
             wrapperCache.disable();
             wrapperCache = null;
         }
+        if (scheduling != null) {
+            scheduling.cancelGlobalTasks();
+            scheduling = null;
+        }
         if (audiences != null) {
             audiences.close();
             audiences = null;
@@ -133,10 +135,11 @@ public final class VillagerOptimizer extends JavaPlugin {
             bStats.shutdown();
             bStats = null;
         }
-        config = null;
+        commandRegistration = null;
         languageCacheMap = null;
-        logger = null;
         instance = null;
+        config = null;
+        logger = null;
     }
 
     public static @NotNull VillagerOptimizer getInstance()  {