Skip to content

Clean up ScriptCommand #8099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev/feature
Choose a base branch
from
Open

Clean up ScriptCommand #8099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/main/java/ch/njol/skript/command/Commands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ public static boolean scriptCommandExists(String command) {

public static void registerCommand(ScriptCommand command) {
// Validate that there are no duplicates
ScriptCommand existingCommand = commands.get(command.getLabel());
if (existingCommand != null && existingCommand.getLabel().equals(command.getLabel())) {
ScriptCommand existingCommand = commands.get(command.getName());
if (existingCommand != null && existingCommand.getName().equals(command.getName())) {
Script script = existingCommand.getScript();
Skript.error("A command with the name /" + existingCommand.getName() + " is already defined"
+ (script != null ? (" in " + script.getConfig().getFileName()) : "")
Expand All @@ -244,11 +244,10 @@ public static void registerCommand(ScriptCommand command) {
assert cmKnownCommands != null;// && cmAliases != null;
command.register(commandMap, cmKnownCommands, cmAliases);
}
commands.put(command.getLabel(), command);
for (String alias : command.getActiveAliases()) {
commands.put(command.getName(), command);
for (String alias : command.getAliases()) {
commands.put(alias.toLowerCase(Locale.ENGLISH), command);
}
command.registerHelp();
}

@Deprecated(since = "2.7.0", forRemoval = true)
Expand All @@ -264,7 +263,6 @@ public static int unregisterCommands(File script) {
}

public static void unregisterCommand(ScriptCommand scriptCommand) {
scriptCommand.unregisterHelp();
if (commandMap != null) {
assert cmKnownCommands != null;// && cmAliases != null;
scriptCommand.unregister(commandMap, cmKnownCommands, cmAliases);
Expand Down
Loading
Loading