From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 869d57b429fbe2694d1444db56c56619abfae920..5bb11c5ebd02cf4e4c6c9b859cd7987abd2093d6 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2344,6 +2344,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 aace34252f65dd54868b521288f68c641b7ed71e..e1f36d4f35cb53e28f4b64ddd730634b0fa9eb14 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -2043,6 +2043,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 1c6205cc667bbec8f6aca479f13b3e9cfcd63ab2..b791358f90fe92bc2264d9a26492245763813af3 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("").replacement(permission).build())); // Paper end }