mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 08:57:35 +01:00
de04cbced5
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: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches
109 lines
5.1 KiB
Diff
109 lines
5.1 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 ba2bdb4dda26370aa1ad2425cc2d9e4e05344650..b89c38ca48df446ea97217e5031d1c70dd01d8d9 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2293,6 +2293,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 c061146ac6c6bee2b865e32580e577168d61ea87..f13e254395c942082dc426615e215e3f3eb0b1c5 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -2022,4 +2022,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 b3b32ce429edbf1ed040354dbe28ab86f0d24201..1424060c0a162020d4a680e0a592224561067b16 100644
|
|
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
|
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
|
@@ -293,4 +293,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 5fa9d648bc780e874f658597f1a24715bccac5cb..3ec32b46264cfff857b50129b5e0fa5584943ec6 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, net.kyori.adventure.text.Component.text("Permissions successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
|
|
return true;
|
|
+ } else if ("commands".equalsIgnoreCase(args[0])) {
|
|
+ if (Bukkit.getServer().reloadCommandAliases()) {
|
|
+ Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Command aliases successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
|
|
+ } else {
|
|
+ Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("An error occurred while trying to reload command aliases.", net.kyori.adventure.text.format.NamedTextColor.RED));
|
|
+ }
|
|
+ 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
|
|
}
|
|
}
|