From a221d8646a9aebc1bb917b607825b53a1359236a Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Tue, 19 May 2026 12:36:49 -0400
Subject: [PATCH] API

---
 .../main/java/dev/plex/module/PlexModule.java   | 17 +++++++++++++++++
 .../dev/plex/api/impl/DefaultCommandApi.java    |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/dev/plex/module/PlexModule.java b/api/src/main/java/dev/plex/module/PlexModule.java
index 803c862..c8f2e66 100644
--- a/api/src/main/java/dev/plex/module/PlexModule.java
+++ b/api/src/main/java/dev/plex/module/PlexModule.java
@@ -55,22 +55,39 @@ public abstract class PlexModule
     public void registerListener(Listener listener)
     {
         listeners.add(listener);
+        if (api != null)
+        {
+            api.listeners().register(listener);
+        }
     }
 
     public void unregisterListener(Listener listener)
     {
         listeners.remove(listener);
+        if (api != null)
+        {
+            api.listeners().unregister(listener);
+            return;
+        }
         HandlerList.unregisterAll(listener);
     }
 
     public void registerCommand(Command command)
     {
         commands.add(command);
+        if (api != null)
+        {
+            api.commands().register(command);
+        }
     }
 
     public void unregisterCommand(Command command)
     {
         commands.remove(command);
+        if (api != null)
+        {
+            api.commands().unregister(command);
+        }
     }
 
     @Nullable
diff --git a/server/src/main/java/dev/plex/api/impl/DefaultCommandApi.java b/server/src/main/java/dev/plex/api/impl/DefaultCommandApi.java
index bb665b7..6b19772 100644
--- a/server/src/main/java/dev/plex/api/impl/DefaultCommandApi.java
+++ b/server/src/main/java/dev/plex/api/impl/DefaultCommandApi.java
@@ -21,8 +21,8 @@ final class DefaultCommandApi implements CommandApi
     @Override
     public void unregister(Command command)
     {
-        plugin.getServer().getCommandMap().getKnownCommands().remove(command.getName());
-        command.getAliases().forEach(alias -> plugin.getServer().getCommandMap().getKnownCommands().remove(alias));
+        plugin.getServer().getCommandMap().getKnownCommands().remove(command.getName().toLowerCase());
+        command.getAliases().forEach(alias -> plugin.getServer().getCommandMap().getKnownCommands().remove(alias.toLowerCase()));
         command.unregister(plugin.getServer().getCommandMap());
     }
 }