2019-02-22 04:41:20 +01:00
From 04ea5b0483635c527ce9f0c79508b1f173e020c8 Mon Sep 17 00:00:00 2001
2016-03-19 21:19:00 +01:00
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:28:07 -0400
2016-03-22 02:40:29 +01:00
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
reload
2016-03-19 21:19:00 +01:00
2016-03-22 02:29:41 +01:00
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
2019-02-22 04:41:20 +01:00
index 22704949..2d588c6b 100644
2016-03-22 02:29:41 +01:00
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
2019-02-22 04:41:20 +01:00
@@ -1466,6 +1466,13 @@ public final class Bukkit {
2018-11-11 06:37:15 +01:00
public static org.bukkit.command.CommandMap getCommandMap() {
2016-03-22 02:29:41 +01:00
return server.getCommandMap();
}
+
+ /**
+ * Reload the Permissions in permissions.yml
+ */
+ public static void reloadPermissions() {
+ server.reloadPermissions();
+ }
// Paper end
public static Server.Spigot spigot()
2016-03-19 21:19:00 +01:00
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
2019-02-22 04:41:20 +01:00
index f4f4f291..18e5dd48 100644
2016-03-19 21:19:00 +01:00
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
2019-02-22 04:41:20 +01:00
@@ -1279,4 +1279,6 @@ public interface Server extends PluginMessageRecipient {
2016-03-19 21:19:00 +01:00
Spigot spigot();
2017-05-15 18:25:20 +02:00
// Spigot end
2016-03-19 21:19:00 +01: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
2019-02-22 04:41:20 +01:00
index 0ab7e295..f331a442 100644
2016-03-19 21:19:00 +01:00
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
2017-11-10 23:31:39 +01:00
@@ -13,15 +13,36 @@ public class ReloadCommand extends BukkitCommand {
2016-03-19 21:19:00 +01:00
public ReloadCommand(String name) {
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
public boolean execute(CommandSender sender, String currentAlias, String[] args) {
+
if (!testPermission(sender)) return true;
2016-03-22 02:40:29 +01:00
+ // Paper start - Reload permissions.yml & require confirm
2016-03-22 02:56:52 +01:00
+ boolean confirmed = System.getProperty("LetMeReload") != null;
2016-03-19 21:19:00 +01: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 02:40:29 +01:00
+ } else if ("confirm".equalsIgnoreCase(args[0])) {
+ confirmed = true;
2016-10-30 06:13:31 +01:00
+ } else {
+ Command.broadcastCommandMessage(sender, ChatColor.RED + "Usage: " + usageMessage);
+ return true;
2016-03-19 21:19:00 +01:00
+ }
+ }
2016-03-22 02:40:29 +01: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 21:19:00 +01: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();
2017-11-10 23:31:39 +01:00
@@ -31,7 +52,7 @@ public class ReloadCommand extends BukkitCommand {
}
2016-03-19 21:19:00 +01:00
@Override
2017-11-10 23:31:39 +01:00
- public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
- return Collections.emptyList();
+ public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
2016-03-19 21:19:00 +01: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
2019-02-22 04:41:20 +01:00
index b7627e39..5034215a 100644
2016-03-19 21:19:00 +01:00
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
2019-02-22 04:41:20 +01:00
@@ -764,4 +764,13 @@ public final class SimplePluginManager implements PluginManager {
2016-03-19 21:19:00 +01:00
public void useTimings(boolean use) {
co.aikar.timings.Timings.setTimingsEnabled(use); // Spigot
}
+
+ // Paper start
+ public void clearPermissions() {
+ permissions.clear();
+ defaultPerms.get(true).clear();
+ defaultPerms.get(false).clear();
+ }
+ // Paper end
+
}
--
2019-01-15 22:12:19 +01:00
2.20.1
2016-03-19 21:19:00 +01:00