2020-05-01 22:03:47 +00:00
From 4397b5e0ac84c2dca83409fb9f989bdc4827d687 Mon Sep 17 00:00:00 2001
2016-03-19 20:19:00 +00:00
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400
2016-03-22 01:40:29 +00:00
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
reload
2016-03-19 20:19:00 +00:00
2016-03-22 01:29:41 +00:00
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
2020-04-02 21:07:06 +00:00
index 39423f3a6..423fecf54 100644
2016-03-22 01:29:41 +00:00
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
2020-03-10 11:01:15 +00:00
@@ -1574,6 +1574,13 @@ public final class Bukkit {
2018-11-11 05:37:15 +00:00
public static org.bukkit.command.CommandMap getCommandMap() {
2016-03-22 01:29:41 +00:00
return server.getCommandMap();
}
+
+ /**
+ * Reload the Permissions in permissions.yml
+ */
+ public static void reloadPermissions() {
+ server.reloadPermissions();
+ }
// Paper end
2019-03-20 00:28:15 +00:00
@NotNull
2016-03-19 20:19:00 +00:00
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
2020-04-02 21:07:06 +00:00
index b09d01085..38d7da737 100644
2016-03-19 20:19:00 +00:00
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
2020-03-10 11:01:15 +00:00
@@ -1388,4 +1388,6 @@ public interface Server extends PluginMessageRecipient {
2019-03-20 00:28:15 +00:00
@NotNull
2016-03-19 20:19:00 +00:00
Spigot spigot();
2017-05-15 16:25:20 +00:00
// Spigot end
2016-03-19 20:19:00 +00:00
+
+ 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
2020-04-02 21:07:06 +00:00
index 50cc311be..c62da4131 100644
2016-03-19 20:19:00 +00:00
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
2019-04-23 04:47:07 +00:00
@@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
2019-03-20 00:28:15 +00:00
public ReloadCommand(@NotNull String name) {
2016-03-19 20:19:00 +00:00
super(name);
this.description = "Reloads the server configuration and plugins";
- this.usageMessage = "/reload";
+ this.usageMessage = "/reload [permissions]"; // Paper
this.setPermission("bukkit.command.reload");
this.setAliases(Arrays.asList("rl"));
}
@Override
2019-03-20 00:28:15 +00:00
- public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) {
+ public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) { // Paper
2016-03-19 20:19:00 +00:00
if (!testPermission(sender)) return true;
2016-03-22 01:40:29 +00:00
+ // Paper start - Reload permissions.yml & require confirm
2016-03-22 01:56:52 +00:00
+ boolean confirmed = System.getProperty("LetMeReload") != null;
2016-03-19 20:19:00 +00:00
+ if (args.length == 1) {
+ if (args[0].equalsIgnoreCase("permissions")) {
+ Bukkit.getServer().reloadPermissions();
+ Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded.");
+ return true;
2016-03-22 01:40:29 +00:00
+ } else if ("confirm".equalsIgnoreCase(args[0])) {
+ confirmed = true;
2016-10-30 05:13:31 +00:00
+ } else {
+ Command.broadcastCommandMessage(sender, ChatColor.RED + "Usage: " + usageMessage);
+ return true;
2016-03-19 20:19:00 +00:00
+ }
+ }
2016-03-22 01:40:29 +00:00
+ if (!confirmed) {
+ Command.broadcastCommandMessage(sender, ChatColor.RED + "Are you sure you wish to reload your server? Doing so may cause bugs and memory leaks. It is recommended to restart instead of using /reload. To confirm, please type " + ChatColor.YELLOW + "/reload confirm");
+ return true;
+ }
2016-03-19 20:19:00 +00:00
+ // Paper end
+
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();
2019-04-23 04:47:07 +00:00
@@ -33,6 +53,6 @@ public class ReloadCommand extends BukkitCommand {
2019-03-20 00:28:15 +00:00
@NotNull
2016-03-19 20:19:00 +00:00
@Override
2019-03-20 00:28:15 +00:00
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
2017-11-10 22:31:39 +00:00
- return Collections.emptyList();
2016-03-19 20:19:00 +00:00
+ return java.util.Collections.singletonList("permissions"); // Paper
}
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
2020-04-02 21:07:06 +00:00
index 9a5fe8ca4..8ddaf9c2e 100644
2016-03-19 20:19:00 +00:00
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
2020-03-26 02:37:20 +00:00
@@ -894,4 +894,13 @@ public final class SimplePluginManager implements PluginManager {
2016-03-19 20:19:00 +00:00
public void useTimings(boolean use) {
2019-03-20 00:28:15 +00:00
co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
2016-03-19 20:19:00 +00:00
}
+
+ // Paper start
+ public void clearPermissions() {
+ permissions.clear();
+ defaultPerms.get(true).clear();
+ defaultPerms.get(false).clear();
+ }
+ // Paper end
+
}
--
2020-05-01 22:03:47 +00:00
2.26.2
2016-03-19 20:19:00 +00:00