From f643969a027f9886c578f9702b3d919bf573e93c Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:16:39 -0500 Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java index 39ff2f9e..b4a7835a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1426,6 +1426,15 @@ public final class Bukkit { public static void reloadPermissions() { server.reloadPermissions(); } + + /** + * Reload the Command Aliases in commands.yml + * + * @return Whether the reload was successful + */ + public static boolean reloadCommandAliases() { + return server.reloadCommandAliases(); + } // Paper end public static Server.Spigot spigot() diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java index 80ef1270..1a0a30ee 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1238,4 +1238,6 @@ public interface Server extends PluginMessageRecipient { // Spigot end void reloadPermissions(); // Paper + + boolean reloadCommandAliases(); // Paper } diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java index 30d60247..938959aa 100644 --- a/src/main/java/org/bukkit/command/CommandMap.java +++ b/src/main/java/org/bukkit/command/CommandMap.java @@ -123,4 +123,13 @@ public interface CommandMap { * @throws IllegalArgumentException if either sender or cmdLine are null */ public List tabComplete(CommandSender sender, String cmdLine, Location location) throws IllegalArgumentException; + + // Paper start - Expose Known Commands + /** + * Return a Map of known commands + * + * @return known commands + */ + public java.util.Map getKnownCommands(); + // Paper end } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java index 65ad78c4..41e95692 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -279,4 +279,10 @@ public class SimpleCommandMap implements CommandMap { } } } + + // Paper start - Expose Known Commands + public Map getKnownCommands() { + return knownCommands; + } + // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java index f331a442..a977045d 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand { public ReloadCommand(String name) { super(name); this.description = "Reloads the server configuration and plugins"; - this.usageMessage = "/reload [permissions]"; // Paper + this.usageMessage = "/reload [permissions|commands|confirm]"; // Paper this.setPermission("bukkit.command.reload"); this.setAliases(Arrays.asList("rl")); } @@ -30,6 +30,13 @@ public class ReloadCommand extends BukkitCommand { Bukkit.getServer().reloadPermissions(); Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded."); return true; + } else if ("commands".equalsIgnoreCase(args[0])) { + if (Bukkit.getServer().reloadCommandAliases()) { + Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Command aliases successfully reloaded."); + } else { + Command.broadcastCommandMessage(sender, ChatColor.RED + "An error occurred while trying to reload command aliases."); + } + return true; } else if ("confirm".equalsIgnoreCase(args[0])) { confirmed = true; } else { -- 2.19.1