mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
74f507f4e3
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: e461dcfe #555: Item - add getters/setters for owner/thrower CraftBukkit Changes: 055870c4 #758: Item - add getters/setters for owner/thrower
57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 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 97ed7d9f6415219db4d6b0054dc3d2afeb1ce6e5..c6834080859051bdd0f33f2c9e9a8e48d7dbd31b 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1658,6 +1658,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 da9c85372605ab0d68f21bb38885eb0f4dfebded..47e6a3f2bd41a9a01ec74e4c3f4919098ba88614 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1451,6 +1451,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 7c80dc54776d0d66f7816b77136f6dbd9b801704..c10fc8d2386301bc2caddcdb1cd18566bcaa8689 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);
|