PaperMC/patches/api/0161-Make-the-default-permission-message-configurable.patch

85 lines
3.5 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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
2024-04-23 19:02:08 +02:00
index d60780a26e10f5f9c80446693552384281327b51..f248515862c3bc418b42b8e197feb43addfd122d 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
2024-04-23 19:02:08 +02:00
@@ -2397,6 +2397,28 @@ public final class Bukkit {
2021-06-11 14:02:28 +02:00
return server.suggestPlayerNamesWhenNullTabCompletions();
}
+ /**
2022-06-10 01:19:38 +02:00
+ * Gets the default no permission message used on the server
2021-06-11 14:02:28 +02:00
+ *
2022-06-10 01:19:38 +02:00
+ * @return the default message
+ * @deprecated use {@link #permissionMessage()}
2021-06-11 14:02:28 +02:00
+ */
+ @NotNull
2022-06-10 01:19:38 +02:00
+ @Deprecated
2021-06-11 14:02:28 +02:00
+ public static String getPermissionMessage() {
+ return server.getPermissionMessage();
+ }
2022-06-10 01:19:38 +02:00
+
+ /**
+ * 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();
+ }
2021-06-11 14:02:28 +02:00
+
/**
* Creates a PlayerProfile for the specified uuid, with name as null.
*
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
2024-04-23 19:02:08 +02:00
index 19e6cee94caabfe93c841da783c86a3c283ebcb9..69f236d965c631510b008a7eb38aa1b62a4e196a 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
2024-04-23 19:02:08 +02:00
@@ -2086,6 +2086,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
2021-06-11 14:02:28 +02:00
*/
boolean suggestPlayerNamesWhenNullTabCompletions();
+ /**
2022-06-09 23:11:43 +02:00
+ * Gets the default no permission message used on the server
2021-06-11 14:02:28 +02:00
+ *
2022-06-09 23:11:43 +02:00
+ * @return the default message
+ * @deprecated use {@link #permissionMessage()}
2021-06-11 14:02:28 +02:00
+ */
+ @NotNull
2022-06-09 23:11:43 +02:00
+ @Deprecated
2021-06-11 14:02:28 +02:00
+ String getPermissionMessage();
2022-06-09 23:11:43 +02:00
+
+ /**
+ * Gets the default no permission message used on the server
+ *
+ * @return the default message
+ */
+ @NotNull net.kyori.adventure.text.Component permissionMessage();
2021-06-11 14:02:28 +02:00
+
/**
* Creates a PlayerProfile for the specified uuid, with name as null.
*
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
2024-04-23 19:02:08 +02:00
index f7b78198d9983610fc2185124c3080e6b1c0fa35..b3a2c274f05156fd603bcc7a68ab41265f2eaf44 100644
2021-06-11 14:02:28 +02:00
--- 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;
2021-06-11 14:02:28 +02:00
}
- if (permissionMessage == null) {
2021-06-11 14:02:28 +02:00
- 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
}