1cfd363d32
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: fc460d1b PR-735: Add Villager#zombify c8c8331e PR-690: Add method to read ItemStack input 62845f2f SPIGOT-6829: Add per-player world border API CraftBukkit Changes: a459f4d4 PR-1033: Add Villager#zombify d65d1430 PR-975: Add method to read ItemStack input b5559f8c SPIGOT-6990: Fix setRepairCost(0) in Anvil 6c308e1b SPIGOT-6829: Add per-player world border API Spigot Changes: 42b61526 SPIGOT-7000: Generation and /locate issues when using custom structure seeds
109 Zeilen
4.8 KiB
Diff
109 Zeilen
4.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: willies952002 <admin@domnian.com>
|
|
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 2b3ced048a48f660ca0859425583d342e7847744..012b656a43cc0cf33597b835d045f8b5f3d309dd 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2071,6 +2071,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
|
|
|
|
@NotNull
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index be5f25a51a12082cb6732445c221d61246da89e9..9c1cd95e125b1d7677daea1575a466a1b955053a 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1825,4 +1825,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
// 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 bd2c7a6964722412148fae39e1b4951fc0002b9b..864c263bbd4dd6dd7c37a74b39b1a40a884d0731 100644
|
|
--- a/src/main/java/org/bukkit/command/CommandMap.java
|
|
+++ b/src/main/java/org/bukkit/command/CommandMap.java
|
|
@@ -128,4 +128,14 @@ public interface CommandMap {
|
|
*/
|
|
@Nullable
|
|
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String cmdLine, @Nullable Location location) throws IllegalArgumentException;
|
|
+
|
|
+ // Paper start - Expose Known Commands
|
|
+ /**
|
|
+ * Return a Map of known commands
|
|
+ *
|
|
+ * @return known commands
|
|
+ */
|
|
+ @NotNull
|
|
+ public java.util.Map<String, Command> getKnownCommands();
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
|
index adfc7aae2c0f49bbcdd358e83b04a0cf078a7d52..460fda05a62b12db2edcfb7ea8b2a5dd8e4b110d 100644
|
|
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
|
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
|
@@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap {
|
|
}
|
|
}
|
|
}
|
|
+
|
|
+ // Paper start - Expose Known Commands
|
|
+ @NotNull
|
|
+ public Map<String, Command> 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 c62da4131b17e66892678e8b618fb9ba3de93b56..0c7ba0718de2b93d013968ca0fec34ffd423990f 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(@NotNull 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"));
|
|
}
|
|
@@ -29,6 +29,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 {
|
|
@@ -53,6 +60,6 @@ public class ReloadCommand extends BukkitCommand {
|
|
@NotNull
|
|
@Override
|
|
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
|
|
- return java.util.Collections.singletonList("permissions"); // Paper
|
|
+ return com.google.common.collect.Lists.newArrayList("permissions", "commands"); // Paper
|
|
}
|
|
}
|