Updated for 3.1.

CHANGELOG.txt

@@ -1,3 +1,52 @@
+3.1:
+- Added ability to disable chest protection. New configuration setting
+    (regions.build.chest-access) and new chest flag.
+- Possibly fixed projectile blocking in no-PvP zones.
+- Added /regionmembership permission that lets people only change
+    the owners and members of regions they own.
+
+3.0b2:
+- Fixed issue where built-in permissions were not (re)loaded.
+- Fixed /god not working for others.
+
+3.0b1:
+- Added parent-child relationships to regions.
+- Added global build flag.
+- Improved flag support.
+- Fixed no-PvP zone messages being sent to the wrong person.
+- Fixed commands so that they work in a recent version of Bukkit.
+- Fixed NullPointerException in explode hook.
+
+2.3.1:
+- Fixed various cast exceptions with the blacklist loggers.
+- Added checks for unchecked exceptions when resolving permissions.
+- Fixed the item durability disable setting changing the damage value on
+    an empty hand.
+
+2.3:
+- /god now works very well.
+- Item (TNT, flint and steel, etc.) blocking should now work.
+- The TNT blocking configuration variable should now work.
+- Re-added /heal (not sure where that went), added /slay.
+- Implemented contact damage disable toggle.
+- Made all player damage disabling configuration parameters work.
+- Fixed teleport-on-suffocation setting.
+- Added /locate <name>, /locate <x> <y> <z>, and /locate that lets you
+    program/change your compass bearing to point to a player's position
+    (not yet live), a position, or back to spawn.
+- Fixed CSVDatabase spitting an error if the owners list was empty.
+
+2.2:
+- Now supports GroupUsers.
+- Added support for blocking creeper explosions.
+- Fixed a bug where a player's groups were not being loaded correctly,
+    causing the blacklist group ignore option to not work.
+
+2.1.1:
+- Fixed fire spread disable preventing flint and steel too.
+- Fixed NullPointerException related to the player item event.
+- Made setup simpler.
+
 2.1:
 - Improved Bukkit support.
 

INSTALL.txt

@@ -1,28 +0,0 @@
-Installation
-------------
-
-Bukkit:
-
-** Make sure you first install the WorldEdit plugin. **
-
-  1. Create a "plugins" folder inside your server folder.
-
-  2. Copy WorldGuard.jar into "plugins".
-  
-  3. Restart your server.
-
-You may want to copy config.yml into plugins/WorldGuard/config.yml
-(you will have to create that folder). Edit it to fit your needs.
-
-hMod:
-
-  1. Create a "plugins" folder inside your "bin" folder.
-
-  2. Copy WorldGuard.jar into "plugins".
-
-  3. Add "WorldGuard" to the "plugins" line of your server.properties file.
-     If it's not already there, add the line. The line should look like this:
-  
-         plugins=WorldGuard
-     
-     If you have multiple plugins, separate plugin names with commas.

README.txt

@@ -1,242 +1,14 @@
 WorldGuard
-Copyright (c) 2010 sk89q <http://www.sk89q.com>
+Copyright (c) 2010, 2011 sk89q <http://www.sk89q.com>
 Licensed under the GNU Lesser General Public License v3
 
 Introduction
 ------------
 
-WorldGuard has a number of features, any of which you can choose to
-use or not:
+WorldGuard protects your server!
 
-- Enforce only one session for a player on a server (can't login twice).
-- Block creeper explosions.
-- Block TNT explosions.
-- Block lighters from setting fires.
-- Block all fires.
-- Disable fall damage, lava damage, fire damage, and/or water damage.
-- Allow fire but prevent it from burning certain blocks.
-- Prevent lava from starting fires.
-- Restrict lava spreading to only some block types.
-- Simulate classic-esque water by letting water infinitely expand in
-    area (only if there is a block underneath).
-- Prevent water from destroying blocks like Redstone wire and flowers.
-- Simulate the function of the sponge from Minecraft Classic.
-- Notify admins, block, log, kick or ban for the use of certain block types
-    or items.
-- Temporarily stop fire globally with some commands.
-- Destroy tools on drop to alleviate the durability cheat.
-- Prevent gravel and sand from falling.
-- Allow portal blocks to be placed anywhere.
-
-hMod is required as WorldGuard is a plugin for hMod.
-
-Configuration
--------------
-
-A "worldguard.properties" will be created the first the time that you load
-WorldGuard on your server. You can either restart your server or use
-/reloadplugin WorldGuard to reload the configuraton file after editing it.
-
-NOTE: Some features may require a custom version of hMod. When the server
-is loaded with the plugin, WorldGuard will tell you the features
-unsupported by your version of hMod.
-
-- summary-on-start (def. true)
-    Print a summary of WorldGuard's protection settings at-a-glance when
-    the plugin is loaded.
-
-- item-durability (def. false)
-    **Requires special version of hMod
-    Enables item durability.
-
-- classic-water (def. false)
-    Toggle use of classic water. Be foreward that your world may be
-    flooded if you are not careful. If you have WorldEdit, you can use
-    //drain in such an event, although that will drain the entire pool
-    as well. This classic-esque water will only spread infinitely over
-    ground, but if there are air blocks underneath, the water will not
-    spread (preventing waterfalls from becoming tsunamis).
-
-- simulate-sponge (def. true)
-    Toggle simulation of the sponge from Classic. It blocks water from
-    flowing near the sponge.
-
-- sponge-radius (def. 3)
-    The radius of the sponge's effect. The default is that of Classic,
-    creating a 5x5x5 cuboid free of water. Increasing the number will
-    increase server load exponentially, although 3-5 has fairly low impact.
-
-- no-physics-gravel (def. false)
-    **Requires special version of hMod
-    Prevents gravel from falling due to gravity.
-
-- no-physics-sand (def. false)
-    **Requires special version of hMod
-    Prevents sand from falling due to gravity.
-
-- allow-portal-anywhere (def. false)
-    **Requires special version of hMod
-    Allows you to place portal blocks anywhere.
-
-- enforce-single-session (def. true)
-    Enforce single sessions. If the player is already found to be on
-    the server when s/he logs in, the other player will be kicked with
-    an informative message. The inventory will have been saved before
-    the new session starts.
-    
-- block-tnt (def. false)
-    Block TNT explosions. TNT will still explode client-side but the blocks
-    will be "restored" in a few seconds afterwards.
-    
-- block-lighter (def. false)
-    Block flint and steel fires. Those with access to the commands
-    /uselighter or /lighter can bypass this. /uselighter is not a real
-    command; it is only used for permissions.
-
-- block-creepers (def. false)
-    Block creeper explosions from destroying terrain (and possibly from
-    causing damage).
-
-- disable-lava-fire (def. true)
-    Prevent lava from starting fires.
-
-- allowed-lava-spread-blocks (no default)
-    List of block names/IDs to allow lava to spread to. Leave blank
-    to disable this feature.
-
-- disable-all-fire-spread (def. false)
-    Disable all fire from spreading.
-
-- disallowed-fire-spread-blocks (no default)
-    List of block names/IDs to prevent fire from spreading to. Leave blank
-    to disable this feature. Enabling disable-all-fire-spread will
-    override this function.
-
-- disable-water-damage-blocks (no default)
-    List of blocks that should not be destroyed by water (Redstone wire,
-    minecart tracks, flowers, etc.).
-
-- item-drop-blacklist (no default)
-    List of block names/IDs to destroy on drop. This can alleviate the
-    durability cheat that allows you to drop your tools to fix their
-    durability. You can also enforce this with the blacklist but
-    this is an easier way to do it (this way also prints a more
-    friendly message than if you used the 'tell' action of the blacklist).
-
-- login-protection (def. 3)
-    Number of seconds to keep a player invincible when the player joins.
-
-- spawn-protection (def. 0)
-    Number of seconds to keep a player invincible when the player spawns.
-    This does not apply to players joining the server.
-
-- kick-on-death (def. false)
-    Kick players when they die (and respawn). This is to work around the
-    issues of invisible players when players die.
-    
-- disable-fall-damage (def. false)
-- disable-lava-damage (def. false)
-- disable-fire-damage (def. false)
-- disable-water-damage (def. false)
-    Disable various types of damage.
-    
-- log-console (def. true)
-    For blacklist log actions, print to console.
-
-- log-file (def. false)
-    For blacklist log actions, log to file.
-    
-- log-file-path (def. "worldguard/logs/%Y-%m-%d.log")
-    Log blacklist events to file. You can use these patterns in the path:
-        %Y the year (YYYY)
-        %m the month (MM)
-        %d the day (DD)
-        %W the week of the year (00-52)
-        %H 24-hour time (HH)
-        %h 12-hour time (HH)
-        %i the minute (mm)
-        %s the second (ss)
-        %u the user's name
-        %% translates to a single percent sign "%"
-    The files are not automatically rotated if they get large so you should
-    perhaps put a week in the filename at least.
-    
-    Escape backslashes with another backslash, like so:
-    C:\path\to\log.txt -> C:\\path\\to\\log.txt
-
-- log-file-open-files (def. 10)
-    The number of log files to keep open at once. Unless you use dynamic
-    patterns in the path, the value of this variable won't matter. However,
-    if, for example, you use a player's username in the filename and you
-    have many users who cause logged events to occur, files would have
-    to be opened for each user and this parameter would matter.
-
-- log-database (def. false)
-    Log blacklist events to database.
-
-- log-database-dsn (def. "jdbc:mysql://localhost:3306/minecraft")
-    Connection string. A string to use for MySQL would be:
-    jdbc:mysql://localhost:3306/minecraft
-    The "minecraft" part at the end is the database name.
-    
-    Escape colons with a backslash, like so:
-    jdbc:mysql://localhost:3306/minecraft
-    ->
-    jdbc\:mysql\://localhost\:3306/minecraft
-
-- log-database-user (def. "root")
-    Database username.
-
-- log-database-pass (def. "")
-    Database password.
-
-- log-database-table (def. "blacklist_events")
-    Database table to use.
-
-Commands
---------
-
-- /stopfire and /allowfire
-    Disables and enables fire spread globally. Both commands require the
-    permission to use only "/stopfire. Re-enabling fire spread with this
-    command will not override other fire spread control features of
-    WorldGuard. Note that disabling fire does not disable fire damage
-    but fire at least won't spread.
-
-- /god
-    Toggles your invincibility. Players must have permission to use "/god"
-    to be able to use this command. You can also use this command to
-    toggle the invincibility of others although you must have the
-    "/godother" permission.
-
-Server Commands
----------------
-
-- fire-stop and fire-allow
-    Disables and enables fire spread globally. Re-enabling fire spread
-    with this command will not override other fire spread control features
-    of WorldGuard. Note that disabling fire does not disable fire damage
-    but fire at least won't spread.
-
-Blacklists
-----------
-
-Blacklists let you control the use of blocks and items. You can have
-certain rules apply to only some groups.
-
-Edit the included worldguard-blacklist.txt file and follow the
-instructions inside. The file comes with the download for WorldGuard.
-
-Other Features
---------------
-
-To give someone invincibility every time s/he joins the server, create
-a wg-invincible group and add the group to the user or have the user's
-group inherit this group.
-
-To give someone the ability to breathe under water, create
-a wg-amphibious group and add the group to the user or have the user's
-group inherit this group.
+Documentation can be found at:
+http://wiki.sk89q.com/wiki/WorldGuard
 
 Thanks
 ------

blacklist.txt

@@ -0,0 +1,84 @@
+#
+# 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.
+#
+# --------------------------------------------------------------------------
+#
+# 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:
+# - 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)
+# - on-use (an item like flint and steel or a bucket is being used)
+# - on-interact (when a block in used (doors, chests, etc.))
+# - on-drop (an item is being dropped from the player's inventory)
+# - on-acquire (an item enters a player's inventory via some method)
+#
+# Actions (for events):
+# - deny (deny completely)
+# - notify (notify admins)
+# - 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.
+#
+# -------------
+#
+# You can have the same block or item used in two different sections and
+# they will both apply:
+#
+# [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-groups=admins,mods
+#on-use=deny,tell
+
+# Deny some ore
+#[coalore,goldore,ironore]
+#ignore-groups=admins,mods
+#on-break=notify,deny,log

build.xml

@@ -7,6 +7,11 @@
   <property name="dist.dir" location="dist"/>
   <property name="release.dir" location="release"/>
   <property name="lib.dir" location="lib"/>
+  <property name="docs.dir" location="docs"/>
+
+  <fileset id="libs" dir="${lib.dir}">
+    <include name="*.jar"/>
+  </fileset>
 
   <target name="init">
     <mkdir dir="${build.dir}"/>
@@ -16,9 +21,7 @@
   <target name="compile" depends="init">
     <javac srcdir="${src.dir}" deprecation="true" includeantruntime="true" destdir="${build.dir}" debug="true">
       <classpath>
-        <fileset dir="${lib.dir}">
-          <include name="*.jar"/>
-        </fileset>
+        <fileset refid="libs"/>
       </classpath>
     </javac>
   </target>
@@ -30,9 +33,14 @@
       <attribute name="Implementation-Title" value="WorldGuard"/>
       <attribute name="Implementation-Version" value="${version}"/>
       <attribute name="WorldGuard-Version" value="${version}"/>
-      <attribute name="Class-Path" value="WorldEdit.jar"/>
+      <attribute name="Class-Path" value="WorldEdit.jar WorldGuard/WorldEdit.jar"/>
     </manifest>
+    <delete file="${build.dir}/plugin.yml"/>
     <copy tofile="${build.dir}/plugin.yml" file="plugin.yml"/>
+    <replace file="${build.dir}/plugin.yml" token="WGVERSIONMACRO" value="${version}"/>
+    <mkdir dir="${build.dir}/defaults"/>
+    <copy tofile="${build.dir}/defaults/config.yml" file="config.yml"/>
+    <copy tofile="${build.dir}/defaults/blacklist.txt" file="blacklist.txt"/>
     <jar jarfile="${dist.dir}/WorldGuard.jar" basedir="${build.dir}" manifest="manifest.mf"/>
   </target>
 
@@ -48,16 +56,10 @@
     <antcall target="jar"/>
     <delete dir="${release.dir}"/>
     <mkdir dir="${release.dir}"/>
-    <copy todir="${release.dir}">
-      <fileset dir="."/>
-      <globmapper from="*.txt" to="*.txt"/>
-    </copy>
-    <copy tofile="${release.dir}/worldguard.updatr" file="worldguard.updatr"/>
-    <replace file="${release.dir}/worldguard.updatr" token="%version%" value="${version}"/>
-    <copy tofile="${release.dir}/plugin.yml" file="plugin.yml"/>
-    <copy tofile="${release.dir}/config.yml" file="config.yml"/>
-    <replace file="${release.dir}/plugin.yml" token="WGVERSIONMACRO" value="${version}"/>
-    <copy file="worldguard.properties" todir="${release.dir}"/>
+    <copy tofile="${release.dir}/README.txt" file="README.txt"/>
+    <copy tofile="${release.dir}/LICENSE.txt" file="LICENSE.txt"/>
+    <copy tofile="${release.dir}/CHANGELOG.txt" file="CHANGELOG.txt"/>
+    <copy tofile="${release.dir}/blacklist_table.sql" file="blacklist_table.sql"/>
     <copy tofile="${release.dir}/WorldGuard.jar" file="${dist.dir}/WorldGuard.jar"/>
     <zip destfile="${release.dir}/worldguard-${version}.zip" basedir="${release.dir}" excludes="*.zip plugin.yml"/>
     <mkdir dir="${release.dir}/src"/>
@@ -67,11 +69,21 @@
     <zip destfile="${release.dir}/worldguard-${version}-src.zip" basedir="${release.dir}" excludes="*.zip plugin.yml"/>
   </target>
 
+  <!-- Javadoc -->
+  <target name="javadoc">
+    <javadoc access="public" author="true" destdir="${docs.dir}" doctitle="WorldGuard API" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" sourcepath="src" splitindex="true" use="true" version="true">
+      <classpath>
+        <fileset refid="libs"/>
+      </classpath>
+    </javadoc>
+  </target>
+  
   <!-- Clean the output -->
   <target name="clean">
     <delete dir="${build.dir}"/>
     <delete dir="${dist.dir}"/>
     <delete dir="${release.dir}"/>
+    <delete dir="${docs.dir}"/>
   </target>
   
   <!--<target name="-get-version-git" if="git-revision">

config.yml

@@ -1,63 +1,98 @@
-summary-on-start: true
+#
+# WorldGuard's configuration file
+#
+# About editing this file:
+# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If
+#   you use an editor like Notepad++ (recommended for Windows users), you
+#   must configure it to "replace tabs with spaces." In Notepad++, this can
+#   be changed in Settings > Preferences > Language Menu.
+# - Don't get rid of the indents. They are indented so some entries are
+#   in categories (like "enforce-single-session" is in the "protection"
+#   category.
+# - If you want to check the format of this file before putting it
+#   into WorldGuard, paste it into http://yaml-online-parser.appspot.com/
+#   and see if it gives "ERROR:".
+# - Lines starting with # are commentsand so they are ignored.
+#
+# WARNING:
+# Remember to check the compatibility spreadsheet for WorldGuard to see
+# if any features are currently broken in your version of Bukkit.
+#
+
+summary-on-start: on
+
 protection:
-    enforce-single-session: true
-    item-durability: true
+    enforce-single-session: on
+    item-durability: on
+
 simulation:
-    classic-water: false
+    classic-water: off
     sponge:
-        enable: true
+        enable: on
         radius: 3
+
 physics:
-    # Doesn't work in Bukkit yet
-    no-physics-gravel: false
-    no-physics-sand: false
-    allow-portal-anywhere: false
+    no-physics-gravel: off
+    no-physics-sand: off
+    allow-portal-anywhere: off
     disable-water-damage-blocks: []
+
 ignition:
-    block-tnt: false
-    block-lighter: false
+    block-tnt: off
+    block-lighter: off
+
 fire:
-    disable-all-fire-spread: false
+    disable-all-fire-spread: off
     disable-fire-spread-blocks: []
-    disable-lava-fire-spread: true
+    disable-lava-fire-spread: on
     lava-spread-blocks: []
+
 mobs:
-    # Doesn't work in Bukkit yet
-    block-creeper-explosions: false
+    block-creeper-explosions: off
+    block-creeper-block-damage: off
+
 spawn:
-    # Doesn't work in Bukkit yet
     login-protection: 3
     spawn-protection: 0
-    kick-on-death: false
-    exact-respawn: false
-    teleport-to-home-on-death: false
+    kick-on-death: off
+    exact-respawn: off
+    teleport-to-home-on-death: off
+
 player-damage:
-    # Doesn't work in Bukkit yet
-    disable-fall-damage: true
-    disable-lava-damage: true
-    disable-fire-damage: true
-    disable-drowning-damage: true
-    disable-suffocation-damage: true
-    teleport-on-suffocation: true
+    disable-fall-damage: off
+    disable-lava-damage: off
+    disable-fire-damage: off
+    disable-drowning-damage: off
+    disable-suffocation-damage: off
+    disable-contact-damage: off
+    teleport-on-suffocation: off
+
 regions:
-    enable: true
+    enable: on
     wand: 287
+    default:
+        build: true
+        chest-access: false
+
 blacklist:
     logging:
         console:
-            enable: true
+            enable: on
         database:
-            enable: false
+            enable: off
             dsn: jdbc:mysql://localhost:3306/minecraft
             user: root
             password: pass
             table: blacklist_events
         file:
-            enable: true
+            enable: on
             path: worldguard/logs/%Y-%m-%d.log
             open-files: 10
+
+# See http://wiki.sk89q.com/wiki/WorldGuard/Permissions/Bukkit
 permissions:
-    groups:
-        default:
+    users:
+        sk89q:
             permissions:
-    users:
+                - /region
+                - /reloadwg

javadoc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="javadoc">
+    <target name="javadoc">
+        <javadoc access="public" author="true" classpath="P:\Projects\Minecraft\Libraries\GroupUsers.jar;P:\Projects\Minecraft\Libraries\jnbt.jar;P:\Projects\Minecraft\hMod\build\classes;P:\Projects\Minecraft\WorldEdit\build\classes;P:\Projects\Minecraft\Libraries\snakeyaml.jar;P:\Projects\Minecraft\Libraries\jopt-simple-3.2.jar;P:\Projects\Minecraft\Libraries\Permissions.jar;C:\Program Files\eclipse\plugins\org.hamcrest.core_1.1.0.v20090501071000.jar;P:\Projects\Minecraft\Libraries\json_simple-1.1.jar;P:\Projects\Minecraft\CraftBukkit\bin;P:\Projects\Minecraft\Libraries\truezip.jar;C:\Program Files\eclipse\plugins\org.junit_4.8.1.v4_8_1_v20100427-1100\junit.jar;P:\Projects\Minecraft\Bukkit\bin;P:\Projects\Minecraft\mc-dev" destdir="doc" doctitle="Worldguard API" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="com.sk89q.worldguard.blacklist,com.sk89q.worldguard.domains,com.sk89q.worldguard.bukkit,com.sk89q.worldguard.protection,com.sk89q.worldguard.util,au.com.bytecode.opencsv,com.sk89q.worldguard,com.sk89q.worldguard.blacklist.loggers,com.sk89q.worldguard.blacklist.events" source="1.6" sourcepath="tests;src" splitindex="true" use="true" version="true"/>
+    </target>
+</project>

plugin.yml

@@ -1,3 +1,33 @@
 name: WorldGuard
 main: com.sk89q.worldguard.bukkit.WorldGuardPlugin
-version: WGVERSIONMACRO
+version: WGVERSIONMACRO
+commands:
+    stopfire:
+        description: Halts all fire spread until it is disabled or the server is restarted
+        usage: /<command>
+    allowfire:
+        description: Re-enables fire spread if he has been disabled with /stopfire
+        usage: /<command>
+    god:
+        description: Toggles god mode
+        usage: /<command> [other player]
+    heal:
+        description: Heal yourself or another
+        usage: /<command> [other player]
+    slay:
+        description: Slay yourself or another
+        usage: /<command> [other player]
+    stack:
+        description: Stacks items in the player's inventory
+        usage: /<command>
+        aliases: ;
+    region:
+        description: Adjust protected regions
+        usage: /<command> <define|claim|setparent|flag|delete|info|addowner|removeowner|addmember|removemember|list|save|load> ...
+        aliases: rg, regions
+    locate:
+        description: Set your compass towards a person
+        usage: /<command> <target>
+    reloadwg:
+        description: Reload WorldGuard's configuration
+        usage: /<command>

src/au/com/bytecode/opencsv/CSVParser.java

@@ -1,5 +1,3 @@
-package au.com.bytecode.opencsv;
-
 /**
  Copyright 2005 Bytecode Pty Ltd.
 
@@ -16,6 +14,8 @@ package au.com.bytecode.opencsv;
  limitations under the License.
  */
 
+package au.com.bytecode.opencsv;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

src/au/com/bytecode/opencsv/CSVReader.java

@@ -1,5 +1,3 @@
-package au.com.bytecode.opencsv;
-
 /**
  Copyright 2005 Bytecode Pty Ltd.
 
@@ -16,6 +14,8 @@ package au.com.bytecode.opencsv;
  limitations under the License.
  */
 
+package au.com.bytecode.opencsv;
+
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.IOException;

src/au/com/bytecode/opencsv/CSVWriter.java

@@ -1,5 +1,3 @@
-package au.com.bytecode.opencsv;
-
 /**
  Copyright 2005 Bytecode Pty Ltd.
 
@@ -16,6 +14,8 @@ package au.com.bytecode.opencsv;
  limitations under the License.
  */
 
+package au.com.bytecode.opencsv;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintWriter;

src/au/com/bytecode/opencsv/ResultSetHelper.java

@@ -1,4 +1,3 @@
-package au.com.bytecode.opencsv;
 /**
  Copyright 2005 Bytecode Pty Ltd.
 
@@ -15,6 +14,8 @@ package au.com.bytecode.opencsv;
  limitations under the License.
  */
 
+package au.com.bytecode.opencsv;
+
 import java.io.IOException;
 import java.sql.ResultSet;
 import java.sql.SQLException;

src/au/com/bytecode/opencsv/ResultSetHelperService.java

@@ -1,4 +1,3 @@
-package au.com.bytecode.opencsv;
 /**
  Copyright 2005 Bytecode Pty Ltd.
 
@@ -14,6 +13,9 @@ package au.com.bytecode.opencsv;
  See the License for the specific language governing permissions and
  limitations under the License.
  */
+
+package au.com.bytecode.opencsv;
+
 import java.io.IOException;
 import java.io.Reader;
 import java.math.BigDecimal;

src/com/sk89q/worldguard/LocalPlayer.java

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldguard;
 
-import java.util.List;
 import com.sk89q.worldedit.Vector;
 
 public abstract class LocalPlayer {
@@ -71,7 +70,7 @@ public abstract class LocalPlayer {
      * 
      * @return
      */
-    public abstract List<String> getGroups();
+    public abstract String[] getGroups();
     
     @Override
     public boolean equals(Object obj) {

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

@@ -21,8 +21,6 @@ package com.sk89q.worldguard.blacklist;
 
 import java.util.Set;
 import java.util.HashSet;
-import java.util.Map;
-import java.util.HashMap;
 import org.bukkit.ChatColor;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;

src/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java

@@ -1,6 +1,3 @@
-package com.sk89q.worldguard.blacklist;
-
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 // $Id$
 /*
  * WorldGuard
@@ -20,6 +17,10 @@ import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+package com.sk89q.worldguard.blacklist;
+
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+
 /**
  *
  * @author sk89q

src/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java

@@ -1,4 +1,3 @@
-package com.sk89q.worldguard.blacklist.loggers;
 // $Id$
 /*
  * WorldGuard
@@ -18,6 +17,8 @@ package com.sk89q.worldguard.blacklist.loggers;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+package com.sk89q.worldguard.blacklist.loggers;
+
 import java.util.logging.Logger;
 import java.util.logging.Level;
 import com.sk89q.worldedit.blocks.ItemType;
@@ -55,8 +56,8 @@ public class ConsoleLoggerHandler implements BlacklistLoggerHandler {
                     + (comment != null ? " (" + comment + ")" : ""));
         
         // Block interact
-        } else if (event instanceof BlockPlaceBlacklistEvent) {
-            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+        } else if (event instanceof BlockInteractBlacklistEvent) {
+            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
             logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " tried to interact with " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));

src/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java

@@ -172,7 +172,7 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
         
         // Use
         } else if (event instanceof ItemUseBlacklistEvent) {
-            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
+            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
             logEvent("USE", evt.getPlayer(), evt.getPlayer().getPosition(),
                     evt.getType(), comment);
         

src/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java

@@ -255,12 +255,12 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
         
         // Drop
         } else if (event instanceof ItemDropBlacklistEvent) {
-            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
+            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
             logEvent(event, "drop", evt.getType(), evt.getPosition(), comment);
             
         // Use
         } else if (event instanceof ItemUseBlacklistEvent) {
-            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
+            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
             logEvent(event, "use", evt.getType(), evt.getPosition(), comment);
         
         // Unknown

src/com/sk89q/worldguard/bukkit/BukkitPlayer.java

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldguard.bukkit;
 
-import java.util.List;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import com.sk89q.worldedit.Vector;
@@ -61,7 +60,7 @@ public class BukkitPlayer extends LocalPlayer {
     }
 
     @Override
-    public List<String> getGroups() {
+    public String[] getGroups() {
         return plugin.getGroups(player);
     }
 

src/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java

@@ -1,4 +1,3 @@
-package com.sk89q.worldguard.bukkit;
 // $Id$
 /*
  * WorldGuard
@@ -18,6 +17,8 @@ package com.sk89q.worldguard.bukkit;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+package com.sk89q.worldguard.bukkit;
+
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import org.bukkit.ChatColor;

src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java

@@ -35,6 +35,7 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.*;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.AreaFlags;
 import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
 
 public class WorldGuardBlockListener extends BlockListener {
@@ -63,8 +64,10 @@ public class WorldGuardBlockListener extends BlockListener {
 
         if (!plugin.itemDurability && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
             ItemStack held = player.getItemInHand();
-            held.setDamage((byte)-1);
-            player.setItemInHand(held);
+            if (held.getTypeId() > 0) {
+                held.setDamage((byte)-1);
+                player.setItemInHand(held);
+            }
         }
         
         if (plugin.useRegions && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
@@ -166,7 +169,7 @@ public class WorldGuardBlockListener extends BlockListener {
     public void onBlockIgnite(BlockIgniteEvent event) {
         IgniteCause cause = event.getCause();
         Block block = event.getBlock();
-        Player player = event.getPlayer();
+        //Player player = event.getPlayer();
         World world = block.getWorld();
         boolean isFireSpread = cause == IgniteCause.SLOW_SPREAD
                 || cause == IgniteCause.SPREAD;
@@ -176,7 +179,7 @@ public class WorldGuardBlockListener extends BlockListener {
             return;
         }
 
-        if (plugin.disableFireSpread) {
+        if (plugin.disableFireSpread && isFireSpread) {
             event.setCancelled(true);
             return;
         }
@@ -206,22 +209,38 @@ public class WorldGuardBlockListener extends BlockListener {
             }
         }
         
-        if (plugin.useRegions && player != null && !plugin.hasPermission(player, "/regionbypass")) {
+        /*if (plugin.useRegions) {
             Vector pt = toVector(block);
-            LocalPlayer localPlayer = plugin.wrapPlayer(player);
             
-            if (cause == IgniteCause.FLINT_AND_STEEL
-                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+            if (player != null && !plugin.hasPermission(player, "/regionbypass")) {
+                LocalPlayer localPlayer = plugin.wrapPlayer(player);
+                
+                if (cause == IgniteCause.FLINT_AND_STEEL
+                        && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                    event.setCancelled(true);
+                    return;
+                }
+                
+                if (cause == IgniteCause.FLINT_AND_STEEL
+                        && !plugin.regionManager.getApplicableRegions(pt)
+                        .allowsFlag(AreaFlags.FLAG_LIGHTER)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            
+            f (isFireSpread && !plugin.regionManager.getApplicableRegions(pt)
+                    .allowsFlag(AreaFlags.FLAG_FIRE_SPREAD)) {
                 event.setCancelled(true);
                 return;
             }
             
-            if (cause == IgniteCause.FLINT_AND_STEEL
-                    && !plugin.regionManager.getApplicableRegions(pt).allowsLighter()) {
+            if (cause == IgniteCause.LAVA && !plugin.regionManager.getApplicableRegions(pt)
+                    .allowsFlag(AreaFlags.FLAG_LAVA_FIRE)) {
                 event.setCancelled(true);
                 return;
             }
-        }
+        }*/
     }
 
     /**
@@ -258,13 +277,19 @@ public class WorldGuardBlockListener extends BlockListener {
         Block block = event.getBlock();
         LivingEntity entity = event.getEntity();
         
-        if (entity instanceof Player && block.getType() == Material.CHEST) {
+        if (entity instanceof Player
+                && (block.getType() == Material.CHEST
+                        || block.getType() == Material.DISPENSER
+                        || block.getType() == Material.FURNACE
+                        || block.getType() == Material.BURNING_FURNACE
+                        || block.getType() == Material.NOTE_BLOCK)) {
             Player player = (Player)entity;
             if (plugin.useRegions) {
                 Vector pt = toVector(block);
                 LocalPlayer localPlayer = plugin.wrapPlayer(player);
     
                 if (!plugin.hasPermission(player, "/regionbypass")
+                        && !plugin.regionManager.getApplicableRegions(pt).allowsFlag(AreaFlags.FLAG_CHEST_ACCESS)
                         && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
                     player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
                     event.setCancelled(true);

src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java

@@ -20,11 +20,18 @@
 package com.sk89q.worldguard.bukkit;
 
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.*;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BlockType;
+import com.sk89q.worldguard.protection.AreaFlags;
 import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
 
 public class WorldGuardEntityListener extends EntityListener {
@@ -47,40 +54,18 @@ public class WorldGuardEntityListener extends EntityListener {
         Entity defender = event.getEntity();
         DamageCause type = event.getCause();
         
-        if (defender instanceof Player) {
+        if (defender instanceof Player) {            
             Player player = (Player)defender;
 
             if (plugin.invinciblePlayers.contains(player.getName())) {
                 event.setCancelled(true);
                 return;
             }
-            
-            if (plugin.disableFallDamage && type == DamageCause.FALL) {
-                event.setCancelled(true);
-                return;
-            }
 
             if (plugin.disableLavaDamage && type == DamageCause.LAVA) {
                 event.setCancelled(true);
                 return;
             }
-
-            if (plugin.disableFireDamage && (type == DamageCause.FIRE
-                    || type == DamageCause.FIRE_TICK)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (plugin.disableDrowningDamage && type == DamageCause.DROWNING) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (type == DamageCause.DROWNING
-                    && plugin.amphibiousPlayers.contains(player.getName())) {
-                event.setCancelled(true);
-                return;
-            }
         }
     }
 
@@ -96,18 +81,211 @@ public class WorldGuardEntityListener extends EntityListener {
                 event.setCancelled(true);
                 return;
             }
-            
+
             if (attacker != null && attacker instanceof Player) {
                 if (plugin.useRegions) {
                     Vector pt = toVector(defender.getLocation());
                     
-                    if (!plugin.regionManager.getApplicableRegions(pt).allowsPvP()) {
-                        player.sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
+                    if (!plugin.regionManager.getApplicableRegions(pt)
+                            .allowsFlag(AreaFlags.FLAG_PVP)) {
+                        ((Player)attacker).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+            
+            if (attacker != null && attacker instanceof Monster) {
+                if (attacker instanceof Creeper && plugin.blockCreeperExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                
+                if (plugin.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    
+                    if (!plugin.regionManager.getApplicableRegions(pt)
+                            .allowsFlag(AreaFlags.FLAG_MOB_DAMAGE)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                    
+                    if (attacker instanceof Creeper) {
+                        if (!plugin.regionManager.getApplicableRegions(pt)
+                                .allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION)) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
+                }
+                
+            }
+        }
+    }
+    
+    public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
+        Entity defender = event.getEntity();
+        Entity attacker = event.getDamager();
+        
+        if (defender instanceof Player) {            
+            Player player = (Player)defender;
+
+            if (plugin.invinciblePlayers.contains(player.getName())) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (attacker != null && attacker instanceof Player) {
+                if (plugin.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    
+                    if (!plugin.regionManager.getApplicableRegions(pt)
+                            .allowsFlag(AreaFlags.FLAG_PVP)) {
+                        ((Player)attacker).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
                         event.setCancelled(true);
                         return;
                     }
                 }
             }
         }
+
+    }
+
+    public void onEntityDamage(EntityDamageEvent event) {
+        Entity defender = event.getEntity();
+        DamageCause type = event.getCause();
+        
+        if (defender instanceof Player) {            
+            Player player = (Player)defender;
+
+            if (plugin.invinciblePlayers.contains(player.getName())) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (plugin.disableFallDamage && type == DamageCause.FALL) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (plugin.disableFireDamage && (type == DamageCause.FIRE
+                    || type == DamageCause.FIRE_TICK)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (plugin.disableDrowningDamage && type == DamageCause.DROWNING) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (plugin.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
+                findFreePosition(player);
+                event.setCancelled(true);
+                return;
+            }
+
+            if (plugin.disableSuffocationDamage && type == DamageCause.SUFFOCATION) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (plugin.disableContactDamage && type == DamageCause.CONTACT) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (type == DamageCause.DROWNING
+                    && plugin.amphibiousPlayers.contains(player.getName())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void onEntityExplode(EntityExplodeEvent event) {
+        if (event.getEntity() instanceof LivingEntity) {
+            if (plugin.blockCreeperBlockDamage) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (plugin.blockCreeperExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (!plugin.regionManager.getApplicableRegions(BukkitUtil.toVector(event.getEntity().getLocation()))
+                    .allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION)) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (plugin.useRegions) {
+                Vector pt = toVector(event.getEntity().getLocation());
+                
+                if (!plugin.regionManager.getApplicableRegions(pt)
+                        .allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        } else { // Shall assume that this is TNT
+            if (plugin.blockTNT) {
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (plugin.useRegions && event.getEntity() != null) {
+                Vector pt = toVector(event.getEntity().getLocation());
+                
+                if (!plugin.regionManager.getApplicableRegions(pt)
+                        .allowsFlag(AreaFlags.FLAG_TNT)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }
+    
+    /**
+     * Find a position for the player to stand that is not inside a block.
+     * Blocks above the player will be iteratively tested until there is
+     * a series of two free blocks. The player will be teleported to
+     * that free position.
+     *
+     * @param player
+     */
+    public void findFreePosition(Player player) {
+        Location loc = player.getLocation();
+        int x = loc.getBlockX();
+        int y = Math.max(0, loc.getBlockY());
+        int origY = y;
+        int z = loc.getBlockZ();
+        World world = player.getWorld();
+
+        byte free = 0;
+
+        while (y <= 129) {
+            if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) {
+                free++;
+            } else {
+                free = 0;
+            }
+
+            if (free == 2) {
+                if (y - 1 != origY) {
+                    loc.setX(x + 0.5);
+                    loc.setY(y);
+                    loc.setZ(z + 0.5);
+                    player.teleportTo(loc);
+                }
+
+                return;
+            }
+
+            y++;
+        }
     }
 }

src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java

@@ -19,31 +19,15 @@
 
 package com.sk89q.worldguard.bukkit;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldedit.bukkit.WorldEditAPI;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.IncompleteRegionException;
-import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.*;
 import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
-import com.sk89q.worldguard.domains.*;
-import com.sk89q.worldguard.protection.*;
+import com.sk89q.worldguard.protection.AreaFlags;
 import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
 
 /**
@@ -54,12 +38,6 @@ public class WorldGuardPlayerListener extends PlayerListener {
      * Plugin.
      */
     private WorldGuardPlugin plugin;
-    /**
-     * Group pattern used to specify groups for the region command.
-     */
-    private static Pattern groupPattern = Pattern.compile("^[gG]:(.+)$");
-
-    private static int CMD_LIST_SIZE = 9;
     
     /**
      * Construct the object;
@@ -117,8 +95,9 @@ public class WorldGuardPlayerListener extends PlayerListener {
     public void onPlayerItem(PlayerItemEvent event) {
         Player player = event.getPlayer();
         Block block = event.getBlockClicked();
+        ItemStack item = event.getItem();
         
-        if (plugin.useRegions && !event.isBlock() && event.getBlockClicked() != null) {
+        if (plugin.useRegions && !event.isBlock() && block != null) {
             Vector pt = toVector(block.getRelative(event.getBlockFace()));
             LocalPlayer localPlayer = plugin.wrapPlayer(player);
             
@@ -131,10 +110,21 @@ public class WorldGuardPlayerListener extends PlayerListener {
             }
         }
         
-        if (plugin.blacklist != null) {
+        if (plugin.blacklist != null && item != null && block != null) {
             if (!plugin.blacklist.check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
-                            block.getTypeId()), false, false)) {
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(block.getRelative(event.getBlockFace())),
+                            item.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    
+        if (plugin.useRegions && item != null && block != null && item.getTypeId() == 259) {
+            Vector pt = toVector(block.getRelative(event.getBlockFace()));
+            
+            if (!plugin.regionManager.getApplicableRegions(pt)
+                    .allowsFlag(AreaFlags.FLAG_LIGHTER)) {
                 event.setCancelled(true);
                 return;
             }
@@ -160,629 +150,4 @@ public class WorldGuardPlayerListener extends PlayerListener {
             }
         }
     }
-
-    /**
-     * Called when a player attempts to use a command
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerCommand(PlayerChatEvent event) {
-        if (handleCommand(event)) {
-            event.setCancelled(true);
-        }
-    }
-
-    /**
-     * Called when a player attempts to use a command
-     *
-     * @param event Relevant event details
-     */
-    public boolean handleCommand(PlayerChatEvent event) {
-        Player player = event.getPlayer();
-        String[] split = event.getMessage().split(" ");
-        
-        if (split[0].equalsIgnoreCase("/stopfire") &&
-                plugin.hasPermission(player, "/stopfire")) {
-            if (!plugin.fireSpreadDisableToggle) {
-                plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                        + "Fire spread has been globally disabled by " + player.getName() + ".");
-            } else {
-                player.sendMessage(ChatColor.YELLOW + "Fire spread was already globally disabled.");
-            }
-            
-            plugin.fireSpreadDisableToggle = true;
-        } else if (split[0].equalsIgnoreCase("/allowfire")
-                    && plugin.hasPermission(player, "/stopfire")) {
-            if (plugin.fireSpreadDisableToggle) {
-                plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                        + "Fire spread has been globally re-enabled by " + player.getName() + ".");
-            } else {
-                player.sendMessage(ChatColor.YELLOW + "Fire spread was already globally enabled.");
-            }
-            
-            plugin.fireSpreadDisableToggle = false;
-        } else if (split[0].equalsIgnoreCase("/god")
-                    && plugin.hasPermission(player, "/god")) {
-            // Allow setting other people invincible
-            if (split.length > 1) {
-                if (!plugin.hasPermission(player, "/godother")) {
-                    player.sendMessage(ChatColor.RED + "You don't have permission to make others invincible.");
-                    return true;
-                }
-
-                Player other = matchSinglePlayer(plugin.getServer(), split[1]);
-                if (other == null) {
-                    player.sendMessage(ChatColor.RED + "Player not found.");
-                } else {
-                    if (!plugin.invinciblePlayers.contains(other.getName())) {
-                        plugin.invinciblePlayers.add(other.getName());
-                        player.sendMessage(ChatColor.YELLOW + other.getName() + " is now invincible!");
-                        other.sendMessage(ChatColor.YELLOW + player.getName() + " has made you invincible!");
-                    } else {
-                        plugin.invinciblePlayers.remove(other.getName());
-                        player.sendMessage(ChatColor.YELLOW + other.getName() + " is no longer invincible.");
-                        other.sendMessage(ChatColor.YELLOW + player.getName() + " has taken away your invincibility.");
-                    }
-                }
-            // Invincibility for one's self
-            } else {
-                if (!plugin.invinciblePlayers.contains(player.getName())) {
-                    plugin.invinciblePlayers.add(player.getName());
-                    player.sendMessage(ChatColor.YELLOW + "You are now invincible!");
-                } else {
-                    plugin.invinciblePlayers.remove(player.getName());
-                    player.sendMessage(ChatColor.YELLOW + "You are no longer invincible.");
-                }
-            }
-        } else if ((split[0].equalsIgnoreCase("/stack")
-                || split[0].equalsIgnoreCase("/;"))
-                    && plugin.hasPermission(player, "/stack")) {
-            ItemStack[] items = player.getInventory().getContents();
-            int len = items.length;
-
-            int affected = 0;
-            
-            for (int i = 0; i < len; i++) {
-                ItemStack item = items[i];
-
-                // Avoid infinite stacks and stacks with durability
-                if (item == null || item.getAmount() <= 0
-                        || ItemType.shouldNotStack(item.getTypeId())) {
-                    continue;
-                }
-
-                // Ignore buckets
-                if (item.getTypeId() >= 325 && item.getTypeId() <= 327) {
-                    continue;
-                }
-
-                if (item.getAmount() < 64) {
-                    int needed = 64 - item.getAmount(); // Number of needed items until 64
-
-                    // Find another stack of the same type
-                    for (int j = i + 1; j < len; j++) {
-                        ItemStack item2 = items[j];
-
-                        // Avoid infinite stacks and stacks with durability
-                        if (item2 == null || item2.getAmount() <= 0
-                                || ItemType.shouldNotStack(item.getTypeId())) {
-                            continue;
-                        }
-
-                        // Same type?
-                        // Blocks store their color in the damage value
-                        if (item2.getTypeId() == item.getTypeId() &&
-                                (!ItemType.usesDamageValue(item.getTypeId())
-                                        || item.getDamage() == item2.getDamage())) {
-                            // This stack won't fit in the parent stack
-                            if (item2.getAmount() > needed) {
-                                item.setAmount(64);
-                                item2.setAmount(item2.getAmount() - needed);
-                                break;
-                            // This stack will
-                            } else {
-                                items[j] = null;
-                                item.setAmount(item.getAmount() + item2.getAmount());
-                                needed = 64 - item.getAmount();
-                            }
-
-                            affected++;
-                        }
-                    }
-                }
-            }
-
-            if (affected > 0) {
-                player.getInventory().setContents(items);
-            }
-
-            player.sendMessage(ChatColor.YELLOW + "Items compacted into stacks!");
-        } else if (split[0].equalsIgnoreCase("/rg")
-                || split[0].equalsIgnoreCase("/region")) {
-            if (split.length < 2) {
-                player.sendMessage(ChatColor.RED + "/region <define|flag|delete|info|add|remove|list|save|load> ...");
-                return true;
-            }
-            
-            String action = split[1];
-            String[] args = new String[split.length - 1];
-            System.arraycopy(split, 1, args, 0, split.length - 1);
-            
-            handleRegionCommand(player, action, args);
-        } else if (split[0].equalsIgnoreCase("/reload")
-                && plugin.hasPermission(player, "/reload")
-                && split.length > 1) {
-            if (split[1].equalsIgnoreCase("WorldGuard")) {
-                LoggerToChatHandler handler = new LoggerToChatHandler(player);
-                handler.setLevel(Level.ALL);
-                Logger minecraftLogger = Logger.getLogger("Minecraft");
-                minecraftLogger.addHandler(handler);
-
-                try {
-                    plugin.loadConfiguration();
-                    plugin.postReload();
-                    player.sendMessage("WorldGuard configuration reloaded.");
-                } catch (Throwable t) {
-                    player.sendMessage("Error while reloading: "
-                            + t.getMessage());
-                } finally {
-                    minecraftLogger.removeHandler(handler);
-                }
-
-                return true;
-            }
-        } else {
-            return false;
-        }
-
-        return true;
-    }
-    
-    /**
-     * Handles a region command.
-     * 
-     * @param player
-     * @param action
-     * @param args
-     */
-    private void handleRegionCommand(Player player, String action, String[] args) {
-        if (!plugin.useRegions) {
-            player.sendMessage(ChatColor.RED + "Regions are disabled.");
-            return;
-        }
-        
-        if (action.equalsIgnoreCase("define")) {
-            if (!canUseRegionCommand(player, "/regiondefine")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
-                return;
-            }
-            
-            if (args.length < 2) {
-                player.sendMessage(ChatColor.RED + "/region define <id> [owner1 [owner2 [owners...]]]");
-                return;
-            }
-            
-            try {
-                String id = args[1].toLowerCase();
-                Plugin wePlugin = plugin.getServer().getPluginManager().getPlugin("WorldEdit");
-                if (plugin == null) {
-                    player.sendMessage(ChatColor.RED + "WorldEdit must be installed and enabled as a plugin.");
-                    return;
-                }
-                
-                WorldEditPlugin worldEdit = (WorldEditPlugin)wePlugin;
-                WorldEditAPI api = worldEdit.getAPI();
-                
-                LocalSession session = api.getSession(player);
-                Region weRegion = session.getRegion();
-                
-                BlockVector min = weRegion.getMinimumPoint().toBlockVector();
-                BlockVector max = weRegion.getMaximumPoint().toBlockVector();
-                
-                ProtectedRegion region = new ProtectedCuboidRegion(min, max);
-                if (args.length >= 3) {
-                    region.setOwners(parseDomainString(args, 2));
-                }
-                plugin.regionManager.addRegion(id, region);
-                plugin.regionLoader.save(plugin.regionManager);
-                player.sendMessage(ChatColor.YELLOW + "Region saved as " + id + ".");
-            } catch (IncompleteRegionException e) {
-                player.sendMessage(ChatColor.RED + "You must first define an area in WorldEdit.");
-            } catch (IOException e) {
-                player.sendMessage(ChatColor.RED + "Region database failed to save: "
-                        + e.getMessage());
-            }
-        } else if (action.equalsIgnoreCase("claim")) {
-            if (!canUseRegionCommand(player, "/regionclaim")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regionclaim permission.");
-                return;
-            }
-            
-            if (args.length < 1) {
-                player.sendMessage(ChatColor.RED + "/region claim <id>");
-                return;
-            }
-            
-            try {
-                String id = args[1].toLowerCase();
-                Plugin wePlugin = plugin.getServer().getPluginManager().getPlugin("WorldEdit");
-                if (plugin == null) {
-                    player.sendMessage(ChatColor.RED + "WorldEdit must be installed and enabled as a plugin.");
-                    return;
-                }
-
-                ProtectedRegion existing = plugin.regionManager.getRegion(id);
-                
-                if (existing != null) {
-                    if (!existing.getOwners().contains(plugin.wrapPlayer(player))) {
-                        player.sendMessage(ChatColor.RED + "You don't own this region.");
-                        return;
-                    }
-                }
-                
-                WorldEditPlugin worldEdit = (WorldEditPlugin)wePlugin;
-                WorldEditAPI api = worldEdit.getAPI();
-                
-                LocalSession session = api.getSession(player);
-                Region weRegion = session.getRegion();
-                
-                BlockVector min = weRegion.getMinimumPoint().toBlockVector();
-                BlockVector max = weRegion.getMaximumPoint().toBlockVector();
-                
-                ProtectedRegion region = new ProtectedCuboidRegion(min, max);
-                
-                if (plugin.regionManager.overlapsUnownedRegion(region, plugin.wrapPlayer(player))) {
-                    player.sendMessage(ChatColor.RED + "This region overlaps with someone else's region.");
-                    return;
-                }
-                
-                region.getOwners().addPlayer(player.getName());
-                
-                plugin.regionManager.addRegion(id, region);
-                plugin.regionLoader.save(plugin.regionManager);
-                player.sendMessage(ChatColor.YELLOW + "Region saved as " + id + ".");
-            } catch (IncompleteRegionException e) {
-                player.sendMessage(ChatColor.RED + "You must first define an area in WorldEdit.");
-            } catch (IOException e) {
-                player.sendMessage(ChatColor.RED + "Region database failed to save: "
-                        + e.getMessage());
-            }
-        } else if (action.equalsIgnoreCase("flag")) {
-            if (!canUseRegionCommand(player, "/regiondefine")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
-                return;
-            }
-            
-            if (args.length < 4) {
-                player.sendMessage(ChatColor.RED + "/region flag <id> <lighter> <none|allow|deny>");
-                player.sendMessage(ChatColor.RED + "Other flags not supported in Bukkit at the moment.");
-                return;
-            }
-            
-            try {
-                String id = args[1].toLowerCase();
-                String flagStr = args[2];
-                String stateStr = args[3];
-                ProtectedRegion region = plugin.regionManager.getRegion(id);
-                
-                if (region == null) {
-                    player.sendMessage(ChatColor.RED + "Could not find a region by that ID.");
-                    return;
-                }
-                
-                AreaFlags.State state = null;
-    
-                if (stateStr.equalsIgnoreCase("allow")) {
-                    state = AreaFlags.State.ALLOW;
-                } else if (stateStr.equalsIgnoreCase("deny")) {
-                    state = AreaFlags.State.DENY;
-                } else if (stateStr.equalsIgnoreCase("none")) {
-                    state = AreaFlags.State.NONE;
-                } else {
-                    player.sendMessage(ChatColor.RED + "Acceptable states: allow, deny, none");
-                    return;
-                }
-                
-                AreaFlags flags = region.getFlags();
-                
-                /*if (flagStr.equalsIgnoreCase("build")) {
-                    flags.allowBuild = state;
-                } else if (flagStr.equalsIgnoreCase("pvp")) {
-                    flags.allowPvP = state;
-                } else if (flagStr.equalsIgnoreCase("tnt")) {
-                    flags.allowTNT = state;
-                } else*/ if (flagStr.equalsIgnoreCase("lighter")) {
-                    flags.allowLighter = state;
-                } else {
-                    player.sendMessage(ChatColor.RED + "Acceptable flags: build, pvp, tnt, lighter");
-                    return;
-                }
-                
-                plugin.regionLoader.save(plugin.regionManager);
-                player.sendMessage(ChatColor.YELLOW + "Region '" + id + "' updated.");
-            } catch (IOException e) {
-                player.sendMessage(ChatColor.RED + "Region database failed to save: "
-                        + e.getMessage());
-            }
-        } else if (action.equalsIgnoreCase("info")) {
-            if (!canUseRegionCommand(player, "/regioninfo")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regioninfo permission.");
-                return;
-            }
-            
-            if (args.length < 2) {
-                player.sendMessage(ChatColor.RED + "/region info <id>");
-                return;
-            }
-    
-            String id = args[1].toLowerCase();
-            if (!plugin.regionManager.hasRegion(id)) {
-                player.sendMessage(ChatColor.RED + "A region with ID '"
-                        + id + "' doesn't exist.");
-                return;
-            }
-    
-            ProtectedRegion region = plugin.regionManager.getRegion(id);
-            AreaFlags flags = region.getFlags();
-            DefaultDomain domain = region.getOwners();
-            
-            player.sendMessage(ChatColor.YELLOW + "Region ID: " + id);
-            player.sendMessage(ChatColor.GRAY + "Type: " + region.getClass().getCanonicalName());
-            player.sendMessage(ChatColor.BLUE + "Build: " + flags.allowBuild.name());
-            player.sendMessage(ChatColor.BLUE + "PvP: " + flags.allowPvP.name());
-            player.sendMessage(ChatColor.BLUE + "TNT: " + flags.allowTNT.name());
-            player.sendMessage(ChatColor.BLUE + "Lighter: " + flags.allowLighter.name());
-            player.sendMessage(ChatColor.LIGHT_PURPLE + "Players: " + domain.toPlayersString());
-            player.sendMessage(ChatColor.LIGHT_PURPLE + "Groups: " + domain.toGroupsString());
-        } else if (action.equalsIgnoreCase("addowner")) {
-            if (!canUseRegionCommand(player, "/regiondefine")
-                    && !canUseRegionCommand(player, "/regionclaim")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
-                return;
-            }
-            
-            if (args.length < 2) {
-                player.sendMessage(ChatColor.RED + "/region addowner <id>");
-                return;
-            }
-    
-            try {
-                String id = args[1].toLowerCase();
-                if (!plugin.regionManager.hasRegion(id)) {
-                    player.sendMessage(ChatColor.RED + "A region with ID '"
-                            + id + "' doesn't exist.");
-                    return;
-                }
-                
-                ProtectedRegion existing = plugin.regionManager.getRegion(id);
-                
-                if (!canUseRegionCommand(player, "/regiondefine")
-                        && !existing.getOwners().contains(plugin.wrapPlayer(player))) {
-                    player.sendMessage(ChatColor.RED + "You don't own this region.");
-                    return;
-                }
-                
-                addToDomain(existing.getOwners(), args, 2);
-                
-                plugin.regionLoader.save(plugin.regionManager);
-                player.sendMessage(ChatColor.YELLOW + "Region updated!");
-            } catch (IOException e) {
-                player.sendMessage(ChatColor.RED + "Region database failed to save: "
-                        + e.getMessage());
-            }
-        } else if (action.equalsIgnoreCase("removeowner")) {
-            if (!canUseRegionCommand(player, "/regiondefine")
-                    && !canUseRegionCommand(player, "/regionclaim")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
-                return;
-            }
-            
-            if (args.length < 2) {
-                player.sendMessage(ChatColor.RED + "/region removeowner <id>");
-                return;
-            }
-    
-            try {
-                String id = args[1].toLowerCase();
-                if (!plugin.regionManager.hasRegion(id)) {
-                    player.sendMessage(ChatColor.RED + "A region with ID '"
-                            + id + "' doesn't exist.");
-                    return;
-                }
-                
-                ProtectedRegion existing = plugin.regionManager.getRegion(id);
-                
-                if (!canUseRegionCommand(player, "/regiondefine")
-                        && !existing.getOwners().contains(plugin.wrapPlayer(player))) {
-                    player.sendMessage(ChatColor.RED + "You don't own this region.");
-                    return;
-                }
-                
-                removeFromDomain(existing.getOwners(), args, 2);
-                
-                plugin.regionLoader.save(plugin.regionManager);
-                player.sendMessage(ChatColor.YELLOW + "Region updated!");
-            } catch (IOException e) {
-                player.sendMessage(ChatColor.RED + "Region database failed to save: "
-                        + e.getMessage());
-            }
-        } else if (action.equalsIgnoreCase("list")) {
-            if (!canUseRegionCommand(player, "/regiondefine")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regiondefine permission.");
-                return;
-            }
-            
-            int page = 0;
-            
-            if (args.length >= 2) {
-                try {
-                    page = Math.max(0, Integer.parseInt(args[1]) - 1);
-                } catch (NumberFormatException e) {
-                    page = 0;
-                }
-            }
-    
-            Map<String,ProtectedRegion> regions = plugin.regionManager.getRegions();
-            int size = regions.size();
-            int pages = (int)Math.ceil(size / (float)CMD_LIST_SIZE);
-            
-            String[] regionIDList = new String[size];
-            int index = 0;
-            for (String id : regions.keySet()) {
-                regionIDList[index] = id;
-                index++;
-            }
-            Arrays.sort(regionIDList);
-            
-            
-            player.sendMessage(ChatColor.RED + "Regions (page "
-                    + (page + 1) + " of " + pages + "):");
-            
-            if (page < pages) {
-                for (int i = page * CMD_LIST_SIZE; i < page * CMD_LIST_SIZE + CMD_LIST_SIZE; i++) {
-                    if (i >= size) break;
-                    player.sendMessage(ChatColor.YELLOW.toString() + (i + 1) + ". " + regionIDList[i]);
-                }
-            }
-        } else if (action.equalsIgnoreCase("delete")) {
-            if (!canUseRegionCommand(player, "/regiondelete")
-                    && !canUseRegionCommand(player, "/regionclaim")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regiondelete permission.");
-                return;
-            }
-            
-            if (args.length < 2) {
-                player.sendMessage(ChatColor.RED + "/region delete <id>");
-                return;
-            }
-    
-            try {
-                String id = args[1].toLowerCase();
-                if (!plugin.regionManager.hasRegion(id)) {
-                    player.sendMessage(ChatColor.RED + "A region with ID '"
-                            + id + "' doesn't exist.");
-                    return;
-                }
-
-                ProtectedRegion existing = plugin.regionManager.getRegion(id);
-                
-                if (!canUseRegionCommand(player, "/regiondelete")
-                        && !existing.getOwners().contains(plugin.wrapPlayer(player))) {
-                    player.sendMessage(ChatColor.RED + "You don't own this region.");
-                    return;
-                }
-                
-                plugin.regionManager.removeRegion(id);
-                plugin.regionLoader.save(plugin.regionManager);
-                player.sendMessage(ChatColor.YELLOW + "Region removed!");
-            } catch (IOException e) {
-                player.sendMessage(ChatColor.RED + "Region database failed to save: "
-                        + e.getMessage());
-            }
-        } else if (action.equalsIgnoreCase("save")) {
-            if (!canUseRegionCommand(player, "/regionsave")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regionsave permission.");
-                return;
-            }
-            
-            try {
-                plugin.regionLoader.save(plugin.regionManager);
-                player.sendMessage(ChatColor.YELLOW + "Region database saved to file!");
-            } catch (IOException e) {
-                player.sendMessage(ChatColor.RED + "Region database failed to save: "
-                        + e.getMessage());
-            }
-        } else if (action.equalsIgnoreCase("load")) {
-            if (!canUseRegionCommand(player, "/regionload")) {
-                player.sendMessage(ChatColor.RED + "You don't have the /regionload permission.");
-                return;
-            }
-            
-            try {
-                plugin.regionLoader.load(plugin.regionManager);
-                player.sendMessage(ChatColor.YELLOW + "Region database loaded from file!");
-            } catch (IOException e) {
-                player.sendMessage(ChatColor.RED + "Region database failed to load: "
-                        + e.getMessage());
-            }
-        } else {
-            player.sendMessage(ChatColor.RED + "/region <define|claim|flag|delete|info|addowner|removeowner|list|save|load> ...");
-        }
-    }
-    
-    /**
-     * Checks for the command or /region.
-     * 
-     * @param player
-     * @param cmd
-     * @return
-     */
-    private boolean canUseRegionCommand(Player player, String cmd) {
-        return plugin.hasPermission(player, "/region")
-                || plugin.hasPermission(player, cmd);
-    }
-    
-    /**
-     * Parse a group/player DefaultDomain specification for areas.
-     * 
-     * @param domain
-     * @param split
-     * @param startIndex
-     */
-    private static void addToDomain(DefaultDomain domain,
-            String[] split, int startIndex) {        
-        for (int i = startIndex; i < split.length; i++) {
-            String s = split[i];
-            Matcher m = groupPattern.matcher(s);
-            if (m.matches()) {
-                domain.addGroup(m.group(1));
-            } else {
-                domain.addPlayer(s);
-            }
-        }
-    }
-    
-    /**
-     * Parse a group/player DefaultDomain specification for areas.
-     * 
-     * @param domain
-     * @param split
-     * @param startIndex
-     */
-    private static void removeFromDomain(DefaultDomain domain,
-            String[] split, int startIndex) {        
-        for (int i = startIndex; i < split.length; i++) {
-            String s = split[i];
-            Matcher m = groupPattern.matcher(s);
-            if (m.matches()) {
-                domain.removeGroup(m.group(1));
-            } else {
-                domain.removePlayer(s);
-            }
-        }
-    }
-    
-    /**
-     * Parse a group/player DefaultDomain specification for areas.
-     * 
-     * @param split
-     * @param startIndex
-     * @return
-     */
-    private static DefaultDomain parseDomainString(String[] split, int startIndex) {
-        DefaultDomain domain = new DefaultDomain();
-        
-        for (int i = startIndex; i < split.length; i++) {
-            String s = split[i];
-            Matcher m = groupPattern.matcher(s);
-            if (m.matches()) {
-                domain.addGroup(m.group(1));
-            } else {
-                domain.addPlayer(s);
-            }
-        }
-        
-        return domain;
-    }
 }

src/com/sk89q/worldguard/domains/DefaultDomain.java

@@ -98,6 +98,7 @@ public class DefaultDomain implements Domain {
     public String toGroupsString() {
         StringBuilder str = new StringBuilder();
         for (Iterator<String> it = groups.iterator(); it.hasNext(); ) {
+            str.append("*");
             str.append(it.next());
             if (it.hasNext()) {
                 str.append(", ");
@@ -105,4 +106,21 @@ public class DefaultDomain implements Domain {
         }
         return str.toString();
     }
+    
+    public String toUserFriendlyString() {
+        StringBuilder str = new StringBuilder();
+        if (players.size() > 0) {
+            str.append(toPlayersString());
+        }
+        
+        if (groups.size() > 0) {
+            if (str.length() > 0) {
+                str.append("; ");
+            }
+            
+            str.append(toGroupsString());
+        }
+        
+        return str.toString();
+    }
 }

src/com/sk89q/worldguard/protection/ApplicableRegionSet.java

@@ -19,7 +19,9 @@
 
 package com.sk89q.worldguard.protection;
 
-import java.util.Map;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.SortedMap;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.AreaFlags.State;
@@ -30,96 +32,150 @@ import com.sk89q.worldguard.protection.AreaFlags.State;
  * @author sk89q
  */
 public class ApplicableRegionSet {
+    private GlobalFlags global;
     private Vector pt;
-    private Map<String,ProtectedRegion> regions;
+    private SortedMap<String,ProtectedRegion> regions;
     
-    public ApplicableRegionSet(Vector pt, Map<String,ProtectedRegion> regions) {
+    /**
+     * Construct the object.
+     * 
+     * @param pt
+     * @param regions
+     * @param global
+     */
+    public ApplicableRegionSet(Vector pt, SortedMap<String,ProtectedRegion> regions,
+            GlobalFlags global) {
         this.pt = pt;
         this.regions = regions;
+        this.global = global;
     }
     
+    /**
+     * Checks if a player can build in an area.
+     * 
+     * @param player
+     * @return
+     */
     public boolean canBuild(LocalPlayer player) {
-        boolean allowed = false;
+        return isFlagAllowed(AreaFlags.FLAG_BUILD, global.canBuild, player);
+    }
+    
+    /**
+     * Checks a flag.
+     * 
+     * @param player
+     * @return
+     */
+    public boolean allowsFlag(String flag) {
+        boolean def = true;
+        
+        if (flag.equals(AreaFlags.FLAG_CHEST_ACCESS)) {
+            def = global.canAccessChests;
+        }
+        
+        return isFlagAllowed(flag, def, null);
+    }
+    
+    /**
+     * Checks to see if a flag is permitted.
+     * 
+     * @param def default state if there are no regions defined
+     * @param player null to not check owners and members
+     * @return
+     */
+    private boolean isFlagAllowed(String flag, boolean def, LocalPlayer player) {
         boolean found = false;
+        boolean allowed = false; // Used for ALLOW override
+        if (player == null) {
+            allowed = def;
+        }
+        int lastPriority = 0;
+
+        // The algorithm is as follows:
+        // While iterating through the list of regions, if an entry disallows
+        // the flag, then put it into the needsClear set. If an entry allows
+        // the flag and it has a parent, then its parent is put into hasCleared.
+        // In the situation that the child is reached before the parent, upon
+        // the parent being reached, even if the parent disallows, because the
+        // parent will be in hasCleared, permission will be allowed. In the
+        // other case, where the parent is reached first, if it does not allow
+        // permissions, it will be placed into needsClear. If a child of
+        // the parent is reached later, the parent will be removed from
+        // needsClear. At the end, if needsClear is not empty, that means that
+        // permission should not be given. If a parent has multiple children
+        // and one child does not allow permissions, then it will be placed into
+        // needsClear just like as if was a parent.
+        
+        Set<ProtectedRegion> needsClear = new HashSet<ProtectedRegion>();
+        Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
         
         for (ProtectedRegion region : regions.values()) {
-            if (!region.contains(pt)) continue;
-            if (region.getFlags().allowBuild == State.DENY) return false;
+            // Ignore non-build regions
+            if (player != null && region.getFlags().get(AreaFlags.FLAG_PASSTHROUGH) == State.ALLOW) {
+                continue;
+            }
+            
+            // Forget about regions that are not covered
+            if (!region.contains(pt)) {
+                continue;
+            }
+            
+            // Allow DENY to override everything
+            if (region.getFlags().get(flag) == State.DENY) {
+                return false;
+            }
+            
+            // Forget about regions that allow it, although make sure the
+            // default state is now to allow
+            if (region.getFlags().get(flag) == State.ALLOW) {
+                allowed = true;
+                found = true;
+                continue;
+            }
+            
+            // Ignore lower priority regions
+            if (found && region.getPriority() < lastPriority) {
+                break;
+            }
+            
+            if (player != null) {
+                if (hasCleared.contains(region)) {
+                    // Already cleared, so do nothing
+                } else {
+                    if (!region.isMember(player)) {
+                        needsClear.add(region);
+                    } else {
+                        // Need to clear all parents
+                        clearParents(needsClear, hasCleared, region);
+                    }
+                }
+            }
             
             found = true;
-
-            if (!allowed && region.getFlags().allowBuild == State.ALLOW) {
-                allowed = true;
+            lastPriority = region.getPriority();
+        }
+        
+        return (found == false ? def : allowed)
+                || (player != null && needsClear.size() == 0);
+    }
+    
+    /**
+     * Clear a region's parents for isFlagAllowed().
+     * 
+     * @param needsClear
+     * @param hasCleared
+     * @param region
+     */
+    private void clearParents(Set<ProtectedRegion> needsClear,
+            Set<ProtectedRegion> hasCleared, ProtectedRegion region) {
+        ProtectedRegion parent = region.getParent();
+        
+        while (parent != null) {
+            if (!needsClear.remove(parent)) {
+                hasCleared.add(parent);
             }
             
-            if (!allowed && region.getOwners().contains(player)) {
-                allowed = true;
-            }
+            parent = parent.getParent();
         }
-        
-        return found ? allowed : true;
-    }
-    
-    public boolean allowsPvP() {
-        for (ProtectedRegion region : regions.values()) {
-            if (!region.contains(pt)) continue;
-            if (region.getFlags().allowBuild == State.DENY) return false;
-        }
-        
-        return true;
-    }
-    
-    public boolean allowsMobDamage() {
-        for (ProtectedRegion region : regions.values()) {
-            if (!region.contains(pt)) continue;
-            if (region.getFlags().allowMobDamage == State.DENY) return false;
-        }
-        
-        return true;
-    }
-    
-    public boolean allowsCreeperExplosions() {
-        for (ProtectedRegion region : regions.values()) {
-            if (!region.contains(pt)) continue;
-            if (region.getFlags().allowCreeperExplosions == State.DENY) return false;
-        }
-        
-        return true;
-    }
-    
-    public boolean allowsTNT() {
-        for (ProtectedRegion region : regions.values()) {
-            if (!region.contains(pt)) continue;
-            if (region.getFlags().allowTNT == State.DENY) return false;
-        }
-        
-        return true;
-    }
-    
-    public boolean allowsLighter() {
-        for (ProtectedRegion region : regions.values()) {
-            if (!region.contains(pt)) continue;
-            if (region.getFlags().allowLighter == State.DENY) return false;
-        }
-        
-        return true;
-    }
-    
-    public boolean allowsFireSpread() {
-        for (ProtectedRegion region : regions.values()) {
-            if (!region.contains(pt)) continue;
-            if (region.getFlags().allowFireSpread == State.DENY) return false;
-        }
-        
-        return true;
-    }
-    
-    public boolean allowsLavaFire() {
-        for (ProtectedRegion region : regions.values()) {
-            if (!region.contains(pt)) continue;
-            if (region.getFlags().allowLavaFire == State.DENY) return false;
-        }
-        
-        return true;
     }
 }

src/com/sk89q/worldguard/protection/AreaFlags.java

@@ -19,7 +19,12 @@
 
 package com.sk89q.worldguard.protection;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 /**
+ * Holds the flags for a region.
  * 
  * @author sk89q
  */
@@ -30,14 +35,103 @@ public class AreaFlags {
         DENY,
     };
 
-    public State allowBuild = State.NONE;
-    public State allowPvP = State.NONE;
-    public State allowMobDamage = State.NONE;
-    public State allowCreeperExplosions = State.NONE;
-    public State allowTNT = State.NONE;
-    public State allowLighter = State.NONE;
-    public State allowFireSpread = State.NONE;
-    public State allowLavaFire = State.NONE;
+    public static final String FLAG_PASSTHROUGH = "z";
+    public static final String FLAG_BUILD = "b";
+    public static final String FLAG_PVP = "p";
+    public static final String FLAG_MOB_DAMAGE = "m";
+    public static final String FLAG_CREEPER_EXPLOSION = "c";
+    public static final String FLAG_TNT = "t";
+    public static final String FLAG_LIGHTER = "l";
+    public static final String FLAG_FIRE_SPREAD = "f";
+    public static final String FLAG_LAVA_FIRE = "F";
+    public static final String FLAG_CHEST_ACCESS = "c";
+    
+    /**
+     * Get the user-friendly name of a flag. If a name isn't known, then
+     * the flag is returned unchanged.
+     * 
+     * @param flag
+     * @return
+     */
+    public static String getFlagName(String flag) {
+        if (flag.equals(FLAG_PASSTHROUGH)) {
+            return "passthrough";
+        } else if (flag.equals(FLAG_BUILD)) {
+            return "build";
+        } else if (flag.equals(FLAG_PVP)) {
+            return "PvP";
+        } else if (flag.equals(FLAG_MOB_DAMAGE)) {
+            return "mob damage";
+        } else if (flag.equals(FLAG_CREEPER_EXPLOSION)) {
+            return "creeper explosion";
+        } else if (flag.equals(FLAG_TNT)) {
+            return "TNT";
+        } else if (flag.equals(FLAG_LIGHTER)) {
+            return "lighter";
+        } else if (flag.equals(FLAG_FIRE_SPREAD)) {
+            return "fire spread";
+        } else if (flag.equals(FLAG_LAVA_FIRE)) {
+            return "lava fire spread";
+        } else if (flag.equals(FLAG_CHEST_ACCESS)) {
+            return "chest access";
+        } else {
+            return flag;
+        }
+    }
+    
+    /**
+     * Gets a flag from an alias. May return null.
+     * 
+     * @param name
+     * @return
+     */
+    public static String fromAlias(String name) {
+        if (name.equalsIgnoreCase("passthrough")) {
+            return FLAG_PASSTHROUGH;
+        } else if (name.equalsIgnoreCase("build")) {
+            return FLAG_BUILD;
+        } else if (name.equalsIgnoreCase("pvp")) {
+            return FLAG_PVP;
+        } else if (name.equalsIgnoreCase("mobdamage")) {
+            return FLAG_MOB_DAMAGE;
+        } else if (name.equalsIgnoreCase("creeper")) {
+            return FLAG_CREEPER_EXPLOSION;
+        } else if (name.equalsIgnoreCase("tnt")) {
+            return FLAG_TNT;
+        } else if (name.equalsIgnoreCase("lighter")) {
+            return FLAG_LIGHTER;
+        } else if (name.equalsIgnoreCase("firespread")) {
+            return FLAG_FIRE_SPREAD;
+        } else if (name.equalsIgnoreCase("lavafirespread")) {
+            return FLAG_LAVA_FIRE;
+        } else if (name.equalsIgnoreCase("chest")) {
+            return FLAG_CHEST_ACCESS;
+        } else {
+            return null;
+        }
+    }
+    
+    private Map<String, State> states = new HashMap<String, State>();
+    
+    public State get(String flag) {
+        State state = states.get(flag);
+        if (state == null) {
+            return State.NONE;
+        }
+        return state;
+    }
+    
+    public void set(String flag, State state) {
+        if (state == State.NONE) {
+            states.remove(flag);
+        } else {
+            states.put(flag, state);
+        }
+    }
+    
+    public Set<Map.Entry<String, State>> entrySet() {
+        return states.entrySet();
+    }
     
     @Override
     public boolean equals(Object obj) {
@@ -46,14 +140,6 @@ public class AreaFlags {
         }
         
         AreaFlags other = (AreaFlags)obj;
-        
-        return other.allowBuild == allowBuild
-                && other.allowPvP == allowPvP
-                && other.allowMobDamage == allowMobDamage
-                && other.allowCreeperExplosions == allowCreeperExplosions
-                && other.allowTNT == allowTNT
-                && other.allowLighter == allowLighter
-                && other.allowFireSpread == allowFireSpread
-                && other.allowLavaFire == allowLavaFire;
+        return other.states.equals(this);
     }
 }

src/com/sk89q/worldguard/protection/CSVDatabase.java

@@ -20,17 +20,20 @@
 package com.sk89q.worldguard.protection;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.io.*;
-
 import au.com.bytecode.opencsv.CSVReader;
 import au.com.bytecode.opencsv.CSVWriter;
 import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.AreaFlags.State;
+import com.sk89q.worldguard.protection.ProtectedRegion.CircularInheritanceException;
+import com.sk89q.worldguard.util.ArrayReader;
 
 /**
  * Represents a protected area database that uses CSV files.
@@ -82,7 +85,7 @@ public class CSVDatabase implements ProtectionDatabase {
                 
                 writer.writeNext(new String[] {
                         id,
-                        "cuboid",
+                        "cuboid.2",
                         String.valueOf(min.getBlockX()),
                         String.valueOf(min.getBlockY()),
                         String.valueOf(min.getBlockZ()),
@@ -90,9 +93,12 @@ public class CSVDatabase implements ProtectionDatabase {
                         String.valueOf(max.getBlockY()),
                         String.valueOf(max.getBlockZ()),
                         String.valueOf(cuboid.getPriority()),
+                        cuboid.getParent() != null ? cuboid.getParent().getId() : "",
                         writeDomains(cuboid.getOwners()),
+                        writeDomains(cuboid.getMembers()),
                         writeFlags(cuboid.getFlags()),
-                        cuboid.getEnterMessage(),
+                        cuboid.getEnterMessage() != null ? cuboid.getEnterMessage() : "",
+                        cuboid.getLeaveMessage() != null ? cuboid.getLeaveMessage() : "",
                         });
             }
         } finally {
@@ -110,6 +116,8 @@ public class CSVDatabase implements ProtectionDatabase {
     public void load() throws IOException {
         Map<String,ProtectedRegion> regions =
                 new HashMap<String,ProtectedRegion>();
+        Map<ProtectedRegion,String> parentSets =
+                new LinkedHashMap<ProtectedRegion, String>();
         
         CSVReader reader = new CSVReader(new FileReader(file));
         
@@ -117,37 +125,78 @@ public class CSVDatabase implements ProtectionDatabase {
             String[] line;
             
             while ((line = reader.readNext()) != null) {
-                if (line.length >= 12) {
-                    String type = line[1];
-                    if (!type.equalsIgnoreCase("cuboid")) {
-                        logger.warning("Only cuboid region types are supported: "
-                                + line);
-                        break;
-                        
+                if (line.length < 2) {
+                    logger.warning("Invalid region definition: " + line);
+                    continue;
+                }
+                
+                String id = line[0].toLowerCase();
+                String type = line[1];
+                ArrayReader<String> entries = new ArrayReader<String>(line);
+                
+                if (type.equalsIgnoreCase("cuboid")) {
+                    if (line.length < 8) {
+                        logger.warning("Invalid region definition: " + line);
+                        continue;
                     }
                     
-                    String id = line[0];
-                    BlockVector min = new BlockVector(
+                    Vector pt1 = new Vector(
                             Integer.parseInt(line[2]),
                             Integer.parseInt(line[3]),
                             Integer.parseInt(line[4]));
-                    BlockVector max = new BlockVector(
+                    Vector pt2 = new Vector(
                             Integer.parseInt(line[5]),
                             Integer.parseInt(line[6]),
                             Integer.parseInt(line[7]));
-                    int priority = Integer.parseInt(line[8]);
-                    String ownersData = line[9];
-                    String flagsData = line[10];
-                    String enterMessage = line[11];
+
+                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
+                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
                     
-                    ProtectedRegion region = new ProtectedCuboidRegion(min, max);
+                    int priority = entries.get(8) == null ? 0 : Integer.parseInt(entries.get(8));
+                    String ownersData = entries.get(9);
+                    String flagsData = entries.get(10);
+                    String enterMessage = nullEmptyString(entries.get(11));
+                    
+                    ProtectedRegion region = new ProtectedCuboidRegion(id, min, max);
                     region.setPriority(priority);
+                    region.setFlags(parseFlags(flagsData));
                     region.setOwners(this.parseDomains(ownersData));
                     region.setEnterMessage(enterMessage);
-                    region.setFlags(parseFlags(flagsData));
                     regions.put(id, region);
-                } else {
-                    logger.warning("Line has invalid: " + line);
+                } else if (type.equalsIgnoreCase("cuboid.2")) {
+                    Vector pt1 = new Vector(
+                            Integer.parseInt(line[2]),
+                            Integer.parseInt(line[3]),
+                            Integer.parseInt(line[4]));
+                    Vector pt2 = new Vector(
+                            Integer.parseInt(line[5]),
+                            Integer.parseInt(line[6]),
+                            Integer.parseInt(line[7]));
+
+                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
+                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
+                    
+                    int priority = entries.get(8) == null ? 0 : Integer.parseInt(entries.get(8));
+                    String parentId = entries.get(9);
+                    String ownersData = entries.get(10);
+                    String membersData = entries.get(11);
+                    String flagsData = entries.get(12);
+                    String enterMessage = nullEmptyString(entries.get(13));
+                    String leaveMessage = nullEmptyString(entries.get(14));
+                    
+                    ProtectedRegion region = new ProtectedCuboidRegion(id, min, max);
+                    region.setPriority(priority);
+                    region.setFlags(parseFlags(flagsData));
+                    region.setOwners(this.parseDomains(ownersData));
+                    region.setMembers(this.parseDomains(membersData));
+                    region.setEnterMessage(enterMessage);
+                    region.setLeaveMessage(leaveMessage);
+                    regions.put(id, region);
+                    
+                    // Link children to parents later
+                    if (parentId.length() > 0) {
+                        parentSets.put(region, parentId);
+                    }
                 }
             }
         } finally {
@@ -157,6 +206,20 @@ public class CSVDatabase implements ProtectionDatabase {
             }
         }
         
+        for (Map.Entry<ProtectedRegion, String> entry : parentSets.entrySet()) {
+            ProtectedRegion parent = regions.get(entry.getValue());
+            if (parent != null) {
+                try {
+                    entry.getKey().setParent(parent);
+                } catch (CircularInheritanceException e) {
+                    logger.warning("Circular inheritance detect with '"
+                            + entry.getValue() + "' detected as a parent");
+                }
+            } else {
+                logger.warning("Unknown region parent: " + entry.getValue());
+            }
+        }
+        
         this.regions = regions;
     }
 
@@ -187,12 +250,20 @@ public class CSVDatabase implements ProtectionDatabase {
      * @return
      */
     private DefaultDomain parseDomains(String data) {
+        if (data == null) {
+            return new DefaultDomain();
+        }
+        
         DefaultDomain domain = new DefaultDomain();
         Pattern pattern = Pattern.compile("^([A-Za-z]):(.*)$");
         
         String[] parts = data.split(",");
         
         for (String part : parts) {
+            if (part.trim().length() == 0) {
+                continue;
+            }
+            
             Matcher matcher = pattern.matcher(part);
             
             if (!matcher.matches()) {
@@ -222,33 +293,32 @@ public class CSVDatabase implements ProtectionDatabase {
      * @return
      */
     private AreaFlags parseFlags(String data) {
+        if (data == null) {
+            return new AreaFlags();
+        }
+        
         AreaFlags flags = new AreaFlags();
         State curState = State.ALLOW;
         
         for (int i = 0; i < data.length(); i++) {
-            char flag = data.charAt(i);
-            if (flag == '+') {
+            char k = data.charAt(i);
+            if (k == '+') {
                 curState = State.ALLOW;
-            } else if (flag == '-') {
+            } else if (k == '-') {
                 curState = State.DENY;
-            } else if (flag == 'b') {
-                flags.allowBuild = curState;
-            } else if (flag == 'p') {
-                flags.allowPvP = curState;
-            } else if (flag == 'm') {
-                flags.allowMobDamage = curState;
-            } else if (flag == 'c') {
-                flags.allowCreeperExplosions = curState;
-            } else if (flag == 't') {
-                flags.allowTNT = curState;
-            } else if (flag == 'l') {
-                flags.allowLighter = curState;
-            } else if (flag == 'f') {
-                flags.allowFireSpread = curState;
-            } else if (flag == 'F') {
-                flags.allowLavaFire = curState;
             } else {
-                logger.warning("Unknown area flag/flag modifier: " + flag);
+                String flag;
+                if (k == '_') {
+                    if (i == data.length() - 1) {
+                        logger.warning("_ read ahead fail");
+                        break;
+                    }
+                    flag = "_" + data.charAt(i + 1);
+                    i++;
+                } else {
+                    flag = String.valueOf(k);
+                }
+                flags.set(flag, curState);
             }
         }
         
@@ -294,6 +364,22 @@ public class CSVDatabase implements ProtectionDatabase {
         return "";
     }
     
+    /**
+     * Returns a null if a string is null or empty.
+     * 
+     * @param str
+     * @return
+     */
+    private String nullEmptyString(String str) {
+        if (str == null) {
+            return null;
+        } else if (str.length() == 0) {
+            return null;
+        } else {
+            return str;
+        }
+    }
+    
     /**
      * Used to write the list of flags.
      * 
@@ -302,14 +388,9 @@ public class CSVDatabase implements ProtectionDatabase {
      */
     private String writeFlags(AreaFlags flags) {
         StringBuilder str = new StringBuilder();
-        str.append(writeFlag(flags.allowBuild, "b"));
-        str.append(writeFlag(flags.allowPvP, "p"));
-        str.append(writeFlag(flags.allowMobDamage, "m"));
-        str.append(writeFlag(flags.allowCreeperExplosions, "c"));
-        str.append(writeFlag(flags.allowTNT, "t"));
-        str.append(writeFlag(flags.allowLighter, "l"));
-        str.append(writeFlag(flags.allowFireSpread, "f"));
-        str.append(writeFlag(flags.allowLavaFire, "F"));
+        for (Map.Entry<String, State> entry : flags.entrySet()) {
+            str.append(writeFlag(entry.getValue(), entry.getKey()));
+        }
         return str.toString();
     }
 

src/com/sk89q/worldguard/protection/DescendingPriorityComparator.java

@@ -0,0 +1,40 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import java.util.Comparator;
+
+class DescendingPriorityComparator implements Comparator<ProtectedRegion> {
+    /**
+     * Compares two regions.
+     * 
+     * @param other
+     * @return
+     */
+    public int compare(ProtectedRegion r1, ProtectedRegion r2) {
+        if (r1.getPriority() == r2.getPriority()) {
+            return 0;
+        } else if (r1.getPriority() > r2.getPriority()) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+}

src/com/sk89q/worldguard/protection/FlatRegionManager.java

@@ -22,7 +22,8 @@ package com.sk89q.worldguard.protection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.LinkedHashMap;
+import java.util.SortedMap;
+import java.util.TreeMap;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 
@@ -37,13 +38,18 @@ public class FlatRegionManager implements RegionManager {
     /**
      * List of protected regions.
      */
-    private Map<String,ProtectedRegion> regions;
+    private SortedMap<String,ProtectedRegion> regions;
+    /**
+     * Global flags.
+     */
+    private GlobalFlags global;
     
     /**
      * Construct the manager.
      */
-    public FlatRegionManager() {
-        regions = new LinkedHashMap<String,ProtectedRegion>();
+    public FlatRegionManager(GlobalFlags global) {
+        regions = new TreeMap<String,ProtectedRegion>();
+        this.global = global;
     }
     
     /**
@@ -54,24 +60,43 @@ public class FlatRegionManager implements RegionManager {
     public Map<String,ProtectedRegion> getRegions() {
         return regions;
     }
+
     
+    /**
+     * Set a list of protected regions.
+     *
+     * @return
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions) {
+        this.regions = new TreeMap<String,ProtectedRegion>(regions);
+    }
     /**
      * Adds a region.
      * 
      * @param id
      * @param region
      */
-    public void addRegion(String id, ProtectedRegion region) {
-        regions.put(id, region);
+    public void addRegion(ProtectedRegion region) {
+        regions.put(region.getId(), region);
     }
     
     /**
-     * Removes a region.
+     * Removes a region and its children.
      * 
      * @param id
      */
     public void removeRegion(String id) {
+        ProtectedRegion region = regions.get(id);
+        
         regions.remove(id);
+        
+        if (region != null) {
+            for (Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
+                if (entry.getValue().getParent() == region) {
+                    removeRegion(entry.getKey());
+                }
+            }
+        }
     }
     
     /**
@@ -93,15 +118,6 @@ public class FlatRegionManager implements RegionManager {
         return regions.get(id);
     }
     
-    /**
-     * Set a list of protected regions.
-     *
-     * @return
-     */
-    public void setRegions(Map<String,ProtectedRegion> regions) {
-        this.regions = regions;
-    }
-    
     /**
      * Get an object for a point for rules to be applied with.
      * 
@@ -109,7 +125,7 @@ public class FlatRegionManager implements RegionManager {
      * @return
      */
     public ApplicableRegionSet getApplicableRegions(Vector pt) {
-        return new ApplicableRegionSet(pt, regions);
+        return new ApplicableRegionSet(pt, regions, global);
     }
     
     /**

src/com/sk89q/worldguard/protection/GlobalFlags.java

@@ -20,22 +20,11 @@
 package com.sk89q.worldguard.protection;
 
 /**
- * Caches the results of the protection to prevent necessary lookups.
+ * Used for default flags.
  * 
  * @author sk89q
  */
-public class CacheManager {
-    /**
-     * Region manager.
-     */
-    private RegionManager manager;
-    
-    /**
-     * Construct the object.
-     * 
-     * @param manager
-     */
-    public CacheManager(RegionManager manager) {
-        this.manager = manager;
-    }
+public class GlobalFlags {
+    public boolean canBuild = true;
+    public boolean canAccessChests = false;
 }

src/com/sk89q/worldguard/protection/ProtectedCuboidRegion.java

@@ -39,12 +39,13 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
     /**
      * Construct a new instance of this cuboid region.
      *
+     * @param id
      * @param pos1
      * @param pos2
      * @param priority
      */
-    public ProtectedCuboidRegion(BlockVector min, BlockVector max) {
-        super();
+    public ProtectedCuboidRegion(String id, BlockVector min, BlockVector max) {
+        super(id);
         this.min = min;
         this.max = max;
     }
@@ -85,6 +86,9 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
         max = pt;
     }
 
+    /**
+     * Checks to see if a point is inside this region.
+     */
     @Override
     public boolean contains(Vector pt) {
         int x = pt.getBlockX();
@@ -94,4 +98,13 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
                 && y >= min.getBlockY() && y <= max.getBlockY()
                 && z >= min.getBlockZ() && z <= max.getBlockZ();
     }
+    
+    /**
+     * Return the type of region as a user-friendly name.
+     * 
+     * @return type of region
+     */
+    public String getTypeName() {
+        return "cuboid";
+    }
 }

src/com/sk89q/worldguard/protection/ProtectedRegion.java

@@ -21,6 +21,7 @@ package com.sk89q.worldguard.protection;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.domains.DefaultDomain;
 
 /**
@@ -28,36 +29,54 @@ import com.sk89q.worldguard.domains.DefaultDomain;
  * 
  * @author sk89q
  */
-public abstract class ProtectedRegion {
+public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
     /**
-     * Area message.
+     * Holds the region's ID.
      */
-    private String enterMessage;
-    /**
-     * List of owners.
-     */
-    private DefaultDomain owners = new DefaultDomain();
+    private String id;
     /**
      * Priority.
      */
     private int priority = 0;
+    /**
+     * Parent region.
+     */
+    private ProtectedRegion parent;
+    /**
+     * List of owners.
+     */
+    private DefaultDomain owners = new DefaultDomain();
+    /**
+     * List of members.
+     */
+    private DefaultDomain members = new DefaultDomain();
     /**
      * Area flags.
      */
     private AreaFlags flags = new AreaFlags();
+    /**
+     * Area message.
+     */
+    private String enterMessage;
+    /**
+     * Area message.
+     */
+    private String leaveMessage;
 
     /**
-     * Construct a new instance of this cuboid region.
+     * Construct a new instance of this region.
      *
      * @param id
-     * @param priority
-     * @param owners
-     * @param enterMessage
      */
-    public ProtectedRegion() {
-        this.priority = 0;
-        this.owners = new DefaultDomain();
-        this.enterMessage = null;
+    public ProtectedRegion(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @return the id
+     */
+    public String getId() {
+        return id;
     }
 
     /**
@@ -74,6 +93,41 @@ public abstract class ProtectedRegion {
         this.priority = priority;
     }
     
+    /**
+     * @return the parent
+     */
+    public ProtectedRegion getParent() {
+        return parent;
+    }
+
+    /**
+     * Set the parent. This checks to make sure that it will not result
+     * in circular inheritance.
+     * 
+     * @param parent the parent to set
+     * @throws CircularInheritanceException 
+     */
+    public void setParent(ProtectedRegion parent) throws CircularInheritanceException {
+        if (parent == null) {
+            this.parent = null;
+            return;
+        }
+        
+        if (parent == this) {
+            throw new CircularInheritanceException();
+        }
+        
+        ProtectedRegion p = parent.getParent();
+        while (p != null) {
+            if (p == this) {
+                throw new CircularInheritanceException();
+            }
+            p = p.getParent();
+        }
+        
+        this.parent = parent;
+    }
+
     /**
      * Se flags.
      * @param flags
@@ -95,6 +149,20 @@ public abstract class ProtectedRegion {
     public void setEnterMessage(String enterMessage) {
         this.enterMessage = enterMessage;
     }
+    
+    /**
+     * @return the leaveMessage
+     */
+    public String getLeaveMessage() {
+        return leaveMessage;
+    }
+
+    /**
+     * @param leaveMessage the leaveMessage to set
+     */
+    public void setLeaveMessage(String leaveMessage) {
+        this.leaveMessage = leaveMessage;
+    }
 
     /**
      * @return the owners
@@ -110,6 +178,67 @@ public abstract class ProtectedRegion {
         this.owners = owners;
     }
 
+    /**
+     * @return the members
+     */
+    public DefaultDomain getMembers() {
+        return members;
+    }
+
+    /**
+     * @param owners the owners to set
+     */
+    public void setMembers(DefaultDomain members) {
+        this.members = members;
+    }
+    
+    /**
+     * Checks whether a player is an owner of region or any of its parents.
+     * 
+     * @param player
+     * @return
+     */
+    public boolean isOwner(LocalPlayer player) {
+        if (owners.contains(player)) {
+            return true;
+        }
+        
+        ProtectedRegion parent = getParent();
+        while (parent != null) {
+            if (parent.getOwners().contains(player)) {
+                return true;
+            }
+            
+            parent = parent.getParent();
+        }
+        
+        return false;
+    }
+    
+    /**
+     * Checks whether a player is a member of the region or any of its parents.
+     * 
+     * @param player
+     * @return
+     */
+    public boolean isMember(LocalPlayer player) {
+        if (owners.contains(player) || members.contains(player)) {
+            return true;
+        }
+        
+        ProtectedRegion parent = getParent();
+        while (parent != null) {
+            if (parent.getOwners().contains(player)
+                    || parent.getMembers().contains(player)) {
+                return true;
+            }
+            
+            parent = parent.getParent();
+        }
+        
+        return false;
+    }
+
     /**
      * Get flags.
      * 
@@ -127,6 +256,29 @@ public abstract class ProtectedRegion {
      */
     public abstract boolean contains(Vector pt);
     
+    /**
+     * Compares to another region.
+     * 
+     * @param other
+     * @return
+     */
+    public int compareTo(ProtectedRegion other) {
+        if (priority == other.priority) {
+            return 0;
+        } else if (priority > other.priority) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+    
+    /**
+     * Return the type of region as a user-friendly, lowercase name.
+     * 
+     * @return type of region
+     */
+    public abstract String getTypeName();
+    
     /**
      * Checks if two region intersects.
      * 
@@ -156,4 +308,13 @@ public abstract class ProtectedRegion {
             throw new UnsupportedIntersectionException();
         }
     }
+    
+    /**
+     * Thrown when setting a parent would create a circular inheritance
+     * situation.
+     * 
+     */
+    public static class CircularInheritanceException extends Exception {
+        private static final long serialVersionUID = 7479613488496776022L;
+    }
 }

src/com/sk89q/worldguard/protection/RegionManager.java

@@ -38,7 +38,7 @@ public interface RegionManager {
      *
      * @return
      */
-    public Map<String,ProtectedRegion> getRegions();
+    public Map<String, ProtectedRegion> getRegions();
     
     /**
      * Set a list of protected regions.
@@ -53,7 +53,7 @@ public interface RegionManager {
      * @param id
      * @param region
      */
-    public void addRegion(String id, ProtectedRegion region);
+    public void addRegion(ProtectedRegion region);
     
     /**
      * Return whether a region exists by an ID.
@@ -71,7 +71,7 @@ public interface RegionManager {
     public ProtectedRegion getRegion(String id);
     
     /**
-     * Removes a region.
+     * Removes a region, including inheriting children.
      * 
      * @param id
      */

src/com/sk89q/worldguard/util/ArrayReader.java

@@ -0,0 +1,44 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.util;
+
+public class ArrayReader<T> {
+    private T[] arr;
+    
+    public ArrayReader(T[] arr) {
+        this.arr = arr;
+    }
+    
+    public T get(int index) {
+        if (arr.length > index) {
+            return arr[index];
+        } else {
+            return null;
+        }
+    }
+    
+    public T get(int index, T def) {
+        if (arr.length > index) {
+            return arr[index];
+        } else {
+            return def;
+        }
+    }
+}

tests/com/sk89q/worldguard/TestPlayer.java

@@ -21,6 +21,7 @@ package com.sk89q.worldguard;
 
 import java.util.Set;
 import java.util.HashSet;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 
 public class TestPlayer extends LocalPlayer {
@@ -44,4 +45,34 @@ public class TestPlayer extends LocalPlayer {
     public boolean hasGroup(String group) {
         return groups.contains(group.toLowerCase());
     }
+
+    @Override
+    public Vector getPosition() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void kick(String msg) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void ban(String msg) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void printRaw(String msg) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public String[] getGroups() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }

tests/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java

@@ -26,17 +26,22 @@ import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.TestPlayer;
 import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.AreaFlags.State;
 
 public class ApplicableRegionSetTest {
     static String COURTYARD_ID = "courtyard";
     static String FOUNTAIN_ID = "fountain";
+    static String NO_FIRE_ID = "nofire";
     static String MEMBER_GROUP = "member";
     static String COURTYARD_GROUP = "courtyard";
 
     Vector inFountain = new Vector(2, 2, 2);
     Vector inCourtyard = new Vector(7, 7, 7);
     Vector outside = new Vector(15, 15, 15);
+    Vector inNoFire = new Vector(150, 150, 150);
     RegionManager manager;
+    ProtectedRegion courtyard;
+    ProtectedRegion fountain;
     TestPlayer player1;
     TestPlayer player2;
 
@@ -47,6 +52,7 @@ public class ApplicableRegionSetTest {
         setUpPlayers();
         setUpCourtyardRegion();
         setUpFountainRegion();
+        setUpNoFireRegion();
     }
     
     void setUpPlayers() {
@@ -62,24 +68,41 @@ public class ApplicableRegionSetTest {
         DefaultDomain domain = new DefaultDomain();
         domain.addGroup(COURTYARD_GROUP);
         
-        ProtectedRegion region = new ProtectedCuboidRegion(
+        ProtectedRegion region = new ProtectedCuboidRegion(COURTYARD_ID,
                 new BlockVector(0, 0, 0), new BlockVector(10, 10, 10));
         AreaFlags flags = new AreaFlags();
-        flags.allowBuild = AreaFlags.State.NONE;
-        flags.allowFireSpread = AreaFlags.State.ALLOW;
+        flags.set(AreaFlags.FLAG_BUILD, State.NONE);
+        flags.set(AreaFlags.FLAG_FIRE_SPREAD, State.ALLOW);
         region.setFlags(flags);
         region.setOwners(domain);
-        manager.addRegion(COURTYARD_ID, region);
+        manager.addRegion(region);
+        
+        courtyard = region;
     }
     
-    void setUpFountainRegion() {
-        ProtectedRegion region = new ProtectedCuboidRegion(
+    void setUpFountainRegion() throws Exception {
+        DefaultDomain domain = new DefaultDomain();
+        domain.addGroup(MEMBER_GROUP);
+        
+        ProtectedRegion region = new ProtectedCuboidRegion(FOUNTAIN_ID,
                 new BlockVector(0, 0, 0), new BlockVector(5, 5, 5));
         AreaFlags flags = new AreaFlags();
-        flags.allowBuild = AreaFlags.State.ALLOW;
-        flags.allowFireSpread = AreaFlags.State.DENY;
+        flags.set(AreaFlags.FLAG_FIRE_SPREAD, State.DENY);
         region.setFlags(flags);
-        manager.addRegion(FOUNTAIN_ID, region);
+        region.setMembers(domain);
+        manager.addRegion(region);
+
+        fountain = region;
+        fountain.setParent(courtyard);
+    }
+    
+    void setUpNoFireRegion() throws Exception {
+        ProtectedRegion region = new ProtectedCuboidRegion(NO_FIRE_ID,
+                new BlockVector(100, 100, 100), new BlockVector(200, 200, 200));
+        AreaFlags flags = new AreaFlags();
+        flags.set(AreaFlags.FLAG_FIRE_SPREAD, State.DENY);
+        region.setFlags(flags);
+        manager.addRegion(region);
     }
     
     @Test
@@ -88,13 +111,17 @@ public class ApplicableRegionSetTest {
         
         // Outside
         appl = manager.getApplicableRegions(outside);
-        assertTrue(appl.allowsFireSpread());
+        assertTrue(appl.allowsFlag(AreaFlags.FLAG_FIRE_SPREAD));
         // Inside courtyard
         appl = manager.getApplicableRegions(inCourtyard);
-        assertTrue(appl.allowsFireSpread());
+        assertTrue(appl.allowsFlag(AreaFlags.FLAG_FIRE_SPREAD));
         // Inside fountain
         appl = manager.getApplicableRegions(inFountain);
-        assertFalse(appl.allowsFireSpread());
+        assertFalse(appl.allowsFlag(AreaFlags.FLAG_FIRE_SPREAD));
+
+        // Inside no fire zone
+        appl = manager.getApplicableRegions(inNoFire);
+        assertFalse(appl.allowsFlag(AreaFlags.FLAG_FIRE_SPREAD));
     }
     
     @Test

tests/com/sk89q/worldguard/protection/CSVDatabaseTest.java

@@ -28,6 +28,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.AreaFlags.State;
 
 public class CSVDatabaseTest {
     @Before
@@ -63,9 +64,9 @@ public class CSVDatabaseTest {
     
     private void checkTestRegion1(ProtectedRegion region) {
         AreaFlags flags = new AreaFlags();
-        flags.allowFireSpread = AreaFlags.State.ALLOW;
-        flags.allowPvP = AreaFlags.State.DENY;
-        flags.allowLighter = AreaFlags.State.DENY;
+        flags.set(AreaFlags.FLAG_FIRE_SPREAD, State.ALLOW);
+        flags.set(AreaFlags.FLAG_PVP, State.DENY);
+        flags.set(AreaFlags.FLAG_LIGHTER, State.DENY);
         region.setFlags(flags);
         
         assertEquals(region.getFlags(), flags);
@@ -75,12 +76,12 @@ public class CSVDatabaseTest {
         BlockVector min = new BlockVector(1, 2, 3);
         BlockVector max = new BlockVector(4, 5, 6);
         
-        ProtectedRegion region = new ProtectedCuboidRegion(min, max);
+        ProtectedRegion region = new ProtectedCuboidRegion("test2", min, max);
         
         AreaFlags flags = new AreaFlags();
-        flags.allowFireSpread = AreaFlags.State.ALLOW;
-        flags.allowPvP = AreaFlags.State.DENY;
-        flags.allowLighter = AreaFlags.State.DENY;
+        flags.set(AreaFlags.FLAG_FIRE_SPREAD, State.ALLOW);
+        flags.set(AreaFlags.FLAG_PVP, State.DENY);
+        flags.set(AreaFlags.FLAG_LIGHTER, State.DENY);
         region.setFlags(flags);
         
         DefaultDomain domain = new DefaultDomain();
@@ -101,12 +102,12 @@ public class CSVDatabaseTest {
         BlockVector min = new BlockVector(7, 8, 9);
         BlockVector max = new BlockVector(10, 11, 12);
         
-        ProtectedRegion region = new ProtectedCuboidRegion(min, max);
+        ProtectedRegion region = new ProtectedCuboidRegion("test2", min, max);
         
         AreaFlags flags = new AreaFlags();
-        flags.allowFireSpread = AreaFlags.State.DENY;
-        flags.allowPvP = AreaFlags.State.ALLOW;
-        flags.allowMobDamage = AreaFlags.State.DENY;
+        flags.set(AreaFlags.FLAG_FIRE_SPREAD, State.ALLOW);
+        flags.set(AreaFlags.FLAG_PVP, State.ALLOW);
+        flags.set(AreaFlags.FLAG_LIGHTER, State.DENY);
         region.setFlags(flags);
         
         DefaultDomain domain = new DefaultDomain();

worldguard-blacklist.txt

@@ -1,90 +0,0 @@
-#
-# This is the blacklist for WorldGuard. Comments start with # and they
-# are ignored so you can put your own notes.
-#
-# Format:
-# [item1,item2]
-# option1=options
-# event1=whatToDo1,whatToDo2,whatToDo3
-# event2=whatToDo1,whatToDo2
-#
-# Example to block ore and catch some events:
-# [coalore,goldore,ironore]
-# on-destroy-with=deny,log,kick
-# on-place=deny,tell
-#
-# Options:
-# - ignore-groups (comma-delimited 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:
-# - on-destroy (when a block of this type is being destroyed)
-# - 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)
-# - on-use (an item like a lighter is being used)
-# - on-right-click (the block is right clicked -- curently INEFFECTIVE)
-# - on-drop (the item is being dropped from the player's inventory)
-# - on-acquire (the item enters a player's inventory via some method)
-#
-# Actions (for events):
-# - deny (deny completely)
-# - notify (notify admins)
-# - log (log to console/file/database)
-# - tell (tell a player that that's not allowed)
-# - kick (kick player)
-# - ban (ban player)
-#
-# With the on-acquire event, it will completely block item pick ups
-# (the item will still be on the ground) if you use 'deny' but the other
-# actions (notify, log, etc.) won't do anything. However, if the player
-# receives the item via a different method (i.e. from a chest), all actions
-# will work although the item is removed after a short delay rather than
-# blocked from the beginning (as it is part client-side).
-#
-# Users with the /worldguardnotify permission will be receive notifications.
-#
-# -------------
-#
-# You can have the same block or item used in two different sections and
-# they will both apply:
-#
-# [goldblock]
-# ignore-groups=vip
-# on-destroy=deny
-# [goldblock]
-# ignore-groups=admins
-# on-destroy=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-destroy 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 to remove # in front if you want them
-# to work for you!
-
-# Deny lava buckets
-#[lavabucket]
-#ignore-groups=admins,mods
-#on-use=deny,tell
-
-# Deny lighter usage
-#[259]
-#on-use=deny,tell
-
-# Deny some ore
-#[coalore,goldore,ironore]
-#ignore-groups=admins,mods
-#on-destroy=notify,deny,log
-
-#[cobblestone]
-#on-place=deny,tell,log
-
-#[lever]
-#on-break=deny,tell

worldguard.properties

@@ -1,108 +0,0 @@
-#
-# WorldGuard configuration
-#
-# This is a starter copy of WorldGuard's configuration so you can configure
-# WorldGuard right from the beginning. Copy it into your server folder
-# (into where server.properties resides) and edit the file as your desire.
-#
-
-# Display a summary of WorldGuard's core protection features (lava fire
-# disable and others) when Worldguard starts up.
-summary-on-start=true
-
-# Toggle the item durabiltiy fix
-item-durability=true
-
-# Simulate the sponge from Classic. It removes water and prevents water from
-# flowing into an area containing sponges. Use this to protect circuits
-# or to assist in underwater projects.
-simulate-sponge=false
-sponge-radius=3
-
-# Simulate classic water. Water will spread infinitely. Be aware that this
-# may likely flood your server.
-classic-water=false
-
-# Allow the placement of portal blocks anyway.
-allow-portal-anywhere=false
-
-# Prevent gravel from falling.
-no-physics-gravel=false
-
-# Prevent sand from falling.
-no-physics-sand=false
-
-# Kick the older player if a player attempts to join again without first
-# logging out the first instance.
-enforce-single-session=true
-
-# List of items to destroy on drop. You can also accomplish this using
-# the blacklist.
-item-drop-blacklist=
-
-# Simple prevention
-block-creepers=false
-block-lighter=false
-block-tnt=false
-
-# Login protection prevents players from getting any damage for a few
-# seconds after joining the server.
-login-protection=3
-
-# Spawn protection prevents players from getting any damage after spawning
-# (after dying).
-spawn-protection=0
-
-# This is an deprecated feature to fix a bug. This kicks a user once the
-# player dies and attemtps to respawn. The player can then still rejoin
-# and be alive.
-kick-on-death=false
-
-# Disable various ways of damage. If you want to give someone invincibility
-# or the ability to breathe under water, create the groups wg-invincible
-# and wg-amphibious respectively and apply them to users as needed.
-disable-fall-damage=false
-disable-lava-damage=false
-disable-fire-damage=false
-disable-water-damage=false
-disable-suffocation-damage=false
-
-# Teleports player when s/he is suffocating. This can be abused to get
-# through ceilings.
-teleport-on-suffocation=false
-
-# Disable fire spreading between blocks. Note that this does not prevent
-# fire damage -- it only prevents fire spread.
-disable-all-fire-spread=false
-
-# List blocks that fire should not spread to or between. Cloth and wood
-# are some good examples.
-disallowed-fire-spread-blocks=
-
-# Prevent lava from starting fires.
-disable-lava-fire=true
-
-# List of blocks that lava is allowed to spread onto.
-allowed-lava-spread-blocks=
-
-# List of blocks that should not be destroyed by water (Redstone wire,
-# minecart tracks, flowers, etc.).
-disable-water-damage-blocks=
-
-# Control where to log blacklist events to. You can use multiple log
-# methods as you please.
-log-console=true
-log-database-dsn=jdbc\:mysql\://localhost\:3306/minecraft
-log-database-pass=
-log-database-table=blacklist_events
-log-database-user=root
-log-database=false
-log-file-open-files=10
-log-file-path=worldguard/logs/%Y-%m-%d.log
-log-file=false
-
-# On death options.
-teleport-to-home-on-death=false
-exact-respawn=false
-
-#EOF

worldguard.updatr

@@ -1,5 +0,0 @@
-name = WorldGuard
-version = %version%
-url = updatr.update.sk89q.com/worldguard.updatr
-file = cloud.github.com/downloads/sk89q/worldguard/worldguard-%version%.zip
-notes =