Updated the blacklist with a new ignore-perms option. No more groups! Use permissions!

src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java

@@ -205,6 +205,8 @@ public void load(File file) throws IOException {
                     for (BlacklistEntry entry : currentEntries) {
                         if (parts[0].equalsIgnoreCase("ignore-groups")) {
                             entry.setIgnoreGroups(parts[1].split(","));
+                        } else if (parts[0].equalsIgnoreCase("ignore-perms")) {
+                            entry.setIgnorePermissions(parts[1].split(","));
                         } else if (parts[0].equalsIgnoreCase("on-break")) {
                             entry.setBreakActions(parts[1].split(","));
                         } else if (parts[0].equalsIgnoreCase("on-destroy-with")) {

src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java

@@ -42,10 +42,16 @@ public class BlacklistEntry {
      * Parent blacklist entry.
      */
     private Blacklist blacklist;
+
     /**
      * List of groups to not affect.
      */
     private Set<String> ignoreGroups;
+
+    /**
+     * List of permissions to not affect.
+     */
+    private Set<String> ignorePermissions;
     
     private String[] breakActions;
     private String[] destroyWithActions;
@@ -74,6 +80,13 @@ public String[] getIgnoreGroups() {
         return ignoreGroups.toArray(new String[ignoreGroups.size()]);
     }
 
+    /**
+     * @return the ignoreGroups
+     */
+    public String[] getIgnorePermissions() {
+        return ignorePermissions.toArray(new String[ignorePermissions.size()]);
+    }
+
     /**
      * @param ignoreGroups the ignoreGroups to set
      */
@@ -85,6 +98,17 @@ public void setIgnoreGroups(String[] ignoreGroups) {
         this.ignoreGroups = ignoreGroupsSet;
     }
 
+    /**
+     * @param ignorePermissions the ignorePermissions to set
+     */
+    public void setIgnorePermissions(String[] ignorePermissions) {
+        Set<String> ignorePermissionsSet = new HashSet<String>();
+        for (String perm : ignorePermissions) {
+            ignorePermissionsSet.add(perm);
+        }
+        this.ignorePermissions = ignorePermissionsSet;
+    }
+
     /**
      * @return
      */
@@ -218,12 +242,19 @@ public void setComment(String comment) {
      * @return
      */
     public boolean shouldIgnore(LocalPlayer player) {
-        if (ignoreGroups == null) {
-            return false;
+        if (ignoreGroups != null) {
+            for (String group : player.getGroups()) {
+                if (ignoreGroups.contains(group.toLowerCase())) {
+                    return true;
+                }
+            }
         }
-        for (String group : player.getGroups()) {
-            if (ignoreGroups.contains(group.toLowerCase())) {
-                return true;
+
+        if (ignorePermissions != null) {
+            for (String perm : ignorePermissions) {
+                if (player.hasPermission(perm)) {
+                    return true;
+                }
             }
         }
 

src/main/resources/blacklist.txt

@@ -1,33 +1,17 @@
 #
-# This is the blacklist for WorldGuard. The blacklist allows you to perform
-# actions depending on an item or block ID. Comments start with # and they
-# are ignored so you can put your own notes.
+# WorldGuard blacklist
 #
-# --------------------------------------------------------------------------
+# The blacklist lets you block actions, blocks, and items from being used.
+# You choose a set of "items to affect" and a list of "actions to perform."
 #
-# WARNING:
-# Remember to check the compatibility spreadsheet for WorldGuard to see
-# if any events or actions are currently broken in your version of Bukkit.
-#
-# --------------------------------------------------------------------------
-#
-# Format:
-# [item1,item2]
-# option1=options
-# event1=whatToDo1,whatToDo2,whatToDo3
-# event2=whatToDo1,whatToDo2
+###############################################################################
 #
 # Example to block some ore mining and placement:
 # [coalore,goldore,ironore]
 # on-break=deny,log,kick
 # on-place=deny,tell
 #
-# Options:
-# - ignore-groups (comma-separated list of groups to not affect)
-# - comment (message for yourself that is printed with 'log' and 'notify')
-# - message (optional message to show the user instead; %s is the item name)
-#
-# Events:
+# Events that you can detect:
 # - on-break (when a block of this type is about to be broken)
 # - on-destroy-with (the item/block held by the user while destroying)
 # - on-place (a block is being placed)
@@ -39,43 +23,33 @@
 # Actions (for events):
 # - deny (deny completely, used blacklist mode)
 # - allow (used in whitelist mode)
-# - notify (notify admins)
+# - notify (notify admins with the 'worldguard.notify' permission)
 # - log (log to console/file/database)
 # - tell (tell a player that that's not allowed)
 # - kick (kick player)
 # - ban (ban player)
 #
-# Users with the /worldguardnotify permission will receive notifications.
+# Options:
+# - ignore-groups (comma-separated list of groups to not affect)
+# - ignore-perms (comma-separated list of permissions to not affect - make up
+#   your very own permissions!)
+# - comment (message for yourself that is printed with 'log' and 'notify')
+# - message (optional message to show the user instead; %s is the item name)
 #
-# -------------
+###############################################################################
 #
-# You can have the same block or item used in two different sections and
-# they will both apply:
+# For more information, see:
+# http://wiki.sk89q.com/wiki/WorldGuard/Blacklist
 #
-# [goldblock]
-# ignore-groups=vip
-# on-break=deny
-# [goldblock]
-# ignore-groups=admins
-# on-break=tell
-#
-# However, some events override others. For example, if you disable both
-# usage of the diamond pickaxe (with the on-destroy-with event) and
-# destruction of gold blocks (with the on-break event) and a player tries
-# to destroy a gold block with a diamond pickaxe, because the
-# on-destroy-with event comes first, the rules for the gold block
-# will not be applied (but the player will be denied nevertheless).
-#
-# --------------------------------------------------------------------------
+###############################################################################
 #
 # Some examples follow.
-#
 # REMEMBER: If a line has # in front, it will be ignored.
 #
-# --------------------------------------------------------------------------
 
 # Deny lava buckets
 #[lavabucket]
+#ignore-perms=my.own.madeup.permission
 #ignore-groups=admins,mods
 #on-use=deny,tell