2020-02-02 11:53:48 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								From d679f9f4ab62f832886c60b2d24f66d3674b98ba Mon Sep 17 00:00:00 2001
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								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
 
							 
						 
					
						
							
								
									
										
										
										
											2020-02-02 11:53:48 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								index 95b8f4cf3..389180290 100644
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								--- a/src/main/java/org/bukkit/Bukkit.java
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+++ b/src/main/java/org/bukkit/Bukkit.java
 
							 
						 
					
						
							
								
									
										
										
										
											2020-02-02 11:53:48 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								@@ -1571,6 +1571,15 @@ public final class Bukkit {
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								         return server.suggestPlayerNamesWhenNullTabCompletions();
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								     }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+    /**
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+     *
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+     * @return the default no permission message used on the server
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+     */
 
							 
						 
					
						
							
								
									
										
										
										
											2019-03-20 00:28:15 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								+    @NotNull
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								+    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
 
							 
						 
					
						
							
								
									
										
										
										
											2020-02-02 11:53:48 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								index 6ad677bda..fbb21b4a3 100644
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								--- a/src/main/java/org/bukkit/Server.java
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+++ b/src/main/java/org/bukkit/Server.java
 
							 
						 
					
						
							
								
									
										
										
										
											2020-02-02 11:53:48 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								@@ -1374,6 +1374,13 @@ public interface Server extends PluginMessageRecipient {
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								      */
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								     boolean suggestPlayerNamesWhenNullTabCompletions();
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+    /**
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+     *
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+     * @return the default no permission message used on the server
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+     */
 
							 
						 
					
						
							
								
									
										
										
										
											2019-03-20 00:28:15 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								+    @NotNull
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								+    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
 
							 
						 
					
						
							
								
									
										
										
										
											2020-02-02 11:53:48 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								index 03bdc1622..0b0d1bd7c 100644
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								--- a/src/main/java/org/bukkit/command/Command.java
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								+++ b/src/main/java/org/bukkit/command/Command.java
 
							 
						 
					
						
							
								
									
										
										
										
											2019-04-23 05:47:07 +01:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								@@ -185,7 +185,7 @@ public abstract class Command {
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								         }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								         if (permissionMessage == null) {
							 
						 
					
						
							
								
									
										
										
										
											2019-01-15 21:12:19 +00: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.");
 
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00 
										
									 
								 
							 
							
								
							 
							
								 
							 
							
							
								+            target.sendMessage(Bukkit.getPermissionMessage()); // Paper
 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								         } else if (permissionMessage.length() != 0) {
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								             for (String line : permissionMessage.replace("<permission>", permission).split("\n")) {
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								                 target.sendMessage(line);
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							 
							
							
								-- 
 
							 
						 
					
						
							
								
									
										
										
										
											2020-01-28 19:43:57 +00:00 
										
									 
								 
							 
							
								
									
										 
									 
								
							 
							
								 
							 
							
							
								2.25.0
							 
						 
					
						
							
								
									
										
										
										
											2018-11-18 19:54:38 +00:00