Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-25 15:50:06 +01:00
105 Zeilen
4.9 KiB
Diff
105 Zeilen
4.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: William <admin@domnian.com>
|
||
|
Date: Fri, 18 Mar 2016 03:28:07 -0400
|
||
|
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
|
||
|
reload
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||
|
index 8646fc0987a8833996c5d977c36fe0d01bf72992..72375883b07ede041a7ea5f7b6785f71aef702c0 100644
|
||
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
||
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||
|
@@ -1752,6 +1752,13 @@ public final class Bukkit {
|
||
|
public static org.bukkit.command.CommandMap getCommandMap() {
|
||
|
return server.getCommandMap();
|
||
|
}
|
||
|
+
|
||
|
+ /**
|
||
|
+ * Reload the Permissions in permissions.yml
|
||
|
+ */
|
||
|
+ public static void reloadPermissions() {
|
||
|
+ server.reloadPermissions();
|
||
|
+ }
|
||
|
// Paper end
|
||
|
|
||
|
@NotNull
|
||
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||
|
index 599347ef656acad9a40be15fc5030e5d0f1630df..a2940eafa61814aae7f766262309495e991533d6 100644
|
||
|
--- a/src/main/java/org/bukkit/Server.java
|
||
|
+++ b/src/main/java/org/bukkit/Server.java
|
||
|
@@ -1549,4 +1549,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||
|
@NotNull
|
||
|
Spigot spigot();
|
||
|
// Spigot end
|
||
|
+
|
||
|
+ 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 50cc311be7904cc8fc6070a21c8e4de3a489fd20..c62da4131b17e66892678e8b618fb9ba3de93b56 100644
|
||
|
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||
|
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||
|
@@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
|
||
|
public ReloadCommand(@NotNull 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(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) {
|
||
|
+ public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) { // Paper
|
||
|
if (!testPermission(sender)) return true;
|
||
|
|
||
|
+ // Paper start - Reload permissions.yml & require confirm
|
||
|
+ boolean confirmed = System.getProperty("LetMeReload") != null;
|
||
|
+ if (args.length == 1) {
|
||
|
+ if (args[0].equalsIgnoreCase("permissions")) {
|
||
|
+ Bukkit.getServer().reloadPermissions();
|
||
|
+ Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded.");
|
||
|
+ return true;
|
||
|
+ } else if ("confirm".equalsIgnoreCase(args[0])) {
|
||
|
+ confirmed = true;
|
||
|
+ } else {
|
||
|
+ Command.broadcastCommandMessage(sender, ChatColor.RED + "Usage: " + usageMessage);
|
||
|
+ return true;
|
||
|
+ }
|
||
|
+ }
|
||
|
+ 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;
|
||
|
+ }
|
||
|
+ // 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();
|
||
|
@@ -33,6 +53,6 @@ public class ReloadCommand extends BukkitCommand {
|
||
|
@NotNull
|
||
|
@Override
|
||
|
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
|
||
|
- return Collections.emptyList();
|
||
|
+ 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
|
||
|
index c2c49ee9b5531bc4761d2da54cd707c57fc647bf..2d27dfb859c312d46a14d0356c7c3f227e965a67 100644
|
||
|
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||
|
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||
|
@@ -895,4 +895,13 @@ public final class SimplePluginManager implements PluginManager {
|
||
|
public void useTimings(boolean use) {
|
||
|
co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
|
||
|
}
|
||
|
+
|
||
|
+ // Paper start
|
||
|
+ public void clearPermissions() {
|
||
|
+ permissions.clear();
|
||
|
+ defaultPerms.get(true).clear();
|
||
|
+ defaultPerms.get(false).clear();
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
+
|
||
|
}
|