mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 08:57:35 +01:00
85 lines
3.5 KiB
Diff
85 lines
3.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 653fe32bd134945e1cb1cf40f2623ffffdf5d762..f4e1ea578bae0d1dc8badfcbf83ca4550a41867b 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2132,6 +2132,28 @@ public final class Bukkit {
|
|
return server.suggestPlayerNamesWhenNullTabCompletions();
|
|
}
|
|
|
|
+ /**
|
|
+ * Gets the default no permission message used on the server
|
|
+ *
|
|
+ * @return the default message
|
|
+ * @deprecated use {@link #permissionMessage()}
|
|
+ */
|
|
+ @NotNull
|
|
+ @Deprecated
|
|
+ public static String getPermissionMessage() {
|
|
+ return server.getPermissionMessage();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the default no permission message used on the server
|
|
+ *
|
|
+ * @return the default message
|
|
+ */
|
|
+ @NotNull
|
|
+ public static net.kyori.adventure.text.Component permissionMessage() {
|
|
+ return server.permissionMessage();
|
|
+ }
|
|
+
|
|
/**
|
|
* Creates a PlayerProfile for the specified uuid, with name as null.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 2042f4963c53d5a903f0de1fec6a9af3a7b2bba4..475fe51ff7a9f1c1ed5048ea59d6d8ba73f2903c 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1854,6 +1854,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*/
|
|
boolean suggestPlayerNamesWhenNullTabCompletions();
|
|
|
|
+ /**
|
|
+ * Gets the default no permission message used on the server
|
|
+ *
|
|
+ * @return the default message
|
|
+ * @deprecated use {@link #permissionMessage()}
|
|
+ */
|
|
+ @NotNull
|
|
+ @Deprecated
|
|
+ String getPermissionMessage();
|
|
+
|
|
+ /**
|
|
+ * Gets the default no permission message used on the server
|
|
+ *
|
|
+ * @return the default message
|
|
+ */
|
|
+ @NotNull net.kyori.adventure.text.Component permissionMessage();
|
|
+
|
|
/**
|
|
* Creates a PlayerProfile for the specified uuid, with name as null.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
|
|
index a26df5f6341d22ecd5e71da59b8f091848e627ad..608b541aef01f33891a492fff5b8400496832c3a 100644
|
|
--- a/src/main/java/org/bukkit/command/Command.java
|
|
+++ b/src/main/java/org/bukkit/command/Command.java
|
|
@@ -184,10 +184,9 @@ public abstract class Command {
|
|
return true;
|
|
}
|
|
|
|
- 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.");
|
|
// Paper start - use components for permissionMessage
|
|
- } else if (!permissionMessage.equals(net.kyori.adventure.text.Component.empty())) {
|
|
+ net.kyori.adventure.text.Component permissionMessage = this.permissionMessage != null ? this.permissionMessage : Bukkit.permissionMessage();
|
|
+ if (!permissionMessage.equals(net.kyori.adventure.text.Component.empty())) {
|
|
target.sendMessage(permissionMessage.replaceText(net.kyori.adventure.text.TextReplacementConfig.builder().matchLiteral("<permission>").replacement(permission).build()));
|
|
// Paper end
|
|
}
|