ScriptCommand - Unregister command when a script is unloaded

Author: ShaneBeee

src/main/java/com/github/skriptdev/skript/api/skript/command/ScriptCommandBuilder.java

@@ -9,6 +9,7 @@
 import com.hypixel.hytale.component.Store;
 import com.hypixel.hytale.server.core.command.system.AbstractCommand;
 import com.hypixel.hytale.server.core.command.system.CommandContext;
+import com.hypixel.hytale.server.core.command.system.CommandRegistration;
 import com.hypixel.hytale.server.core.command.system.CommandSender;
 import com.hypixel.hytale.server.core.command.system.arguments.system.Argument;
 import com.hypixel.hytale.server.core.command.system.arguments.system.OptionalArg;
@@ -58,6 +59,7 @@ public static ScriptCommandBuilder create(int commandType, SkriptLogger logger)
     private final Map<String, CommandArg> args = new LinkedHashMap<>();
     private final Map<String, Argument<?, ?>> argsFromCommand = new LinkedHashMap<>();
     private AbstractCommand hyCommand;
+    private CommandRegistration commandRegistration;
 
     private final SectionConfiguration sec = new SectionConfiguration.Builder()
         .addOptionalLiteral("can-generate-permission", Boolean.class)
@@ -279,6 +281,12 @@ private void createLocalVariables(CommandContext ctx, TriggerContext triggerCont
         });
     }
 
+    public void unregister() {
+        if (this.commandRegistration != null) {
+            this.commandRegistration.unregister();
+        }
+    }
+
     public String getCommandName() {
         return this.commandName;
     }
@@ -291,7 +299,7 @@ public void build(ScriptCommandBuilder parent) {
         if (this.hyCommand == null) return;
 
         if (parent == null) {
-            HySk.getInstance().getCommandRegistry().registerCommand(this.hyCommand);
+            this.commandRegistration = HySk.getInstance().getCommandRegistry().registerCommand(this.hyCommand);
         } else {
             parent.hyCommand.addSubCommand(this.hyCommand);
         }

src/main/java/com/github/skriptdev/skript/plugin/elements/command/ScriptCommand.java

@@ -183,6 +183,11 @@ public boolean check(@NotNull TriggerContext ctx) {
         return ctx instanceof ScriptCommandContext sctx && sctx.getCommand().equals(this.commandBuilder.getCommandName());
     }
 
+    @Override
+    public void unload() {
+        this.commandBuilder.unregister();
+    }
+
     @Override
     public String toString(@NotNull TriggerContext ctx, boolean debug) {
         String type = switch (this.commandType) {