aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZach Brown <[email protected]>2016-10-30 00:13:31 -0500
committerZach Brown <[email protected]>2016-10-30 00:14:17 -0500
commitecefa796760b650bccbaea4851be02af791c35a6 (patch)
tree57e59f60818e69dd2b967b5ddd3ddcef82399419
parent0860727dae4c3583f5e518038922f808946091fc (diff)
downloadPaper-ecefa796760b650bccbaea4851be02af791c35a6.tar.gz
Paper-ecefa796760b650bccbaea4851be02af791c35a6.zip
Add usage message to ReloadCommand
Used when the wrong arguments are supplied, missed when we added the permissions reload functionality.
-rw-r--r--Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch13
1 files changed, 8 insertions, 5 deletions
diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
index 659982ed35..e8a92b0cdd 100644
--- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From b9193c99b34c7ce136f4c8edee9672346e79617f Mon Sep 17 00:00:00 2001
+From f0041900182f286ab91e23bd1c3dac326d165510 Mon Sep 17 00:00:00 2001
From: William <[email protected]>
Date: Fri, 18 Mar 2016 03:28:07 -0400
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -35,10 +35,10 @@ index 309fa3f..b527372 100644
+ void reloadPermissions(); // Paper
}
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index c70d512..ee29ebb 100644
+index c70d512..040509c 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-@@ -11,15 +11,33 @@ public class ReloadCommand extends BukkitCommand {
+@@ -11,15 +11,36 @@ public class ReloadCommand extends BukkitCommand {
public ReloadCommand(String name) {
super(name);
this.description = "Reloads the server configuration and plugins";
@@ -62,6 +62,9 @@ index c70d512..ee29ebb 100644
+ return true;
+ } else if ("confirm".equalsIgnoreCase(args[0])) {
+ confirmed = true;
++ } else {
++ Command.broadcastCommandMessage(sender, ChatColor.RED + "Usage: " + usageMessage);
++ return true;
+ }
+ }
+ if (!confirmed) {
@@ -73,7 +76,7 @@ index c70d512..ee29ebb 100644
Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues when using some plugins.");
Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
Bukkit.reload();
-@@ -32,7 +50,8 @@ public class ReloadCommand extends BukkitCommand {
+@@ -32,7 +53,8 @@ public class ReloadCommand extends BukkitCommand {
@Override
public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException
{
@@ -102,5 +105,5 @@ index 1302773..9ce0a5d 100644
+
}
--
-2.9.2.windows.1
+2.10.1.windows.1