geforkt von Mirrors/Paper
77b05b9c8e
Upstream has released updates that appears 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: 6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE 9c1fa040 #467: Add method to remove a recipe by its key 3961d1aa Add nb-configuration.xml to .gitignore CraftBukkit Changes:d70084e5Remove unused seed in CustomChunkGenerator8a66d4c7#619: Allow delegation of certain elements to Vanilla when using a custom ChunkGeneratorc2dc19d3Craftbukkit -> CraftBukkitae45e092SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose00980376#618: Add method to remove a recipe by its key Spigot Changes: c574e08b Rebuild patches 13c24cc4 Rebuild patches
61 Zeilen
2.3 KiB
Diff
61 Zeilen
2.3 KiB
Diff
From d679f9f4ab62f832886c60b2d24f66d3674b98ba Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sun, 18 Nov 2018 19:44:54 +0000
|
|
Subject: [PATCH] Make the default permission message configurable
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 95b8f4cf3..389180290 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1571,6 +1571,15 @@ public final class Bukkit {
|
|
return server.suggestPlayerNamesWhenNullTabCompletions();
|
|
}
|
|
|
|
+ /**
|
|
+ *
|
|
+ * @return the default no permission message used on the server
|
|
+ */
|
|
+ @NotNull
|
|
+ public static String getPermissionMessage() {
|
|
+ return server.getPermissionMessage();
|
|
+ }
|
|
+
|
|
/**
|
|
* Creates a PlayerProfile for the specified uuid, with name as null
|
|
* @param uuid UUID to create profile for
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 6ad677bda..fbb21b4a3 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1374,6 +1374,13 @@ public interface Server extends PluginMessageRecipient {
|
|
*/
|
|
boolean suggestPlayerNamesWhenNullTabCompletions();
|
|
|
|
+ /**
|
|
+ *
|
|
+ * @return the default no permission message used on the server
|
|
+ */
|
|
+ @NotNull
|
|
+ String getPermissionMessage();
|
|
+
|
|
/**
|
|
* Creates a PlayerProfile for the specified uuid, with name as null
|
|
* @param uuid UUID to create profile for
|
|
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
|
|
index 03bdc1622..0b0d1bd7c 100644
|
|
--- a/src/main/java/org/bukkit/command/Command.java
|
|
+++ b/src/main/java/org/bukkit/command/Command.java
|
|
@@ -185,7 +185,7 @@ public abstract class Command {
|
|
}
|
|
|
|
if (permissionMessage == null) {
|
|
- target.sendMessage(ChatColor.RED + "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is a mistake.");
|
|
+ target.sendMessage(Bukkit.getPermissionMessage()); // Paper
|
|
} else if (permissionMessage.length() != 0) {
|
|
for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {
|
|
target.sendMessage(line);
|
|
--
|
|
2.25.0
|
|
|