From a62ebf16e3b246d558f103f641ae540bdac4b17d Mon Sep 17 00:00:00 2001
From: Thatsmusic99 <25277367+thatsmusic99@users.noreply.github.com>
Date: Tue, 25 Jul 2023 10:26:57 +0100
Subject: [PATCH] chore: add debugging for command registration

Signed-off-by: Thatsmusic99 <25277367+thatsmusic99@users.noreply.github.com>
---
 .../advancedteleport/managers/CommandManager.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
index 4e6c505f..2c565c1e 100644
--- a/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
@@ -86,13 +86,12 @@ public static void registerCommands() {
 
     private static void register(String name, ATCommand atCommand) {
         PluginCommand command = Bukkit.getPluginCommand("advancedteleport:" + name);
+        CoreClass.debug("Fetching " + command + " - " + command);
         if (command == null) command = atCommands.get(name);
-        if (command == null) return;
-
-        if (command.getPlugin() != CoreClass.getInstance()) {
-            command = Bukkit.getPluginCommand("advancedteleport:" + name);
+        if (command == null) {
+            CoreClass.getInstance().getLogger().warning("Could not add command " + name + " - has it been set up properly?");
+            return;
         }
-        if (command == null) return;
 
         atCommands.put(name, command);
         CommandMap map = getMap();
@@ -108,6 +107,7 @@ private static void register(String name, ATCommand atCommand) {
             if (MainConfig.get().DISABLED_COMMANDS.get().contains(alias)
                     || removed
                     || !atCommand.getRequiredFeature()) {
+                CoreClass.debug(alias + " has been marked for removal.");
                 if (command.isRegistered()) {
                     removed = true;
                     command.unregister(map);
@@ -120,6 +120,8 @@ private static void register(String name, ATCommand atCommand) {
                 commands.remove(alias);
                 commands.remove("advancedteleport:" + alias);
 
+                CoreClass.debug("Removed " + alias + ".");
+
                 // Let another plugin take over
                 Bukkit.getScheduler()
                         .runTaskLater(
@@ -135,6 +137,7 @@ private static void register(String name, ATCommand atCommand) {
                                         if (parts.length < 2) continue;
                                         if (parts[1].equals(alias)) {
                                             if (parts[0].equals("advancedteleport")) continue;
+                                            CoreClass.debug("Letting " + parts[0] + "'s " + alias + " take over...");
                                             pendingChanges.put(alias, commands.get(otherCmd));
                                             break;
                                         }
@@ -163,6 +166,8 @@ private static void register(String name, ATCommand atCommand) {
             command.setTabCompleter(atCommand);
         }
 
+        CoreClass.debug(aliases + " has " + (command.isRegistered() ? "" : "not ") + "been registed successfully.");
+
         registeredCommands.put(name, command);
     }