Merge pull request #3763 from RedstoneFuture/v3.0

Add no-permission message option

DynmapCore/src/main/java/org/dynmap/DynmapCore.java

@@ -135,6 +135,7 @@ public class DynmapCore implements DynmapCommonAPI {
     private int fullrenderplayerlimit;  /* Number of online players that will cause fullrender processing to pause */
     private int updateplayerlimit;  /* Number of online players that will cause update processing to pause */
     private String publicURL;	// If set, public HRL for accessing dynmap (declared by administrator)
+    private String noPermissionMsg;
     private boolean didfullpause;
     private boolean didupdatepause;
     private Map<String, LinkedList<String>> ids_by_ip = new HashMap<String, LinkedList<String>>();
@@ -572,6 +573,9 @@ public class DynmapCore implements DynmapCommonAPI {
         
         publicURL = configuration.getString("publicURL", "");
 
+        /* Send this message if the player does not have permission to use the command */
+        noPermissionMsg = configuration.getString("noPermissionMsg", "You don't have permission to use this command!");
+        
         /* Load preupdate/postupdate commands */
         ImageIOManager.preUpdateCommand = configuration.getString("custom-commands/image-updates/preupdatecommand", "");
         ImageIOManager.postUpdateCommand = configuration.getString("custom-commands/image-updates/postupdatecommand", "");
@@ -2097,7 +2101,7 @@ public class DynmapCore implements DynmapCommonAPI {
         if (!(sender instanceof DynmapPlayer) || sender.isOp()) {
             return true;
         } else if (!sender.hasPrivilege(permission.toLowerCase())) {
-            sender.sendMessage("You don't have permission to use this command!");
+            sender.sendMessage(noPermissionMsg);
             return false;
         }
         return true;

fabric-1.14.4/src/main/resources/configuration.txt

@@ -471,6 +471,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

fabric-1.15.2/src/main/resources/configuration.txt

@@ -471,6 +471,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

fabric-1.16.4/src/main/resources/configuration.txt

@@ -479,6 +479,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

fabric-1.17.1/src/main/resources/configuration.txt

@@ -479,6 +479,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

fabric-1.18.2/src/main/resources/configuration.txt

@@ -477,6 +477,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

fabric-1.18/src/main/resources/configuration.txt

@@ -477,6 +477,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

forge-1.12.2/src/main/resources/configuration.txt

@@ -462,6 +462,9 @@ soft-ref-cache: true
 # Set true if new enter messages should supercede pending exit messages (vs being queued in order), default false
 #enterReplacesExits: true
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

forge-1.14.4/src/main/resources/configuration.txt

@@ -479,6 +479,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

forge-1.15.2/src/main/resources/configuration.txt

@@ -479,6 +479,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

forge-1.16.5/src/main/resources/configuration.txt

@@ -479,6 +479,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

forge-1.17.1/src/main/resources/configuration.txt

@@ -479,6 +479,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

forge-1.18.2/src/main/resources/configuration.txt

@@ -479,6 +479,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

forge-1.18/src/main/resources/configuration.txt

@@ -479,6 +479,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false

spigot/src/main/resources/configuration.txt

@@ -505,6 +505,9 @@ soft-ref-cache: true
 # If not set, 'dynmap url' will not return anything.  URL should be fully qualified (e.g. https://mc.westeroscraft.com/)
 #publicURL: http://my.greatserver.com/dynmap
 
+# Send this message if the player does not have permission to use the command
+noPermissionMsg: "You don't have permission to use this command!"
+
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false