Updated CHANGELOG.txt.

.gitattributes

@@ -1,2 +0,0 @@
-*.java   diff=java
-

.gitignore

@@ -1,6 +0,0 @@
-.classpath
-.project
-.settings
-target
-
-.DS_Store

.travis.yml

@@ -1,7 +0,0 @@
-language: java
-jdk:
-  - oraclejdk7
-  - openjdk7
-  - openjdk6
-notifications:
-  email: false

CHANGELOG.txt

@@ -1,236 +1,6 @@
-5.6:
-- Added official support for Minecraft 1.4. Support for 1.3.2 (and below) is still
-    provided in this release.
-- Added support for new and existing explosion types.
-- Added support for blocking withers with the following settings:
-    mobs:
-        block-wither-explosions: false
-        block-wither-block-damage: false
-        block-wither-skull-explosions: false
-        block-wither-skull-block-damage: true
-- Added support for blocking item frames (and their use) in protected regions.
-- Added item frame destruction region flags (if you wish to disable item frame 
-    destruction completely).
-- (Re-)added support for priority R-tree region indexes. This means quicker region lookup,
-    and better support for servers with thousands of regions.
-- Improved /region info output for -g group flags.
-- Allowed removing of -g group flags with /region flag.
-- Allowed /region flag to set group and value at once.
-- Deleting a region flag now also deletes group flag.
-- Fixed detection of attack by projectiles to be more accurate.
-- Fixed support for saving non-string flags in the MySQL region support.
-- Fixed spurious comma in "Flags:" /region info output.
-- Fixed players who are not in god mode not receiving damage in PVP areas from
-    enderpearls.
-- Players will now be told that they are in a no-PvP area if they are in one and
-    attempting to attack someone, or that the player they are attacking is in a
-    no-PvP area, if that is the case instead.
-- Fixed an issue where region.getId() was lowercase'd each pass of a for loop in
-    MySQLDatabase.updatePoly2dPoints().
-- Fixed mob damage from projectiles not being properly blocked in regions where
-    applicable.
-- Changed default region wand to leather (#334).
-
-Thank you to the following individuals for their contribution:
-thvortex, Rutr, Glitchfinder, and DarthAndroid.
-
-5.5.4:
-- Minecraft 1.3 support.
-- Fixed /stack dupe bugs.
-- Added regions.use-creature-spawn-event.
-- Update for Async chat issue.
-- Add use flag to cakes.
-- Report number of plugins loaded in report writer.
-- Updated fireblal item blocking.
-- Fixed permissions for /region reload.
-
-5.5.3:
-- Added game mode flag.
-- Added item drop pickup flag to regions.
-- Added support for fireball item blocking (385).
-- Added configuration option to allow creature spawns from plugins.
-- Added host key check.
-- Added a new line split feature to region greetings.
-- Prevented commands in the allow commands list from being blocked and
-    vice versa.
-
-5.5.2:
-- Added potion-splash flag to block splash potions
-- Add entity-painting-destroy which can be used to prevent entities from destroying
-    paintings (skeletons firing arrows)
-- Added send-chat and receive-chat flags
-- Fixed having regions in multiple worlds with the same name not working with MySQL
-- A cancellable event is now fired if WorldGuard disallows PvP. (for developers!)
-- Made /region setparent check worldguard.region.setparent.own/member.<parent> instead
-    of worldguard.region.setparent.own/member.<child>.
-- Allowed passing #<index> in place of a region ID, where <index> is the index as
-    displayed by /region list.
-- Fixed an error that occured when clearing a non-existant region's parent.
-- Added a -s flag to /region teleport, which sends you to the spawn point instead of the
-    teleport point of a region.
-- Added region/role-based permissions to /region teleport.
-- BREAKING CHANGE: Added a LocationFlag class and made the teleport and spawn flags
-    use it.
-- /region info -s now selects the region being queried.
-- Added /region teleport <id>.
-- Vector flags can now be set to the current location with the value "here" and to a
-    specific position with x,y,z.
-- Made /region info show the region you're in if you don't specify an id explicitly.
-- Prevent block ignition from lightning strikes if lightning is blocked in region. Fixes
-    #1175
-- Correctly check both WEPIF and superperms in WorldGurdPlugin.broadcastNotification()
-- Destroy fire blocks when fire-spread is disallowed
-- Added a construct flag that can be used to restrict block placing/destroying in zones
-    to certain roles.
-- Added FallingSand to list of intensive entities to be removed with /halt-activiy.
-- Replaced all usage of CreatureType by EntityType.
-- Updated to support Bukkit 1.2-R0.3 and newer
-- Made auto-god-mode disabled by default again.
-- Added sign protection check disable.
-- Cleaned up javadoc, deprecated duplicate methods, other cleanup
-- Added a RegionGroupFlag to evey region flag Using the /region flag command with -g,
-    the region group that the region flag applies to can be set.
-
-5.5.1:
-- Fixed attacking with arrows from non-PVP to PVP areas
-- Compatibility with Bukkit 1.1-R5
-- Removed broken suppress-tick-sync-warnings config option. See bukkit.yml's setings.warn-on-overload option instead.
-- Add region and 'can build' information to CommandBook's /whois
-
-Contributions thanks to: NolanSyKinsley
-
-5.5:
-- Removed WorldEdit.jar from the classpath to stop conflicts with Bukkit's plugin loader
-- Now using Bukkit's tagged logging
-- Updated to new event system
-- Flush player flag state cache on world change
-- Improved compatibility with versions of CommandBook without GodComponent and updated pom dep for 2.0
-- Added MySQL region storage method.
-- Made explosions display their animations even when the event was blocked.
-- Added fallback support for those who don't have a version of CommandBook with GodComponent
-- Added LIGHTNING flag to DefaultFlag's flagsList Fixes #1026
-- Removed /god, /heal, /locate, and /stack from WorldGuard to CommandBook. CommandBook is now checked to see whether a player is godded.
-- Removed remaining usages of org.bukkit.util.config.Configuration
-- Removed some unused configuration options
-- Added permission worldguard.region.wand to the region wand
-- Fixed ProtectedRegion.compareTo.
-- Fixed FlatRegionManager.getApplicableRegions to return parent regions as well.
-- Added exp-drops flag to disable experience drops per-region.
-- Fixed some warnings.
-- Updated dependency version for WorldGuard from 5.0 to 5.1-SNAPSHOT.
-- Added support for fireballs shot by players being blocked by the PVP flag.
-- Now using dynamic command registration
-- Split off ender dragon block damage from creeper block damage.
-
-Contributions thanks to: narthollis, DarkArc, Wolvereness, and skeight
-
-5.4:
-- Fixed configuration generation on Windows
-- Fixed intersection calculation for regions
-- Fixed timer and feeding delay for food flags
-- Fixed region managers not being created properly (This caused errors related to CREATURE_SPAWN)
-- Added support for Minecraft 1.0.1 blocks
-- Added support for enchantments and tool damage (worldguard.stack.damaged is the node) with /stack
-- Made being in the wg-invincible group respect the configuration's auto-invincible setting
-- Added per-group region claim limit maximum
-- Added worldguard.region.addowner.unclaimed.* permission for non-economy region 'buying'
-- Checking allowed/blocked commands now occurs earlier to override more plugins
-- Made PVP flag check whether either player is in a pvp deny region for blocking
-
-Contributions thanks to: epuidokas, wizjany, Turtle9598, and DerFlash
-
-5.3:
-- Added new config options and flags to better handle explosions of all types
-- Added config options and flags for snow, ice, mushroom spread, grass spread,
-    and leaf decay
-- Added min and max health flags to clamp the values for the existing healing
-    flags
-- Added hunger flags similar to the existing healing flags
-- Added an option to disable the use of the move event. This can boost
-    performance on large servers but will disable the greeting/farewell
-    and entry/exit flags
-- Added flag to prevent pistons (including those that are outside the
-    region, but would affect blocks inside the region)
-- Added a /wg flushstates [player] command to free players stuck in a
-    region that was exit-deny but no longer exists or the flag was removed
-- Added a config option to disable xp orb dropping
-- Added config option to disable redstone wire obsidian generators
-- Added a vehicle-destroy flag
-- Added enderman protection config and flag
-- Allowed and blocked command flags will now fall back to the global region
-- The worldguard.region.flag.own/member permissions are now
-    worldguard.region.flag.regions.own/member! Please change your permissions
-    accordingly.
-- Made //stack respect max stack sizes unless the player has the
-    worldguard.stack.illegitimate permission
-- Setting invincibility flag to deny will override god mode unless the player
-    has worldguard.god.override-regions
-- The sleep flag will now prevent beds in the nether from
-    exploding if set to deny
-- Existing regions can no longer be accidentally overwritten.
-    Use /region redefine to move an existing region.
-- The info command will now sort players alphabetically
-- Priming TNT by punching it with flint and steal should throw a blacklist
-    event (consistent with old Minecraft versions)
-- The /stoplag command will now remove xp orbs
-- Permissions system will use per-world permissions if the provider supports it
-- Players in vehicles are now subject to entry/exit and greeting/farewell flags
-- Fixed interact blacklist event not logging correctly
-- Fixed heal flag taking effect half a block northeast of the region
-- Fixed a infinite sign dropping bug
-- Fixed players being able to douse fire by punching it in regions they
-    couldn't build it
-- Fixed players being able to eat protected cake
-- Fence gate usage can be blocked with the use flag
-- Fixed chests being unprotected when they should be in 1.8
-- Fixed weather config settings not applying when a world was loaded
-- Fixed explosion handling in certain cases
-- Fixed arrows working in non-pvp zones
-- Fixed buckets working on the border of protected regions in certain cases
-Contributions thanks to:
-wizjany, zml2008, imjake9, Droolio, epuidokas,
-EduardBaer, TomyLobo, and halvors
-
-5.2.2:
-- Changed configuration saving so empty lists will be added to
-    the configuration files.
-
-5.2.1:
-- Add region bounds to /region info
-- Added the ability to add owners/members to the global region for
-    handling guest groups. Now if there's owners or members on the global
-    region, then those  that are not on the list cannot build.
-- Fixed some flag algorithm issues.
-- API: Fixed DefaultDomain.size() not counting players.
-- API: Undeprecated ApplicableRegionSet.allows(StateFlag).
-
-5.2:
-- Gave the ability to use color colors and macros in greeting
-    and farewell messages.
-- Added disable-ice-melting, disable-snow-formation, disable-mushroom-spread,
-    disable-snow-melting, disable-ice-formation.
-- Added paintings to blacklist support.
-- Added default.disable-health-regain.
-- Added auto-invincible-permission setting, which lets you use the permission
-    'worldguard.auto-invincible' to become invincible on join automatically.
-- Flames won't appear if you are /god'ed now. 
-- Added blocked-cmds region flag to block commands.
-- Added allowed-cmds region flag to whitelist commands.
-- Added entry region flag to block entry. Use entry-group to determine who
-    this affects.
-- Added exit region flag to block exit. Use exit-group to determine who
-    this affects.
-- Made negative healing possible via the healing flag.
-- Changed the configuration header messages to be more helpful to new users.
-- Added a warning about modifying region files by hand.
-- Improved the API for plugin developers.
-
-5.1:
-- A lot of changes.
-
-4.0-alpha1:
-- This release is only to fix WorldGuard for Bukkit. Ignore the 4.0
-    label. Just move along. Nothing to see.
+3.2.3:
+- Updated for recent Bukkit builds. Thank Zenexer for changes.
+- Added suppress-tick-sync-warnings.
 
 3.2.2:
 - Changed disable-water-damage to disable-drowning-damage.

CONTRIBUTING.md

@@ -1,69 +0,0 @@
-Contributing
-============
-
-Thank you for your interest in contributing to WorldGuard! We appreciate your 
-effort, but to make sure that the inclusion of your patch is a smooth process, we
-ask that you make note of the following guidelines.
-
-* **Follow the [Oracle coding conventions](http://www.oracle.com/technetwork/java/codeconv-138413.html).**
-  We can't stress this enough; if your code has notable issues, it may delay
-  the process significantly.
-* **Target Java 6 for source and compilation.** Make sure to mark methods with
-  ` @Override` that override methods of parent classes, or that implement
-  methods of interfaces (Java 6+).
-* **Use only spaces for indentation.** Our indents are 4-spaces long, and tabs
-  are unacceptable.
-* **Wrap code to a 89 column limit.** We do this to make side by side diffs
-  and other such tasks easier. Ignore this guideline if it makes the code
-  too unreadable.
-* **Write complete Javadocs.** Do so only for public methods, and make sure
-  that your `@param` and `@return` fields are not just blank.
-* **Don't tag classes with @author.** Some legacy classes may have this tag,
-  but we are phasing it out.
-* **Make sure the code is efficient.** One way you can achieve this is to spend
-  around ten minutes to think about what the code is doing and whether it
-  seems awfully roundabout. If you had to copy the same large piece of
-  code in several places, that's bad.
-* **Keep commit summaries under 70 characters.** For more details, place two
-  new lines after the summary line and write away!
-* **Test your code.** We're not interested in broken code, for the obvious reasons.
-* **Write unit tests.** While this is strictly optional, we recommend it for
-  complicated algorithms.
-
-
-Checklist
----------
-
-Ready to submit? Perform the checklist below:
-
-1. Have all tabs been replaced into four spaces? Are indentations 4-space wide?
-2. Have I written proper Javadocs for my public methods? Are the @param and
-   @return fields actually filled out?
-3. Have I `git rebase`d my pull request to the latest commit of the target
-   branch?
-4. Have I combined my commits into a reasonably small number (if not one)
-   commit using `git rebase`?
-5. Have I made my pull request too large? Pull requests should introduce
-   small sets of changes at a time. Major changes should be discussed with
-   the team prior to starting work.
-6. Are my commit messages descriptive?
-
-You should be aware of [`git rebase`](http://learn.github.com/p/rebasing.html).
-It allows you to modify existing commit messages, and combine, break apart, or
-adjust past changes.
-
-Example
--------
-
-This is **GOOD:**
-
-    if (var.func(param1, param2)) {
-        // do things
-    }
-
-This is **EXTREMELY BAD:**
-
-    if(var.func( param1, param2 ))
-    {
-        // do things
-    }

README.html

@@ -1,232 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>${project.name} ${version}</title>
-<link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Ropa+Sans" rel="stylesheet" type="text/css">
-<style>
-body {
-    margin: 0;
-    padding: 3em 1em;
-    background: #efefef;
-    color: #333;
-    line-height: 1.5;
-}
-#wrapper {
-    width: 600px;
-    margin: auto;
-}
-body, th, td, input {
-    font: 14px 'Source Sans Pro', Arial, sans-serifsans-serif;
-}
-.section {
-	background: #fff;
-	position: relative;
-	padding: 2em 2.4em;
-	margin: 3em auto 4em auto;
-    width: 80%;
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-}
-.section:before, .section:after {
-	content: "";
-	position: absolute;
-	z-index: -2;
-}
-.section {
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-.section:before, .section:after {
-	bottom: 15px;
-	left: 10px;
-	width: 50%;
-	height: 20%;
-	max-width: 300px;
-	max-height: 100px;
-    -webkit-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
-    -moz-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
-    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
-    -webkit-transform: rotate(-1deg);
-    -moz-transform: rotate(-1deg);
-    -ms-transform: rotate(-1deg);
-    -o-transform: rotate(-1deg);
-    transform: rotate(-1deg);
-}
-.section:after {
-    right: 10px;
-    left: auto;
-    -webkit-transform: rotate(1deg);
-    -moz-transform: rotate(1deg);
-    -ms-transform: rotate(1deg);
-    -o-transform: rotate(1deg);
-    transform: rotate(1deg);
-}
-a:link, a:visited {
-    color: #0004b2;   
-    text-decoration: none;
-}
-a:hover {
-    color: #ac0000;
-    text-decoration: none;
-    border-bottom: 1px solid #999;
-}
-h1 {
-    font: 2.7em 'Ropa Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif;
-    color: #000;
-    margin: 0 0;
-    padding: 0 0 0.2em 0;
-    font-weight: normal;
-    text-align: center;
-    text-shadow: 2px 2px #FFF;
-}
-h2 {
-    font-size: 1.3em;
-    color: #FFF;
-    margin: -2.5em 0 0.8em 0;
-    float: left;
-    background: #0049FF;
-    padding: 0.4em 0.8em;
-    border-radius: 0.2em;
-    font-weight: normal;
-    text-align: center; 
-}
-h3 {
-    text-transform: uppercase;
-    font-weight: bold;
-}
-h2 + * {
-    clear: both;
-}
-@media (max-width: 650px) {
-    #wrapper {
-        width: 100%;
-    }
-}
-</style>
-</head>
-<body>
-
-<div id="wrapper">
-    <h1>${project.name} ${version}</h1>
-    <div class="section">
-        <h2>Getting Started</h2>
-        <p>
-            Thanks for choosing ${project.name}! When you first install ${project.name},
-            nothing will be enabled, so you will need to switch on the features
-            that you need to use, whenever it is convenient for you.
-        </p>
-        <ul>
-            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Installation">How do I install ${project.name}?</a></li>
-            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Upgrading">How do I update ${project.name}?</a></li>
-            <li><a href="http://wiki.sk89q.com/wiki/${project.name}#Usage">How do I use ${project.name}?</a></li>
-        </ul>
-        <p>
-            Need help?
-            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
-        </p>
-    </div>
-    <div class="section">
-        <h2>Common Issues</h2>
-        
-        <h3>What are the other files that come with the download?</h3>
-        <p>
-            Inside the folder "contrib" of the download are the following files:
-        </p>
-        <ul>
-            <li>blacklist_table.sql is for using a database with the 
-              <a href="http://wiki.sk89q.com/wiki/${project.name}/Blacklist">blacklist feature</a>.</li>
-            <li>region_storage.sql is for using a database with the
-                <a href="http://wiki.sk89q.com/wiki/${project.name}/Regions">region protection feature</a>.</li>
-            <li>region_storage_update_20110325.sql is for updating your region protection
-                database (if you're using it) if your database was made before March 25, 2011.</li>
-        </ul>
-        
-        <h3>${project.name} doesn't seem to work.</h3>
-        <p>
-            Two common mistakes include forgetting to install WorldEdit
-            (${project.name} needs it), or making
-            a syntax error in one of ${project.name}'s configuration files (this is very
-            fatal unfortunately, and can be caused by a single character typed in the wrong place). Try 
-            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">asking in IRC</a>
-            to see whether anyone can help you.
-        </p>
-        
-        <h3>How do I protect my spawn, or another area?</h3>
-        <p>
-            Read the <a href="http://wiki.sk89q.com/wiki/${project.name}/Regions/Tutorial">area protection tutorial</a>
-            on our wiki. For more detailed information, be sure to read about
-            <a href="http://wiki.sk89q.com/wiki/WorldGuard/Regions">region protection on the wiki</a>. Note
-            that if you can't build in spawn, don't forget that Minecraft comes with its own
-            limited spawn protection that you have to disable (see below).
-        </p>
-        
-        <h3>I or others don't have permission to build.</h3>
-        <p>
-            Unless you copied configuration files from an older installation of 
-            ${project.name}, your problem is either caused by another plugin, or by not
-            disabling the built-in spawn protection of the Minecraft server.
-        </p>
-        
-        <h3>No one can build in a region I made!</h3>
-        <p>
-            Make sure that:
-        </p>
-        <ul>
-            <li>You didn't change the 'build' flag, because protection is on by default
-                when a new region is made. Setting the build flag to 'deny' means that
-                no one can modify the things inside the region.</li>
-            <li>That you added the player as an owner or member of the region. If you are using
-                a group (g:groupName), you may have to give the group the permission of
-                group.groupName for ${project.name} to recognize it.</li>
-            <li>That you disabled spawn protection. The Minecraft server has an automatic
-                spawn protection feature where only 'ops' can build in a definable
-                radius around spawn (by default, it is 16 blocks). If you are on Minecraft
-                1.4 or newer, edit "spawn-protection" in server.properties; otherwise, modify bukkit.yml
-                and change the spawn-radius setting.</li>
-            <li>That it's not another plugin causing you trouble. The error messages of ${project.name} are of
-                a dark red shade. If the color of the "no permission" message is not
-                that color, it is not ${project.name}.</li>
-        </ul>
-        
-        <h3>Everyone can build in a region I made!</h3>
-        <p>
-            Make sure that:
-        </p>
-        <ul>
-            <li>You didn't change the 'build' flag, because protection is on by default
-                when a new region is made. Setting the build flag to 'allow' means that
-                anyone can modify the things inside the region.</li>
-            <li>That it's not caused by another plugin. If players are getting a dark red
-                permission denied message, but they can still build, another plugin
-                is likely causing the conflict.</li>
-        </ul>
-        
-        <h3>Where do I report bugs or suggest ideas?</h3>
-        <p>
-            Make sure you are using the latest version of ${project.name}, try asking in
-            IRC first (see "Need help?" above) if it's a problem, and if you think you've
-            found a bug or have a great suggestion to provide, please
-            report it to <a href="http://youtrack.sk89q.com/issues/WORLDGUARD">our issue tracker</a>.
-        </p>
-        
-        <p>
-            Still need help?
-            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
-        </p>
-    </div>
-    <div class="section">
-        <h2>Contributing</h2>
-        <p>
-            Did you know that ${project.name} is open source? That means that you can
-            read the code and learn from it, as well as modify it and submit back
-            changes to help the community!
-        </p>
-        <ul>
-            <li><a href="https://github.com/sk89q/worldguard">View the source code</a></li>
-            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Development">More information</a></li>
-        </ul>
-    </div>
-</div>
-</body>
-</html>

README.md

@@ -1,35 +0,0 @@
-![WorldGuard](http://static.sk89q.com/readme/worldguard.png)
-==========
-
-WorldGuard is a toolbox of various functions, useful for multiplayer servers, that lets you:
-
-* Protect your server from a number of problems.
-* Block fire spread, lava spread, endermen, and more.
-* Flag areas as "no PVP" or "no TNT."
-* Assign ownership to areas so only selected individuals can build.
-* Use a number of useful commands.
-
-WorldGuard is open source and is available under the GNU General Public License v3.
-
-Compiling
----------
-
-The project is written for Java 6 and our build process makes use of [Maven](http://maven.apache.org). Detailed compilation information [can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#Compiling).
-
-Dependencies are automatically handled by Maven.
-
-Contributing
-------------
-
-We happily accept contributions, especially through pull requests on GitHub. Submissions 
-must be licensed under the GNU General Public License v3.
-
-Please read CONTRIBUTING.md for important guidelines to follow.
-
-Links
------
-
-* [IRC channel](http://skq.me/irc/irc.esper.net/sk89q/) (#sk89q on irc.esper.net)
-* [Issue tracker](http://youtrack.sk89q.com/issues/WORLDGUARD)
-* [Continuous integration](http://build.sk89q.com) [![Build Status](https://secure.travis-ci.org/sk89q/worldguard.png)](http://travis-ci.org/sk89q/worldguard)
-* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard)

README.txt

@@ -0,0 +1,23 @@
+WorldGuard
+Copyright (c) 2010, 2011 sk89q <http://www.sk89q.com>
+Licensed under the GNU Lesser General Public License v3
+
+Introduction
+------------
+
+WorldGuard protects your server!
+
+Documentation can be found at:
+http://wiki.sk89q.com/wiki/WorldGuard
+
+Thanks
+------
+
+While I would like to thank everyone for their support, I would like to
+say thanks to the following individuals for their direct
+contributions to WorldGuard:
+
+- Sturmeh, for contributing the original durability workaround
+- Meaglin, for changing the on flow hook at my request
+- Dinnerbone, for implementing the on item pick up hook at my request,
+    and also for figuring out the durability bug in the process

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

blacklist_table.sql

@@ -1,24 +1,21 @@
--- Blacklist table for MySQL.
--- You must still configure WorldGuard to use your database.
--- If you do not plan on using a database for logging blacklist events,
--- you do not need to do anything with this file.
-
-CREATE TABLE `blacklist_events` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `event` varchar(25) NOT NULL,
-  `world` varchar(32) NOT NULL,
-  `player` varchar(16) NOT NULL,
-  `x` int(11) NOT NULL,
-  `y` int(11) NOT NULL,
-  `z` int(11) NOT NULL,
-  `item` int(11) NOT NULL,
-  `time` int(11) NOT NULL,
-  `comment` varchar(255) NULL,
-  PRIMARY KEY (`id`)
-);
-
--- Required update if you have an older version of the table:
-
-ALTER TABLE `blacklist_events` ADD `comment` VARCHAR( 255 ) NULL 
-
-ALTER TABLE `blacklist_events` ADD `world` VARCHAR( 32 ) NOT NULL 
+-- Blacklist table for MySQL.
+-- You must still configure WorldGuard to use your database.
+-- If you do not plan on using a database for logging blacklist events,
+-- you do not need to do anything with this file.
+
+CREATE TABLE `blacklist_events` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `event` varchar(25) NOT NULL,
+  `player` varchar(16) NOT NULL,
+  `x` int(11) NOT NULL,
+  `y` int(11) NOT NULL,
+  `z` int(11) NOT NULL,
+  `item` int(11) NOT NULL,
+  `time` int(11) NOT NULL,
+  `comment` varchar(255) NULL,
+  PRIMARY KEY (`id`)
+);
+
+-- Required update if you have an older version of the table:
+
+ALTER TABLE `blacklist_events` ADD `comment` VARCHAR( 255 ) NULL 

build.xml

@@ -0,0 +1,110 @@
+<project name="WorldGuard" default="dist" basedir=".">
+  <description>WorldGuard fixes bugs with Minecraft SMP and provides for
+    protection.</description>
+  
+  <property name="src.dir" location="src"/>
+  <property name="build.dir" location="build"/>
+  <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="truezip.jar" />
+    <include name="Bukkit.jar" />
+    <include name="Craftbukkit.jar" />
+    <include name="WorldEdit.jar" />
+    <include name="prtree.jar" />
+  </fileset>
+
+  <target name="init">
+    <mkdir dir="${build.dir}"/>
+  </target>
+
+  <!-- Compile the source files -->
+  <target name="compile" depends="init">
+    <javac srcdir="${src.dir}" deprecation="true" includeantruntime="true" destdir="${build.dir}" debug="true">
+      <classpath>
+        <fileset refid="libs"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- Build the .jar -->
+  <target name="jar" depends="compile">
+    <mkdir dir="${dist.dir}"/>
+    <manifest file="manifest.mf" mode="replace">
+      <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 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">
+        <zipgroupfileset dir="lib" includes="prtree.jar" />
+    </jar>
+  </target>
+
+  <!-- Create the .jar -->
+  <target name="dist">
+    <property name="version" value="nightly"/>
+    <antcall target="jar"/>
+  </target>
+
+  <!-- Build a release -->
+  <target name="release" depends="clean">
+    <input message="Enter version:" addproperty="version"/>
+    <antcall target="jar"/>
+    <delete dir="${release.dir}"/>
+    <mkdir dir="${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"/>
+    <copy todir="${release.dir}/src">
+      <fileset dir="${src.dir}"/>
+    </copy>
+    <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">
+    <sequential>
+      <exec executable="git" failifexecutionfails="false" outputproperty="git-revision">
+        <arg value="rev-parse"/>
+        <arg value="HEAD"/>
+      </exec>
+      <exec executable="git" outputproperty="git-revision-dirty">
+        <arg value="diff"/>
+        <arg value="- -shortstat"/>
+      </exec>
+      <condition else="dev-${git-revision}-modified" property="version" value="dev-${git-revision}">
+        <equals arg1="" arg2="${git-revision-dirty}"/>
+      </condition>
+    </sequential>
+  </target>-->
+</project>

config.yml

@@ -0,0 +1,101 @@
+#
+# 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
+
+suppress-tick-sync-warnings: false
+
+protection:
+    enforce-single-session: on
+    item-durability: on
+
+simulation:
+    sponge:
+        enable: on
+        redstone: off
+        radius: 3
+
+physics:
+    no-physics-gravel: off
+    no-physics-sand: off
+    allow-portal-anywhere: off
+    disable-water-damage-blocks: []
+
+ignition:
+    block-tnt: off
+    block-lighter: off
+
+fire:
+    disable-all-fire-spread: off
+    disable-fire-spread-blocks: []
+    disable-lava-fire-spread: on
+    lava-spread-blocks: []
+
+mobs:
+    block-creeper-explosions: off
+    block-creeper-block-damage: off
+
+spawn:
+    login-protection: 3
+    spawn-protection: 0
+    kick-on-death: off
+    exact-respawn: off
+    teleport-to-home-on-death: off
+
+player-damage:
+    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: on
+    wand: 287
+    default:
+        build: true
+        chest-access: false
+        pvp: true
+
+blacklist:
+    logging:
+        console:
+            enable: on
+        database:
+            enable: off
+            dsn: jdbc:mysql://localhost:3306/minecraft
+            user: root
+            password: pass
+            table: blacklist_events
+        file:
+            enable: on
+            path: worldguard/logs/%Y-%m-%d.log
+            open-files: 10
+
+# See http://wiki.sk89q.com/wiki/WorldGuard/Permissions/Bukkit
+permissions:
+    users:
+        sk89q:
+            permissions:
+                - /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

@@ -0,0 +1,33 @@
+name: WorldGuard
+main: com.sk89q.worldguard.bukkit.WorldGuardPlugin
+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>

pom.xml

@@ -1,274 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.sk89q</groupId>
-  <artifactId>worldguard</artifactId>
-  <version>5.7-SNAPSHOT</version>
-  <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers.</description>
-  <licenses>
-    <license>
-      <name>GNU General Public License 2.0</name>
-      <url>LICENSE.txt</url>
-      <distribution>repo</distribution>
-      <comments>License on all contributions</comments>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
-    <url>https://github.com/sk89q/worldguard</url>
-    <tag>master</tag>
-    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
-  </scm>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <repositories>
-    <repository>
-      <id>sk89q-repo</id>
-      <url>http://maven.sk89q.com/repo/</url>
-    </repository>
-    <repository>
-      <id>zml-repo</id>
-      <url>http://files.zachsthings.com/repo</url>
-    </repository>
-    <repository>
-      <id>bukkit-repo</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
-    </repository>
-  </repositories>
-  <dependencies>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>5.4.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>rebar</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.4.2-R0.2-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>commandbook</artifactId>
-      <version>2.1</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.zachsthings.libcomponents</groupId>
-          <artifactId>libcomponents-bukkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.spout</groupId>
-          <artifactId>spoutapi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.nijikokun</groupId>
-      <artifactId>iconomy</artifactId>
-      <version>5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.khelekore</groupId>
-      <artifactId>prtree</artifactId>
-      <version>1.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.opencsv</groupId>
-      <artifactId>opencsv</artifactId>
-      <version>2.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.jolbox</groupId>
-      <artifactId>bonecp</artifactId>
-      <version>0.7.1.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-	<dependency>
-		<groupId>org.mockito</groupId>
-		<artifactId>mockito-all</artifactId>
-		<version>1.9.5</version>
-		<scope>test</scope>
-	</dependency>
-  </dependencies>
-  <distributionManagement>
-    <site>
-      <id>sk89q-docs-upload</id>
-      <url>ftp://sk89q-maven-deploy/worldguard/</url>
-    </site>
-  </distributionManagement>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-    
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-ftp</artifactId>
-         <version>1.0-beta-6</version>
-      </extension>
-    </extensions>
-
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>plugin.yml</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath>defaults/</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>blacklist.txt</include>
-          <include>builtin_rules.yml</include>
-          <include>rulelist.yml</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath></targetPath>
-        <filtering>false</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>models/</include>
-          <include>sql/</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>true</addMavenDescriptor>
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-            <manifestEntries>
-              <Class-Path>WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>net.sf.opencsv:opencsv</include>
-                  <include>org.khelekore:prtree</include>
-                  <include>com.sk89q:rebar</include>
-                </includes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <configuration>
-          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
-        </configuration>
-        <executions>
-          <execution>
-            <id>release</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.2.2</version>
-        <configuration>
-          <preparationGoals>assembly:assembly</preparationGoals>
-          <goals>assembly:assembly</goals>
-          <tagNameFormat>@{project.version}</tagNameFormat>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <reportPlugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.5</version>
-            <reportSets>
-              <reportSet>
-                <reports>
-                  <report>license</report>
-                  <report>index</report>
-                </reports>
-              </reportSet>
-            </reportSets>
-          </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.8.1</version>
-            </plugin>
-          </reportPlugins>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

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

@@ -0,0 +1,307 @@
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ 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.util.ArrayList;
+import java.util.List;
+
+/**
+ * A very simple CSV parser released under a commercial-friendly license.
+ * This just implements splitting a single line into fields.
+ * 
+ * @author Glen Smith
+ * @author Rainer Pruy
+ * 
+ */
+public class CSVParser {
+
+    private final char separator;
+
+    private final char quotechar;
+    
+    private final char escape;
+
+    private final boolean strictQuotes;
+
+    private String pending;
+    private boolean inField = false;
+
+    private final boolean ignoreLeadingWhiteSpace;
+    
+    /** The default separator to use if none is supplied to the constructor. */
+    public static final char DEFAULT_SEPARATOR = ',';
+
+    public static final int INITIAL_READ_SIZE = 128;
+
+    /**
+     * The default quote character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_QUOTE_CHARACTER = '"';
+    
+
+    /**
+     * The default escape character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_ESCAPE_CHARACTER = '\\';
+
+   /**
+    * The default strict quote behavior to use if none is supplied to the
+    * constructor
+    */
+    public static final boolean DEFAULT_STRICT_QUOTES = false;
+    
+    /**
+     * The default leading whitespace behavior to use if none is supplied to the
+     * constructor
+     */
+    public static final boolean DEFAULT_IGNORE_LEADING_WHITESPACE = true;
+    
+    /**
+     * Constructs CSVParser using a comma for the separator.
+     */
+    public CSVParser() {
+        this(DEFAULT_SEPARATOR, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVParser with supplied separator.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVParser(char separator) {
+        this(separator, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
+    }
+    
+    
+
+    /**
+     * Constructs CSVParser with supplied separator and quote char.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVParser(char separator, char quotechar) {
+        this(separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     */
+    public CSVParser(char separator, char quotechar, char escape) {
+        this(separator, quotechar, escape, DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * Allows setting the "strict quotes" flag
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param strictQuotes
+     *            if true, characters outside the quotes are ignored
+     */
+    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes) {
+        this(separator, quotechar, escape, strictQuotes, DEFAULT_IGNORE_LEADING_WHITESPACE);
+    }
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * Allows setting the "strict quotes" and "ignore leading whitespace" flags
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param strictQuotes
+     *            if true, characters outside the quotes are ignored
+     * @param ignoreLeadingWhiteSpace
+     *            if true, white space in front of a quote in a field is ignored
+     */
+    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
+        this.separator = separator;
+        this.quotechar = quotechar;
+        this.escape = escape;
+        this.strictQuotes = strictQuotes;
+        this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
+    }
+    /**
+     * 
+     * @return true if something was left over from last call(s)
+     */
+    public boolean isPending() {
+    	return pending != null;
+    }
+
+    public String[] parseLineMulti(String nextLine) throws IOException {
+    	return parseLine(nextLine, true);
+    }
+    
+    public String[]  parseLine(String nextLine) throws IOException {
+    	return parseLine(nextLine, false);
+    }
+    /**
+     * Parses an incoming String and returns an array of elements.
+     * 
+     * @param nextLine
+     *            the string to parse
+     * @param multi
+     * @return the comma-tokenized list of elements, or null if nextLine is null
+     * @throws IOException if bad things happen during the read
+     */
+    private String[] parseLine(String nextLine, boolean multi) throws IOException {
+
+    	if (!multi && pending != null) {
+    		pending = null;
+    	}
+    	
+        if (nextLine == null) {
+        	if (pending != null) {
+        		String s = pending;
+        		pending = null;
+        		return new String[] {s};
+        	} else {
+        		return null;
+        	}
+        }
+
+        List<String>tokensOnThisLine = new ArrayList<String>();
+        StringBuilder sb = new StringBuilder(INITIAL_READ_SIZE);
+        boolean inQuotes = false;
+        if (pending != null) {
+        	sb.append(pending);
+        	pending = null;
+        	inQuotes = true;
+        }
+        for (int i = 0; i < nextLine.length(); i++) {
+        	
+        	char c = nextLine.charAt(i);
+        	if (c == this.escape) {
+        		if( isNextCharacterEscapable(nextLine, inQuotes || inField, i) ){
+        			sb.append(nextLine.charAt(i+1));
+        			i++;
+        		}
+        	} else if (c == quotechar) {
+        		if( isNextCharacterEscapedQuote(nextLine, inQuotes || inField, i) ){
+        			sb.append(nextLine.charAt(i+1));
+        			i++;
+        		}else{
+        			inQuotes = !inQuotes;
+
+        			// the tricky case of an embedded quote in the middle: a,bc"d"ef,g
+                    if (!strictQuotes) {
+                        if(i>2 //not on the beginning of the line
+                                && nextLine.charAt(i-1) != this.separator //not at the beginning of an escape sequence
+                                && nextLine.length()>(i+1) &&
+                                nextLine.charAt(i+1) != this.separator //not at the	end of an escape sequence
+                        ){
+
+                            if (ignoreLeadingWhiteSpace && sb.length() > 0 && isAllWhiteSpace(sb)) {
+                                sb = new StringBuilder(INITIAL_READ_SIZE);  //discard white space leading up to quote
+                            } else {
+                                sb.append(c);
+                            }
+  
+                        }
+                    }
+        		}
+                inField = !inField;
+        	} else if (c == separator && !inQuotes) {
+        		tokensOnThisLine.add(sb.toString());
+        		sb = new StringBuilder(INITIAL_READ_SIZE); // start work on next token
+                inField = false;
+        	} else {
+                if (!strictQuotes || inQuotes){
+                    sb.append(c);
+                    inField = true;
+                }
+        	}
+        }
+        // line is done - check status
+        if (inQuotes) {
+        	if (multi) {
+        		// continuing a quoted section, re-append newline
+        		sb.append("\n");
+        		pending = sb.toString();
+        		sb = null; // this partial content is not to be added to field list yet
+        	} else {
+        		throw new IOException("Un-terminated quoted field at end of CSV line");
+        	}
+        }
+        if (sb != null) {
+        	tokensOnThisLine.add(sb.toString());
+        }
+        return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
+        
+    }
+    
+    /**  
+     * precondition: the current character is a quote or an escape
+	 * @param nextLine the current line
+	 * @param inQuotes true if the current context is quoted
+	 * @param i current index in line
+	 * @return true if the following character is a quote
+	 */
+	private boolean isNextCharacterEscapedQuote(String nextLine, boolean inQuotes, int i) {
+		return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
+		    && nextLine.length() > (i+1)  // there is indeed another character to check.
+		    && nextLine.charAt(i+1) == quotechar;
+	}
+
+	/**  
+	 * precondition: the current character is an escape
+	 * @param nextLine the current line
+	 * @param inQuotes true if the current context is quoted
+	 * @param i current index in line
+	 * @return true if the following character is a quote
+	 */
+	protected boolean isNextCharacterEscapable(String nextLine, boolean inQuotes, int i) {
+		return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
+		    && nextLine.length() > (i+1)  // there is indeed another character to check.
+		    && ( nextLine.charAt(i+1) == quotechar || nextLine.charAt(i+1) == this.escape);
+	}
+	
+	/**
+	 * precondition: sb.length() > 0
+	 * @param sb A sequence of characters to examine
+	 * @return true if every character in the sequence is whitespace
+	 */
+    protected boolean isAllWhiteSpace(CharSequence sb) {
+        boolean result = true;
+        for (int i = 0; i < sb.length(); i++) {
+            char c = sb.charAt(i);
+
+            if ( !Character.isWhitespace(c) ) {
+                return false;
+            }
+        }
+        return result;
+    }
+}

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

@@ -0,0 +1,282 @@
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package au.com.bytecode.opencsv;
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A very simple CSV reader released under a commercial-friendly license.
+ * 
+ * @author Glen Smith
+ * 
+ */
+public class CSVReader implements Closeable {
+
+    private BufferedReader br;
+
+    private boolean hasNext = true;
+
+    private CSVParser parser;
+    
+    private int skipLines;
+
+    private boolean linesSkiped;
+
+    /**
+     * The default line to start reading.
+     */
+    public static final int DEFAULT_SKIP_LINES = 0;
+
+    /**
+     * Constructs CSVReader using a comma for the separator.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     */
+    public CSVReader(Reader reader) {
+        this(reader, CSVParser.DEFAULT_SEPARATOR, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVReader(Reader reader, char separator) {
+        this(reader, separator, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVReader(Reader reader, char separator, char quotechar) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator, quote char and quote handling
+     * behavior.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, boolean strictQuotes) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, strictQuotes);
+    }
+
+   /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     */
+
+    public CSVReader(Reader reader, char separator,
+			char quotechar, char escape) {
+        this(reader, separator, quotechar, escape, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
+	}
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param line
+     *            the line number to skip for start reading 
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, int line) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, line, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line) {
+        this(reader, separator, quotechar, escape, line, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes) {
+        this(reader, separator, quotechar, escape, line, strictQuotes, CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     * @param ignoreLeadingWhiteSpace
+     *            it true, parser should ignore white space before a quote in a field
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
+        this.br = new BufferedReader(reader);
+        this.parser = new CSVParser(separator, quotechar, escape, strictQuotes, ignoreLeadingWhiteSpace);
+        this.skipLines = line;
+    }
+
+	/**
+     * Reads the entire file into a List with each element being a String[] of
+     * tokens.
+     * 
+     * @return a List of String[], with each String[] representing a line of the
+     *         file.
+     * 
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    public List<String[]> readAll() throws IOException {
+
+        List<String[]> allElements = new ArrayList<String[]>();
+        while (hasNext) {
+            String[] nextLineAsTokens = readNext();
+            if (nextLineAsTokens != null)
+                allElements.add(nextLineAsTokens);
+        }
+        return allElements;
+
+    }
+
+    /**
+     * Reads the next line from the buffer and converts to a string array.
+     * 
+     * @return a string array with each comma-separated element as a separate
+     *         entry.
+     * 
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    public String[] readNext() throws IOException {
+    	
+    	String[] result = null;
+    	do {
+    		String nextLine = getNextLine();
+    		if (!hasNext) {
+    			return result; // should throw if still pending?
+    		}
+    		String[] r = parser.parseLineMulti(nextLine);
+    		if (r.length > 0) {
+    			if (result == null) {
+    				result = r;
+    			} else {
+    				String[] t = new String[result.length+r.length];
+    				System.arraycopy(result, 0, t, 0, result.length);
+    				System.arraycopy(r, 0, t, result.length, r.length);
+    				result = t;
+    			}
+    		}
+    	} while (parser.isPending());
+    	return result;
+    }
+
+    /**
+     * Reads the next line from the file.
+     * 
+     * @return the next line from the file without trailing newline
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    private String getNextLine() throws IOException {
+    	if (!this.linesSkiped) {
+            for (int i = 0; i < skipLines; i++) {
+                br.readLine();
+            }
+            this.linesSkiped = true;
+        }
+        String nextLine = br.readLine();
+        if (nextLine == null) {
+            hasNext = false;
+        }
+        return hasNext ? nextLine : null;
+    }
+
+    /**
+     * Closes the underlying reader.
+     * 
+     * @throws IOException if the close fails
+     */
+    public void close() throws IOException{
+    	br.close();
+    }
+    
+}

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

@@ -0,0 +1,302 @@
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package au.com.bytecode.opencsv;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * A very simple CSV writer released under a commercial-friendly license.
+ *
+ * @author Glen Smith
+ *
+ */
+public class CSVWriter implements Closeable {
+    
+    public static final int INITIAL_STRING_SIZE = 128;
+
+	private Writer rawWriter;
+
+    private PrintWriter pw;
+
+    private char separator;
+
+    private char quotechar;
+    
+    private char escapechar;
+    
+    private String lineEnd;
+
+    /** The character used for escaping quotes. */
+    public static final char DEFAULT_ESCAPE_CHARACTER = '"';
+
+    /** The default separator to use if none is supplied to the constructor. */
+    public static final char DEFAULT_SEPARATOR = ',';
+
+    /**
+     * The default quote character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_QUOTE_CHARACTER = '"';
+    
+    /** The quote constant to use when you wish to suppress all quoting. */
+    public static final char NO_QUOTE_CHARACTER = '\u0000';
+    
+    /** The escape constant to use when you wish to suppress all escaping. */
+    public static final char NO_ESCAPE_CHARACTER = '\u0000';
+    
+    /** Default line terminator uses platform encoding. */
+    public static final String DEFAULT_LINE_END = "\n";
+
+    private ResultSetHelper resultService = new ResultSetHelperService();
+    
+    /**
+     * Constructs CSVWriter using a comma for the separator.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     */
+    public CSVWriter(Writer writer) {
+        this(writer, DEFAULT_SEPARATOR);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVWriter(Writer writer, char separator) {
+        this(writer, separator, DEFAULT_QUOTE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar) {
+    	this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escapechar
+     *            the character to use for escaping quotechars or escapechars
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar) {
+        this(writer, separator, quotechar, escapechar, DEFAULT_LINE_END);
+    }
+    
+    
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param lineEnd
+     * 			  the line feed terminator to use
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, String lineEnd) {
+        this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER, lineEnd);
+    }   
+    
+    
+    
+    /**
+     * Constructs CSVWriter with supplied separator, quote char, escape char and line ending.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escapechar
+     *            the character to use for escaping quotechars or escapechars
+     * @param lineEnd
+     * 			  the line feed terminator to use
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar, String lineEnd) {
+        this.rawWriter = writer;
+        this.pw = new PrintWriter(writer);
+        this.separator = separator;
+        this.quotechar = quotechar;
+        this.escapechar = escapechar;
+        this.lineEnd = lineEnd;
+    }
+    
+    /**
+     * Writes the entire list to a CSV file. The list is assumed to be a
+     * String[]
+     *
+     * @param allLines
+     *            a List of String[], with each String[] representing a line of
+     *            the file.
+     */
+    public void writeAll(List<String[]> allLines)  {
+    	for (String[] line : allLines) {
+			writeNext(line);
+		}
+    }
+
+    protected void writeColumnNames(ResultSet rs)
+    	throws SQLException {
+
+    	writeNext(resultService.getColumnNames(rs));
+    }
+    
+    /**
+     * Writes the entire ResultSet to a CSV file.
+     *
+     * The caller is responsible for closing the ResultSet.
+     *
+     * @param rs the recordset to write
+     * @param includeColumnNames true if you want column names in the output, false otherwise
+     *
+     * @throws java.io.IOException thrown by getColumnValue
+     * @throws java.sql.SQLException thrown by getColumnValue
+     */
+    public void writeAll(java.sql.ResultSet rs, boolean includeColumnNames)  throws SQLException, IOException {
+    	
+    	
+    	if (includeColumnNames) {
+			writeColumnNames(rs);
+		}
+    	
+    	while (rs.next())
+    	{
+    		writeNext(resultService.getColumnValues(rs));
+    	}
+    }
+
+    
+    /**
+     * Writes the next line to the file.
+     *
+     * @param nextLine
+     *            a string array with each comma-separated element as a separate
+     *            entry.
+     */
+    public void writeNext(String[] nextLine) {
+    	
+    	if (nextLine == null)
+    		return;
+    	
+        StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
+        for (int i = 0; i < nextLine.length; i++) {
+
+            if (i != 0) {
+                sb.append(separator);
+            }
+
+            String nextElement = nextLine[i];
+            if (nextElement == null)
+                continue;
+            if (quotechar !=  NO_QUOTE_CHARACTER)
+            	sb.append(quotechar);
+            
+            sb.append(stringContainsSpecialCharacters(nextElement) ? processLine(nextElement) : nextElement);
+
+            if (quotechar != NO_QUOTE_CHARACTER)
+            	sb.append(quotechar);
+        }
+        
+        sb.append(lineEnd);
+        pw.write(sb.toString());
+
+    }
+
+	private boolean stringContainsSpecialCharacters(String line) {
+	    return line.indexOf(quotechar) != -1 || line.indexOf(escapechar) != -1;
+    }
+
+	protected StringBuilder processLine(String nextElement)
+    {
+		StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
+	    for (int j = 0; j < nextElement.length(); j++) {
+	        char nextChar = nextElement.charAt(j);
+	        if (escapechar != NO_ESCAPE_CHARACTER && nextChar == quotechar) {
+	        	sb.append(escapechar).append(nextChar);
+	        } else if (escapechar != NO_ESCAPE_CHARACTER && nextChar == escapechar) {
+	        	sb.append(escapechar).append(nextChar);
+	        } else {
+	            sb.append(nextChar);
+	        }
+	    }
+	    
+	    return sb;
+    }
+
+    /**
+     * Flush underlying stream to writer.
+     * 
+     * @throws IOException if bad things happen
+     */
+    public void flush() throws IOException {
+
+        pw.flush();
+
+    } 
+
+    /**
+     * Close the underlying stream writer flushing any buffered content.
+     *
+     * @throws IOException if bad things happen
+     *
+     */
+    public void close() throws IOException {
+        flush();
+        pw.close();
+        rawWriter.close();
+    }
+
+    /**
+     *  Checks to see if the there has been an error in the printstream. 
+     */
+    public boolean checkError() {
+        return pw.checkError();
+    }
+
+    public void setResultService(ResultSetHelper resultService) {
+        this.resultService = resultService;
+    }
+
+}

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

@@ -0,0 +1,34 @@
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ 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.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * 
+ * 
+ * 
+ * 
+ * 
+ */
+public interface ResultSetHelper {
+    public String[] getColumnNames(ResultSet rs) throws SQLException;
+
+    public String[] getColumnValues(ResultSet rs) throws SQLException, IOException;
+}

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

@@ -0,0 +1,185 @@
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ 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;
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 
+ * 
+ *  helper class for processing JDBC ResultSet objects
+ * 
+ * 
+ */
+public class ResultSetHelperService implements ResultSetHelper {
+    public static final int CLOBBUFFERSIZE = 2048;
+    
+    // note: we want to maintain compatibility with Java 5 VM's
+    // These types don't exist in Java 5
+	private static final int NVARCHAR = -9;
+	private static final int NCHAR = -15; 
+	private static final int LONGNVARCHAR = -16;
+	private static final int NCLOB = 2011;
+
+    public String[] getColumnNames(ResultSet rs) throws SQLException {
+        List<String> names = new ArrayList<String>();
+        ResultSetMetaData metadata = rs.getMetaData();
+
+        for (int i = 0; i < metadata.getColumnCount(); i++) {
+            names.add(metadata.getColumnName(i+1));
+        }
+
+        String[] nameArray = new String[names.size()];
+        return names.toArray(nameArray);
+    }
+
+    public String[] getColumnValues(ResultSet rs) throws SQLException, IOException {
+
+        List<String> values = new ArrayList<String>();
+        ResultSetMetaData metadata = rs.getMetaData();
+
+        for (int i = 0; i < metadata.getColumnCount(); i++) {
+            values.add(getColumnValue(rs, metadata.getColumnType(i + 1), i + 1));
+        }
+
+        String[] valueArray = new String[values.size()];
+        return values.toArray(valueArray);
+    }
+
+    private String handleObject(Object obj){
+        return obj == null ? "" : String.valueOf(obj);
+    }
+
+    private String handleBigDecimal(BigDecimal decimal) {
+        return decimal == null ? "" : decimal.toString();
+    }
+
+    private String handleLong(ResultSet rs, int columnIndex) throws SQLException {
+        long lv = rs.getLong(columnIndex);
+        return rs.wasNull() ? "" : Long.toString(lv);
+    }
+
+    private String handleInteger(ResultSet rs, int columnIndex) throws SQLException {
+        int i = rs.getInt(columnIndex);
+        return rs.wasNull() ? "" : Integer.toString(i);
+    }
+
+    private String handleDate(ResultSet rs, int columnIndex) throws SQLException {
+        java.sql.Date date = rs.getDate(columnIndex);
+        String value = null;
+        if (date != null) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yyyy");
+            value =  dateFormat.format(date);
+        }
+        return value;
+    }
+
+    private String handleTime(Time time) {
+        return time == null ? null : time.toString();
+    }
+
+    private String handleTimestamp(Timestamp timestamp) {
+        SimpleDateFormat timeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
+        return timestamp == null ? null : timeFormat.format(timestamp);
+    }
+
+    private String getColumnValue(ResultSet rs, int colType, int colIndex)
+    		throws SQLException, IOException {
+
+    	String value = "";
+
+		switch (colType)
+		{
+			case Types.BIT:
+            case Types.JAVA_OBJECT:
+				value = handleObject(rs.getObject(colIndex));
+			    break;
+			case Types.BOOLEAN:
+				boolean b = rs.getBoolean(colIndex);
+				value = Boolean.valueOf(b).toString();
+			    break;
+			case NCLOB: // todo : use rs.getNClob
+			case Types.CLOB:
+				Clob c = rs.getClob(colIndex);
+				if (c != null) {
+					value = read(c);
+				}
+			    break;
+			case Types.BIGINT:
+				value = handleLong(rs, colIndex);
+				break;
+			case Types.DECIMAL:
+			case Types.DOUBLE:
+			case Types.FLOAT:
+			case Types.REAL:
+			case Types.NUMERIC:
+				value = handleBigDecimal(rs.getBigDecimal(colIndex));
+			    break;
+			case Types.INTEGER:
+			case Types.TINYINT:
+			case Types.SMALLINT:
+                value = handleInteger(rs, colIndex);
+			    break;
+			case Types.DATE:
+				value = handleDate(rs, colIndex);
+			    break;
+			case Types.TIME:
+				value = handleTime(rs.getTime(colIndex));
+			    break;
+			case Types.TIMESTAMP:
+				value = handleTimestamp(rs.getTimestamp(colIndex));
+			    break;
+			case NVARCHAR: // todo : use rs.getNString
+			case NCHAR: // todo : use rs.getNString
+			case LONGNVARCHAR: // todo : use rs.getNString
+			case Types.LONGVARCHAR:
+			case Types.VARCHAR:
+			case Types.CHAR:
+				value = rs.getString(colIndex);
+			    break;
+			default:
+				value = "";
+		}
+
+
+		if (value == null)
+		{
+			value = "";
+		}
+
+		return value;
+
+    }
+
+    private static String read(Clob c) throws SQLException, IOException
+	{
+		StringBuilder sb = new StringBuilder( (int) c.length());
+		Reader r = c.getCharacterStream();
+		char[] cbuf = new char[CLOBBUFFERSIZE];
+		int n;
+		while ((n = r.read(cbuf, 0, cbuf.length)) != -1) {
+				sb.append(cbuf, 0, n);
+		}
+		return sb.toString();
+	}
+}

src/com/sk89q/worldguard/LocalPlayer.java

@@ -25,66 +25,60 @@ public abstract class LocalPlayer {
     /**
      * Get a player's name.
      * 
-     * @return The player's name
+     * @return
      */
     public abstract String getName();
     
     /**
      * Returns true if the player is inside a group.
      * 
-     * @param group The group to check
-     * @return Whether this player is in {@code group}
+     * @param group
+     * @return
      */
     public abstract boolean hasGroup(String group);
     
     /**
      * Get the player's position.
      * 
-     * @return The player's position
+     * @return
      */
     public abstract Vector getPosition();
     
     /**
      * Kick the player.
      * 
-     * @param msg The message to kick the player with
+     * @param msg
      */
     public abstract void kick(String msg);
     
     /**
      * Ban the player.
      * 
-     * @param msg The message to ban the player with
+     * @param msg
      */
     public abstract void ban(String msg);
     
     /**
      * Send the player a message;
      * 
-     * @param msg The message to send to the player
+     * @param msg
      */
     public abstract void printRaw(String msg);
     
     /**
      * Get the player's list of groups.
      * 
-     * @return The groups this player is in
+     * @return
      */
     public abstract String[] getGroups();
     
-    /**
-     * Returns whether a player has permission.
-     * 
-     * @param perm The permission to check
-     * @return Whether this player has {@code perm}
-     */
-    public abstract boolean hasPermission(String perm);
-    
     @Override
     public boolean equals(Object obj) {
-
-        return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName());
-
+        if (!(obj instanceof LocalPlayer)) {
+            return false;
+        }
+        
+        return ((LocalPlayer)obj).getName().equals(getName());
     }
     
     @Override

src/com/sk89q/worldguard/TickSyncDelayLoggerFilter.java

@@ -0,0 +1,35 @@
+// $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;
+
+import java.util.logging.Filter;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+public class TickSyncDelayLoggerFilter implements Filter {
+    public boolean isLoggable(LogRecord record) {
+        if (record.getLevel() == Level.WARNING
+                && record.getMessage().equals("Can't keep up! Did the system time change, or is the server overloaded?")) {
+            return false;
+        }
+        
+        return true;
+    }
+}

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

@@ -19,19 +19,14 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
+import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
+import java.util.ArrayList;
 import java.util.logging.Logger;
-
+import java.util.logging.Level;
+import java.io.*;
 import org.bukkit.ChatColor;
-
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
@@ -41,7 +36,11 @@ import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
  * @author sk89q
  */
 public abstract class Blacklist {
-
+    /**
+     * Logger.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+    
     /**
      * List of entries by block ID.
      */
@@ -61,19 +60,10 @@ public abstract class Blacklist {
     Map<String,BlacklistTrackedEvent> lastAffected =
             new HashMap<String,BlacklistTrackedEvent>();
 
-    private boolean useAsWhitelist;
-
-    private final Logger logger;
-
-    public Blacklist(Boolean useAsWhitelist, Logger logger) {
-        this.useAsWhitelist = useAsWhitelist;
-        this.logger = logger;
-    }
-
     /**
      * Returns whether the list is empty.
-     *
-     * @return whether the blacklist is empty
+     * 
+     * @return
      */
     public boolean isEmpty() {
         return blacklist.isEmpty();
@@ -81,36 +71,15 @@ public abstract class Blacklist {
 
     /**
      * Get the entries for an item or list.
-     *
-     * @param id The item id to get blacklist information for
-     * @return The blacklist entries for {@code id}
      */
     public List<BlacklistEntry> getEntries(int id) {
         return blacklist.get(id);
     }
-
-    /**
-     * Get the number of individual items that have blacklist entries.
-     *
-     * @return The number of items in the blacklist
-     */
-    public int getItemCount() {
-        return blacklist.size();
-    }
-
-    /**
-     * Returns whether the blacklist is used as a whitelist.
-     *
-     * @return whether the blacklist is be used as a whitelist
-     */
-    public boolean isWhitelist() {
-        return useAsWhitelist;
-    }
-
+    
     /**
      * Get the logger.
-     *
-     * @return The logger used in this blacklist
+     * 
+     * @return
      */
     public BlacklistLogger getLogger() {
         return blacklistLogger;
@@ -118,11 +87,11 @@ public abstract class Blacklist {
 
     /**
      * Method to handle the event.
-     *
-     * @param event The event to check
-     * @param forceRepeat Whether to force quickly repeating notifications
-     * @param silent Whether to force-deny notifications
-     * @return Whether the event is allowed
+     * 
+     * @param event
+     * @param forceRepeat
+     * @param silent
+     * @return
      */
     public boolean check(BlacklistEvent event, boolean forceRepeat, boolean silent) {
         List<BlacklistEntry> entries = getEntries(event.getType());
@@ -131,7 +100,7 @@ public abstract class Blacklist {
         }
         boolean ret = true;
         for (BlacklistEntry entry : entries) {
-            if (!entry.check(useAsWhitelist, event, forceRepeat, silent)) {
+            if (!entry.check(event, forceRepeat, silent)) {
                 ret = false;
             }
         }
@@ -141,8 +110,9 @@ public abstract class Blacklist {
     /**
      * Load the blacklist.
      *
-     * @param file The file to load from
-     * @throws IOException if an error occurred reading from the file
+     * @param file
+     * @return
+     * @throws IOException
      */
     public void load(File file) throws IOException {
         FileReader input = null;
@@ -170,14 +140,14 @@ public abstract class Blacklist {
                     currentEntries = new ArrayList<BlacklistEntry>();
 
                     for (String item : items) {
-                        int id;
+                        int id = 0;
 
                         try {
                             id = Integer.parseInt(item.trim());
                         } catch (NumberFormatException e) {
                             id = getItemID(item.trim());
                             if (id == 0) {
-                                logger.log(Level.WARNING, "Unknown block name: "
+                                logger.log(Level.WARNING, "WorldGuard: Unknown block name: "
                                         + item);
                                 break;
                             }
@@ -207,8 +177,6 @@ public abstract class Blacklist {
                     for (BlacklistEntry entry : currentEntries) {
                         if (parts[0].equalsIgnoreCase("ignore-groups")) {
                             entry.setIgnoreGroups(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("ignore-perms")) {
-                            entry.setIgnorePermissions(parts[1].split(","));
                         } else if (parts[0].equalsIgnoreCase("on-break")) {
                             entry.setBreakActions(parts[1].split(","));
                         } else if (parts[0].equalsIgnoreCase("on-destroy-with")) {
@@ -248,48 +216,47 @@ public abstract class Blacklist {
                 if (input != null) {
                     input.close();
                 }
-            } catch (IOException ignore) {
+            } catch (IOException e2) {
             }
         }
     }
-
+    
     /**
      * Get the last event.
-     *
-     * @return The last event
+     * 
+     * @return
      */
     public BlacklistEvent getLastEvent() {
         return lastEvent;
     }
-
+    
     /**
      * Notify administrators.
-     *
-     * @param event The event to notify about
-     * @param comment The comment to notify with
+     * 
+     * @param event
      */
     public void notify(BlacklistEvent event, String comment) {
         lastEvent = event;
-
-        broadcastNotification(ChatColor.GRAY + "WG: "
+        
+        broadcastNotification(ChatColor.GRAY + "WG: " 
                 + ChatColor.LIGHT_PURPLE + event.getPlayer().getName()
                 + ChatColor.GOLD + " (" + event.getDescription() + ") "
                 + ChatColor.WHITE
                 + getFriendlyItemName(event.getType())
                 + (comment != null ? " (" + comment + ")" : "") + ".");
     }
-
+    
     /**
      * Sends a notification to all subscribing users.
-     *
-     * @param msg The message to broadcast
+     * 
+     * @param msg
      */
     public abstract void broadcastNotification(String msg);
 
     /**
      * Forget a player.
      *
-     * @param player The player to forget
+     * @param player
      */
     public void forgetPlayer(LocalPlayer player) {
         lastAffected.remove(player.getName());
@@ -297,6 +264,8 @@ public abstract class Blacklist {
 
     /**
      * Forget all players.
+     *
+     * @param player
      */
     public void forgetAllPlayers() {
         lastAffected.clear();
@@ -304,9 +273,8 @@ public abstract class Blacklist {
 
     /**
      * Get an item's ID from its name.
-     *
-     * @param name the name of the item to look up
-     * @return the id for name if contained in ItemId, else -1
+     * 
+     * @param name
      */
     private static int getItemID(String name) {
         ItemType type = ItemType.lookup(name);
@@ -319,9 +287,8 @@ public abstract class Blacklist {
 
     /**
      * Get an item's friendly name with its ID.
-     *
-     * @param id The id to look up
-     * @return The item's friendly name
+     * 
+     * @param id
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);

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

@@ -19,12 +19,9 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
-
+import java.util.HashSet;
 import org.bukkit.ChatColor;
-
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
@@ -45,17 +42,11 @@ public class BlacklistEntry {
      * Parent blacklist entry.
      */
     private Blacklist blacklist;
-
     /**
      * List of groups to not affect.
      */
     private Set<String> ignoreGroups;
-
-    /**
-     * List of permissions to not affect.
-     */
-    private Set<String> ignorePermissions;
-
+    
     private String[] breakActions;
     private String[] destroyWithActions;
     private String[] placeActions;
@@ -63,14 +54,14 @@ public class BlacklistEntry {
     private String[] useActions;
     private String[] dropActions;
     private String[] acquireActions;
-
+    
     private String message;
     private String comment;
 
     /**
      * Construct the object.
-     *
-     * @param blacklist The blacklist that contains this entry
+     * 
+     * @param blacklist
      */
     public BlacklistEntry(Blacklist blacklist) {
         this.blacklist = blacklist;
@@ -83,13 +74,6 @@ public class BlacklistEntry {
         return ignoreGroups.toArray(new String[ignoreGroups.size()]);
     }
 
-    /**
-     * @return the ignoreGroups
-     */
-    public String[] getIgnorePermissions() {
-        return ignorePermissions.toArray(new String[ignorePermissions.size()]);
-    }
-
     /**
      * @param ignoreGroups the ignoreGroups to set
      */
@@ -102,107 +86,98 @@ public class BlacklistEntry {
     }
 
     /**
-     * @param ignorePermissions the ignorePermissions to set
-     */
-    public void setIgnorePermissions(String[] ignorePermissions) {
-        Set<String> ignorePermissionsSet = new HashSet<String>();
-        Collections.addAll(ignorePermissionsSet, ignorePermissions);
-        this.ignorePermissions = ignorePermissionsSet;
-    }
-
-    /**
-     * @return The actions that occur when breaking
+     * @return
      */
     public String[] getBreakActions() {
         return breakActions;
     }
 
     /**
-     * @param actions The actions to occur when breaking
+     * @param actions
      */
     public void setBreakActions(String[] actions) {
         this.breakActions = actions;
     }
 
     /**
-     * @return The actions that occur when destroying with a specific item
+     * @return
      */
     public String[] getDestroyWithActions() {
         return destroyWithActions;
     }
 
     /**
-     * @param actions The actions to occur when destroying with an item
+     * @param action
      */
     public void setDestroyWithActions(String[] actions) {
         this.destroyWithActions = actions;
     }
 
     /**
-     * @return The actions that will occur when placing
+     * @return
      */
     public String[] getPlaceActions() {
         return placeActions;
     }
 
     /**
-     * @param actions The actions to occur when placing
+     * @param actions
      */
     public void setPlaceActions(String[] actions) {
         this.placeActions = actions;
     }
 
     /**
-     * @return The actions that will occur when interacting
+     * @return
      */
     public String[] getInteractActions() {
         return interactActions;
     }
 
     /**
-     * @param actions The actions to occur when interacting
+     * @param actions
      */
     public void setInteractActions(String[] actions) {
         this.interactActions = actions;
     }
 
     /**
-     * @return The actions that will occur when using
+     * @return
      */
     public String[] getUseActions() {
         return useActions;
     }
 
     /**
-     * @param actions The actions to occur when using
+     * @param actions
      */
     public void setUseActions(String[] actions) {
         this.useActions = actions;
     }
 
     /**
-     * @return The actions that will occur when dropping
+     * @return
      */
     public String[] getDropActions() {
         return dropActions;
     }
 
     /**
-     * @param actions The actions to occur when dropping
+     * @param actions
      */
     public void setDropActions(String[] actions) {
         this.dropActions = actions;
     }
 
     /**
-     * @return The actions that will occur when acquiring
+     * @return
      */
     public String[] getAcquireActions() {
         return acquireActions;
     }
 
     /**
-     * @param actions The actions to occur when acquiring
+     * @param actions
      */
     public void setAcquireActions(String[] actions) {
         this.acquireActions = actions;
@@ -239,57 +214,50 @@ public class BlacklistEntry {
     /**
      * Returns true if this player should be ignored.
      *
-     * @param player The player to check
-     * @return whether this player should be ignored for blacklist blocking
+     * @param player
+     * @return
      */
     public boolean shouldIgnore(LocalPlayer player) {
-        if (ignoreGroups != null) {
-            for (String group : player.getGroups()) {
-                if (ignoreGroups.contains(group.toLowerCase())) {
-                    return true;
-                }
-            }
+        if (ignoreGroups == null) {
+            return false;
         }
-
-        if (ignorePermissions != null) {
-            for (String perm : ignorePermissions) {
-                if (player.hasPermission(perm)) {
-                    return true;
-                }
+        for (String group : player.getGroups()) {
+            if (ignoreGroups.contains(group.toLowerCase())) {
+                return true;
             }
         }
 
         return false;
     }
-
+    
     /**
      * Get the associated actions with an event.
-     *
-     * @param event The event to check
-     * @return The actions for the given event
+     * 
+     * @param event
+     * @return
      */
     private String[] getActions(BlacklistEvent event) {
         if (event instanceof BlockBreakBlacklistEvent) {
             return breakActions;
-
+            
         } else if (event instanceof BlockPlaceBlacklistEvent) {
             return placeActions;
-
+            
         } else if (event instanceof BlockInteractBlacklistEvent) {
             return interactActions;
-
+            
         } else if (event instanceof DestroyWithBlacklistEvent) {
             return destroyWithActions;
-
+            
         } else if (event instanceof ItemAcquireBlacklistEvent) {
             return acquireActions;
-
+            
         } else if (event instanceof ItemDropBlacklistEvent) {
             return dropActions;
-
+            
         } else if (event instanceof ItemUseBlacklistEvent) {
             return useActions;
-
+            
         } else {
             return null;
         }
@@ -297,16 +265,15 @@ public class BlacklistEntry {
 
     /**
      * Method to handle the event.
-     *
-     * @param useAsWhitelist Whether this entry is buing used in a whitelist
-     * @param event The event to check
-     * @param forceRepeat Whether to force repeating notifications even within the delay limit
-     * @param silent Whether to prevent notifications from happening
-     * @return Whether the action was allowed
+     * 
+     * @param event
+     * @param forceRepeat
+     * @param silent
+     * @return
      */
-    public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean forceRepeat, boolean silent) {
+    public boolean check(BlacklistEvent event, boolean forceRepeat, boolean silent) {
         LocalPlayer player = event.getPlayer();
-
+        
         if (shouldIgnore(player)) {
             return true;
         }
@@ -326,38 +293,28 @@ public class BlacklistEntry {
         }
 
         String actions[] = getActions(event);
-
-
-        boolean ret = !useAsWhitelist;
-
+        boolean ret = true;
+        
         // Nothing to do
         if (actions == null) {
-            return ret;
+            return true;
         }
-
+        
         for (String action : actions) {
             // Deny
             if (action.equalsIgnoreCase("deny")) {
                 if (silent) {
                     return false;
                 }
-
+                
                 ret = false;
 
-            // Allow
-            } else if (action.equalsIgnoreCase("allow")) {
-                if (silent) {
-                    return true;
-                }
-
-                ret = true;
-
             // Kick
             } else if (action.equalsIgnoreCase("kick")) {
                 if (silent) {
                     continue;
                 }
-
+                
                 if (this.message != null) {
                     player.kick(String.format(this.message,
                             getFriendlyItemName(event.getType())));
@@ -371,7 +328,7 @@ public class BlacklistEntry {
                 if (silent) {
                     continue;
                 }
-
+                
                 if (this.message != null) {
                     player.ban("Banned: " + String.format(this.message,
                             getFriendlyItemName(event.getType())));
@@ -380,12 +337,12 @@ public class BlacklistEntry {
                             + event.getDescription() + " "
                             + getFriendlyItemName(event.getType()));
                 }
-
+            
             } else if (!silent && (!repeating || forceRepeat)) {
                 // Notify
                 if (action.equalsIgnoreCase("notify")) {
                     blacklist.notify(event, comment);
-
+                
                 // Log
                 } else if (action.equalsIgnoreCase("log")) {
                     blacklist.getLogger().logEvent(event, comment);
@@ -410,8 +367,8 @@ public class BlacklistEntry {
 
     /**
      * Get an item's friendly name with its ID.
-     *
-     * @param id The id to get a name for
+     * 
+     * @param id
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);

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

@@ -19,9 +19,8 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.util.HashSet;
 import java.util.Set;
-
+import java.util.HashSet;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 import com.sk89q.worldguard.blacklist.loggers.BlacklistLoggerHandler;
 
@@ -39,16 +38,16 @@ public class BlacklistLogger implements BlacklistLoggerHandler {
     /**
      * Add a handler.
      *
-     * @param handler The handler to add
+     * @param handler
      */
     public void addHandler(BlacklistLoggerHandler handler) {
         handlers.add(handler);
     }
 
     /**
-     * Remove a handler.
+     * Add a handler.
      *
-     * @param handler The handler to remove
+     * @param handler
      */
     public void removeHandler(BlacklistLoggerHandler handler) {
         handlers.remove(handler);
@@ -56,15 +55,18 @@ public class BlacklistLogger implements BlacklistLoggerHandler {
 
     /**
      * Add a handler.
+     *
+     * @param handler
      */
     public void clearHandlers() {
         handlers.clear();
     }
-
+    
     /**
      * Log an event.
      *
-     * @param event The event to log
+     * @param player
+     * @param event
      */
     public void logEvent(BlacklistEvent event, String comment) {
         for (BlacklistLoggerHandler handler : handlers) {

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

@@ -31,9 +31,9 @@ public class BlacklistTrackedEvent {
 
     /**
      * Construct the object.
-     *
-     * @param event The event tracked
-     * @param time The time at which the event occurred
+     * 
+     * @param id
+     * @param time
      */
     public BlacklistTrackedEvent(BlacklistEvent event, long time) {
         this.event = event;

src/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java

@@ -39,9 +39,9 @@ public abstract class BlacklistEvent {
     /**
      * Construct the object.
      * 
-     * @param player The player associated with this event
-     * @param pos The position the event occurred at
-     * @param type The type of item used
+     * @param player
+     * @param pos
+     * @param type
      */
     public BlacklistEvent(LocalPlayer player, Vector pos, int type) {
         this.player = player;
@@ -51,8 +51,8 @@ public abstract class BlacklistEvent {
     
     /**
      * Get the player.
-     *
-     * @return The player associated with this event
+     * 
+     * @return
      */
     public LocalPlayer getPlayer() {
         return player;
@@ -61,16 +61,16 @@ public abstract class BlacklistEvent {
     /**
      * Get the position.
      * 
-     * @return The position of this event
+     * @return
      */
     public Vector getPosition() {
         return pos;
     }
     
     /**
-     * Get the item type.
+     * Get the type.
      * 
-     * @return The type associated with this event
+     * @return
      */
     public int getType() {
         return type;
@@ -79,7 +79,7 @@ public abstract class BlacklistEvent {
     /**
      * Get a short description such as "break" or "destroy with."
      * 
-     * @return The event description
+     * @return
      */
     public abstract String getDescription();
 }

src/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java

@@ -26,8 +26,12 @@ public class BlockBreakBlacklistEvent extends BlockBlacklistEvent {
     public BlockBreakBlacklistEvent(LocalPlayer player, Vector pos, int type) {
         super(player, pos, type);
     }
-
-    @Override
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
     public String getDescription() {
         return "break";
     }

src/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java

@@ -26,8 +26,12 @@ public class BlockInteractBlacklistEvent extends BlockBlacklistEvent {
     public BlockInteractBlacklistEvent(LocalPlayer player, Vector pos, int type) {
         super(player, pos, type);
     }
-
-    @Override
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
     public String getDescription() {
         return "interact with";
     }

src/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java

@@ -26,8 +26,12 @@ public class BlockPlaceBlacklistEvent extends BlockBlacklistEvent {
     public BlockPlaceBlacklistEvent(LocalPlayer player, Vector pos, int type) {
         super(player, pos, type);
     }
-
-    @Override
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
     public String getDescription() {
         return "place";
     }

src/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java

@@ -26,8 +26,12 @@ public class DestroyWithBlacklistEvent extends BlacklistEvent {
     public DestroyWithBlacklistEvent(LocalPlayer player, Vector pos, int type) {
         super(player, pos, type);
     }
-
-    @Override
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
     public String getDescription() {
         return "destroy with";
     }

src/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java

@@ -26,8 +26,12 @@ public class ItemAcquireBlacklistEvent extends ItemBlacklistEvent {
     public ItemAcquireBlacklistEvent(LocalPlayer player, Vector pos, int type) {
         super(player, pos, type);
     }
-
-    @Override
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
     public String getDescription() {
         return "acquire";
     }

src/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java

@@ -26,8 +26,12 @@ public class ItemDropBlacklistEvent extends ItemBlacklistEvent {
     public ItemDropBlacklistEvent(LocalPlayer player, Vector pos, int type) {
         super(player, pos, type);
     }
-
-    @Override
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
     public String getDescription() {
         return "drop";
     }

src/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java

@@ -26,8 +26,12 @@ public class ItemUseBlacklistEvent extends ItemBlacklistEvent {
     public ItemUseBlacklistEvent(LocalPlayer player, Vector pos, int type) {
         super(player, pos, type);
     }
-
-    @Override
+    
+    /**
+     * Get a short description such as "break" or "destroy with."
+     * 
+     * @return
+     */
     public String getDescription() {
         return "use";
     }

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

@@ -34,7 +34,7 @@ public interface BlacklistLoggerHandler {
      * @param comment
      */
     public void logEvent(BlacklistEvent event, String comment);
-
+    
     /**
      * Close the logger.
      */

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

@@ -19,104 +19,95 @@
 
 package com.sk89q.worldguard.blacklist.loggers;
 
-import java.util.logging.Level;
 import java.util.logging.Logger;
-
+import java.util.logging.Level;
 import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.*;
 
 /**
  *
  * @author sk89q
  */
 public class ConsoleLoggerHandler implements BlacklistLoggerHandler {
-
-
-    private String worldName;
-	
-    private final Logger logger;
-
-    public ConsoleLoggerHandler(String worldName, Logger logger) {
-        this.worldName = worldName;
-	    this.logger = logger;
-    }
-
+    /**
+     * Logger.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+    
+    /**
+     * Log an event.
+     *
+     * @param player
+     * @param event
+     */
     public void logEvent(BlacklistEvent event, String comment) {
         // Block break
         if (event instanceof BlockBreakBlacklistEvent) {
             BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " tried to break " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-
+        
         // Block place
         } else if (event instanceof BlockPlaceBlacklistEvent) {
             BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " tried to place " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-
+        
         // Block interact
         } else if (event instanceof BlockInteractBlacklistEvent) {
             BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " tried to interact with " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-
+        
         // Destroy with
         } else if (event instanceof DestroyWithBlacklistEvent) {
             DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " tried to destroy with " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-
+        
         // Acquire
         } else if (event instanceof ItemAcquireBlacklistEvent) {
             ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " tried to acquire " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-
+        
         // Drop
         } else if (event instanceof ItemDropBlacklistEvent) {
             ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " tried to drop " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-
+        
         // Use
         } else if (event instanceof ItemUseBlacklistEvent) {
             ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " tried to use " + getFriendlyItemName(evt.getType())
                     + (comment != null ? " (" + comment + ")" : ""));
-
+        
         // Unknown
         } else {
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
+            logger.log(Level.INFO, "WorldGuard: " + event.getPlayer().getName()
                     + " caught unknown event: " + event.getClass().getCanonicalName());
         }
     }
 
     /**
      * Get an item's friendly name with its ID.
-     *
-     * @param id The item id
-     * @return The friendly name of the item
+     * 
+     * @param id
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);
         if (type != null) {
             return type.getName() + " (#" + id + ")";
         } else {
-            return "#" + id;
+            return "#" + id + "";
         }
     }
 

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

@@ -19,19 +19,17 @@
 
 package com.sk89q.worldguard.blacklist.loggers;
 
+import java.util.logging.Logger;
+import java.util.logging.Level;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
+import java.sql.PreparedStatement;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
@@ -42,58 +40,51 @@ import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
  * @author sk89q
  */
 public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
+    /**
+     * Logger.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
 
     /**
      * DSN.
      */
-    private final String dsn;
+    private String dsn;
     /**
      * Username.
      */
-    private final String user;
+    private String user;
     /**
      * Password.
      */
-    private final String pass;
+    private String pass;
     /**
      * Table.
      */
-    private final String table;
-    /**
-     * World name.
-     */
-    private final String worldName;
+    private String table;
     /**
      * Database connection.
      */
     private Connection conn;
-    
-    private final Logger logger;
 
     /**
      * Construct the object.
-     *
-     * @param dsn The DSN for the connection
-     * @param user The username to connect with
-     * @param pass The password to connect with
-     * @param table The table to log to
-     * @param worldName The name of the world to log
-     * @param logger The logger to log errors to
+     * 
+     * @param dsn
+     * @param user
+     * @param pass
      */
-    public DatabaseLoggerHandler(String dsn, String user, String pass, String table, String worldName, Logger logger) {
+    public DatabaseLoggerHandler(String dsn, String user, String pass, String table) {
         this.dsn = dsn;
         this.user = user;
         this.pass = pass;
         this.table = table;
-        this.worldName = worldName;
-        this.logger = logger;
     }
 
     /**
      * Gets the database connection.
-     *
-     * @return The database connection
-     * @throws SQLException when the connection cannot be created
+     * 
+     * @return
+     * @throws SQLException
      */
     private Connection getConnection() throws SQLException {
         if (conn == null || conn.isClosed()) {
@@ -104,12 +95,14 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
 
     /**
      * Log an event to the database.
-     *
-     * @param event The event to log
-     * @param player The player associated with the event
-     * @param pos The location of the event
-     * @param item The item used
-     * @param comment The comment associated with the event
+     * 
+     * @param event
+     * @param name
+     * @param x
+     * @param y
+     * @param z
+     * @param item
+     * @param comment
      */
     private void logEvent(String event, LocalPlayer player, Vector pos, int item,
             String comment) {
@@ -117,28 +110,28 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
             Connection conn = getConnection();
             PreparedStatement stmt = conn.prepareStatement(
                     "INSERT INTO " + table
-                  + "(event, world, player, x, y, z, item, time, comment) VALUES "
-                  + "(?, ?, ?, ?, ?, ?, ?, ?, ?)");
+                  + "(event, player, x, y, z, item, time, comment) VALUES "
+                  + "(?, ?, ?, ?, ?, ?, ?, ?)");
             stmt.setString(1, event);
-            stmt.setString(2, worldName);
-            stmt.setString(3, player.getName());
-            stmt.setInt(4, pos.getBlockX());
-            stmt.setInt(5, pos.getBlockY());
-            stmt.setInt(6, pos.getBlockZ());
-            stmt.setInt(7, item);
-            stmt.setInt(8, (int)(System.currentTimeMillis() / 1000));
-            stmt.setString(9, comment);
+            stmt.setString(2, player.getName());
+            stmt.setInt(3, pos.getBlockX());
+            stmt.setInt(4, pos.getBlockY());
+            stmt.setInt(5, pos.getBlockZ());
+            stmt.setInt(6, item);
+            stmt.setInt(7, (int)(System.currentTimeMillis() / 1000));
+            stmt.setString(8, comment);
             stmt.executeUpdate();
         } catch (SQLException e) {
             logger.log(Level.SEVERE, "Failed to log blacklist event to database: "
                     + e.getMessage());
         }
     }
-
+    
     /**
      * Log an event.
      *
-     * @param event The event to log
+     * @param player
+     * @param event
      */
     public void logEvent(BlacklistEvent event, String comment) {
         // Block break
@@ -146,43 +139,43 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
             BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
             logEvent("BREAK", evt.getPlayer(), evt.getPosition(),
                     evt.getType(), comment);
-
+        
         // Block place
         } else if (event instanceof BlockPlaceBlacklistEvent) {
             BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
             logEvent("PLACE", evt.getPlayer(), evt.getPosition(),
                     evt.getType(), comment);
-
+            
         // Block interact
-        } else if (event instanceof BlockInteractBlacklistEvent) {
-            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
+        } else if (event instanceof BlockPlaceBlacklistEvent) {
+            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
             logEvent("INTERACT", evt.getPlayer(), evt.getPosition(),
                     evt.getType(), comment);
-
+        
         // Destroy with
         } else if (event instanceof DestroyWithBlacklistEvent) {
             DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
             logEvent("DESTROY_WITH", evt.getPlayer(), evt.getPosition(),
                     evt.getType(), comment);
-
+        
         // Acquire
         } else if (event instanceof ItemAcquireBlacklistEvent) {
             ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
             logEvent("ACQUIRE", evt.getPlayer(), evt.getPlayer().getPosition(),
                     evt.getType(), comment);
-
+        
         // Drop
         } else if (event instanceof ItemDropBlacklistEvent) {
             ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
             logEvent("DROP", evt.getPlayer(), evt.getPlayer().getPosition(),
                     evt.getType(), comment);
-
+        
         // Use
         } else if (event instanceof ItemUseBlacklistEvent) {
             ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
             logEvent("USE", evt.getPlayer(), evt.getPlayer().getPosition(),
                     evt.getType(), comment);
-
+        
         // Unknown
         } else {
             logEvent("UNKNOWN", event.getPlayer(), event.getPlayer().getPosition(),
@@ -198,8 +191,8 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
             if (conn != null && !conn.isClosed()) {
                 conn.close();
             }
-        } catch (SQLException ignore) {
-
+        } catch (SQLException e) {
+            
         }
     }
 }

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

@@ -19,32 +19,26 @@
 
 package com.sk89q.worldguard.blacklist.loggers;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import java.util.logging.Level;
+import java.io.*;
+import java.util.regex.*;
+import java.util.*;
+import java.text.SimpleDateFormat;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.*;
 
 /**
  *
  * @author sk89q
  */
 public class FileLoggerHandler implements BlacklistLoggerHandler {
+    /**
+     * Logger.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
     /**
      * Regex for patterns in the path.
      */
@@ -63,54 +57,39 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
      * Path pattern.
      */
     private String pathPattern;
-    /**
-     * World name.
-     */
-    private String worldName;
     /**
      * Cache of writers.
      */
     private TreeMap<String,FileLoggerWriter> writers =
             new TreeMap<String,FileLoggerWriter>();
-    
-    private final Logger logger;
 
     /**
      * Construct the object.
      *
-     * @param pathPattern The pattern for the logflie path
-     * @param worldName The name of the world
-     * @param logger The logger used to log errors
+     * @param pathPattern
      */
-    public FileLoggerHandler(String pathPattern, String worldName, Logger logger) {
+    public FileLoggerHandler(String pathPattern) {
         this.pathPattern = pathPattern;
-        this.worldName = worldName;
-        this.logger = logger;
     }
 
     /**
      * Construct the object.
      *
-     * @param pathPattern The pattern for logfile paths
-     * @param cacheSize The size of the file cache
-     * @param worldName The name of the associated world
-     * @param logger The logger to log errors with
+     * @param pathPattern
+     * @param cacheSize
      */
-    public FileLoggerHandler(String pathPattern, int cacheSize, String worldName, Logger logger) {
+    public FileLoggerHandler(String pathPattern, int cacheSize) {
         if (cacheSize < 1) {
             throw new IllegalArgumentException("Cache size cannot be less than 1");
         }
         this.pathPattern = pathPattern;
         this.cacheSize = cacheSize;
-        this.worldName = worldName;
-        this.logger = logger;
     }
 
     /**
      * Build the path.
-     *
-     * @param playerName The name of the playername
-     * @return The path for the logfile
+     * 
+     * @return
      */
     private String buildPath(String playerName) {
         GregorianCalendar calendar = new GregorianCalendar();
@@ -131,12 +110,6 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
                     rep = rep.substring(0, 32);
                 }
 
-            }else if (group.matches("%w")) {
-                rep = worldName.toLowerCase().replaceAll("[^A-Za-z0-9_]", "_");
-                if (rep.length() > 32) { // Actual max length is 16
-                    rep = rep.substring(0, 32);
-                }
-
             // Date and time
             } else if (group.matches("%Y")) {
                 rep = String.valueOf(calendar.get(Calendar.YEAR));
@@ -155,21 +128,20 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
             } else if (group.matches("%s")) {
                 rep = String.format("%02d", calendar.get(Calendar.SECOND));
             }
-
+            
             m.appendReplacement(buffer, rep);
         }
 
         m.appendTail(buffer);
-
+        
         return buffer.toString();
     }
 
     /**
      * Log a message.
-     *
-     * @param player The player to log
-     * @param message The message to log
-     * @param comment The comment associated with the logged event
+     * 
+     * @param player
+     * @param message
      */
     private void log(LocalPlayer player, String message, String comment) {
         String path = buildPath(player.getName());
@@ -177,7 +149,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
             String date = dateFormat.format(new Date());
             String line = "[" + date + "] " + player.getName() + ": " + message
                     + (comment != null ? " (" + comment + ")" : "") + "\r\n";
-
+            
             FileLoggerWriter writer = writers.get(path);
 
             // Writer already exists!
@@ -199,7 +171,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
             if (parent != null && !parent.exists()) {
                 parent.mkdirs();
             }
-
+            
             FileWriter stream = new FileWriter(path, true);
             BufferedWriter out = new BufferedWriter(stream);
             out.write(line);
@@ -217,7 +189,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
                     Map.Entry<String,FileLoggerWriter> entry = it.next();
                     try {
                         entry.getValue().getWriter().close();
-                    } catch (IOException ignore) {
+                    } catch (IOException e) {
                     }
                     it.remove();
 
@@ -236,33 +208,72 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
 
     /**
      * Gets the coordinates in text form for the log.
-     *
-     * @param pos The position to get coordinates for
-     * @return The position's coordinates in human-readable form
+     * 
+     * @param pos
+     * @return
      */
     private String getCoordinates(Vector pos) {
         return "@" + pos.getBlockX() + "," + pos.getBlockY() + "," + pos.getBlockZ();
     }
-
+    
     private void logEvent(BlacklistEvent event, String text, int id, Vector pos, String comment) {
         log(event.getPlayer(), "Tried to " + text + " " + getFriendlyItemName(id)
                 + " " + getCoordinates(pos), comment);
     }
-
+    
     /**
      * Log an event.
      *
-     * @param event The event to log
+     * @param player
+     * @param event
      */
     public void logEvent(BlacklistEvent event, String comment) {
-        logEvent(event, event.getDescription(), event.getType(), event.getPosition(), comment);
+        // Block break
+        if (event instanceof BlockBreakBlacklistEvent) {
+            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
+            logEvent(event, "break", evt.getType(), evt.getPosition(), comment);
+        
+        // Block place
+        } else if (event instanceof BlockPlaceBlacklistEvent) {
+            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+            logEvent(event, "place", evt.getType(), evt.getPosition(), comment);
+        
+        // Block interact
+        } else if (event instanceof BlockInteractBlacklistEvent) {
+            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
+            logEvent(event, "interact with", evt.getType(), evt.getPosition(), comment);
+        
+        // Destroy with
+        } else if (event instanceof DestroyWithBlacklistEvent) {
+            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
+            logEvent(event, "destroy with", evt.getType(), evt.getPosition(), comment);
+            
+        // Acquire
+        } else if (event instanceof ItemAcquireBlacklistEvent) {
+            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
+            logEvent(event, "acquire", evt.getType(), evt.getPosition(), comment);
+        
+        // Drop
+        } else if (event instanceof ItemDropBlacklistEvent) {
+            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
+            logEvent(event, "drop", evt.getType(), evt.getPosition(), comment);
+            
+        // Use
+        } else if (event instanceof ItemUseBlacklistEvent) {
+            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
+            logEvent(event, "use", evt.getType(), evt.getPosition(), comment);
+        
+        // Unknown
+        } else {
+            log(event.getPlayer(), "Unknown event: "
+                    + event.getClass().getCanonicalName(), comment);
+        }
     }
 
     /**
      * Get an item's friendly name with its ID.
      *
-     * @param id The id to get a friendly name for
-     * @return The friendly name
+     * @param id
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);
@@ -280,7 +291,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
         for (Map.Entry<String,FileLoggerWriter> entry : writers.entrySet()) {
             try {
                 entry.getValue().getWriter().close();
-            } catch (IOException ignore) {
+            } catch (IOException e) {
             }
         }
 

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

@@ -19,7 +19,7 @@
 
 package com.sk89q.worldguard.blacklist.loggers;
 
-import java.io.BufferedWriter;
+import java.io.*;
 
 /**
  *
@@ -41,9 +41,8 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
 
     /**
      * Construct the object.
-     *
-     * @param path The path to write to
-     * @param writer The writer for the file
+     * 
+     * @param writer
      */
     public FileLoggerWriter(String path, BufferedWriter writer) {
         this.path = path;
@@ -53,15 +52,15 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
 
     /**
      * File path.
-     *
-     * @return The path the logger is logging to
+     * 
+     * @return
      */
     public String getPath() {
         return path;
     }
 
     /**
-     * @return the writer being logged to
+     * @return the writer
      */
     public BufferedWriter getWriter() {
         return writer;
@@ -73,14 +72,22 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
     public long getLastUse() {
         return lastUse;
     }
-
+    
     /**
      * Update last use time.
+     * 
+     * @return
      */
     public void updateLastUse() {
         lastUse = System.currentTimeMillis();
     }
 
+    /**
+     * Comparison function.
+     * 
+     * @param other
+     * @return
+     */
     public int compareTo(FileLoggerWriter other) {
         if (lastUse > other.lastUse) {
             return 1;

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

@@ -19,18 +19,22 @@
 
 package com.sk89q.worldguard.bukkit;
 
+import org.bukkit.entity.Player;
 import com.sk89q.worldguard.blacklist.Blacklist;
 
 public class BukkitBlacklist extends Blacklist {
     private WorldGuardPlugin plugin;
     
-    public BukkitBlacklist(Boolean useAsWhitelist, WorldGuardPlugin plugin) {
-        super(useAsWhitelist, plugin.getLogger());
+    public BukkitBlacklist(WorldGuardPlugin plugin) {
         this.plugin = plugin;
     }
     
-    @Override
     public void broadcastNotification(String msg) {
-        plugin.broadcastNotification(msg);
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            if (plugin.hasPermission(player, "/worldguardnotify")) {
+                player.sendMessage(msg);
+            }
+        }
     }
+
 }

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

@@ -21,7 +21,6 @@ package com.sk89q.worldguard.bukkit;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 
@@ -57,7 +56,6 @@ public class BukkitPlayer extends LocalPlayer {
 
     @Override
     public void ban(String msg) {
-        player.setBanned(true);
         player.kickPlayer(msg);
     }
 
@@ -71,8 +69,4 @@ public class BukkitPlayer extends LocalPlayer {
         player.sendMessage(msg);
     }
 
-    @Override
-    public boolean hasPermission(String perm) {
-        return plugin.hasPermission(player, perm);
-    }
 }

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

@@ -0,0 +1,53 @@
+// $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.bukkit;
+
+import java.util.List;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+
+public class BukkitUtil {
+    private BukkitUtil()  {
+    }
+    
+    public static BlockVector toVector(Block block) {
+        return new BlockVector(block.getX(), block.getY(), block.getZ());
+    }
+    
+    public static Vector toVector(Location loc) {
+        return new Vector(loc.getX(), loc.getY(), loc.getZ());
+    }
+    
+    public static Vector toVector(org.bukkit.util.Vector vector) {
+        return new Vector(vector.getX(), vector.getY(), vector.getZ());
+    }
+    
+    public static Player matchSinglePlayer(Server server, String name) {
+        List<Player> players = server.matchPlayer(name);
+        if (players.size() == 0) {
+            return null;
+        }
+        return players.get(0);
+    }
+}

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

@@ -20,55 +20,47 @@
 package com.sk89q.worldguard.bukkit;
 
 import java.util.logging.Handler;
-import java.util.logging.Level;
 import java.util.logging.LogRecord;
-
 import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 /**
  * Sends all logger messages to a player.
+ *
+ * @author sk89q
  */
 public class LoggerToChatHandler extends Handler {
     /**
      * Player.
      */
-    private CommandSender player;
+    private Player player;
 
     /**
      * Construct the object.
-     *
+     * 
      * @param player
      */
-    public LoggerToChatHandler(CommandSender player) {
+    public LoggerToChatHandler(Player player) {
         this.player = player;
     }
 
     /**
      * Close the handler.
      */
-    @Override
     public void close() {
     }
 
     /**
      * Flush the output.
      */
-    @Override
     public void flush() {
     }
 
     /**
      * Publish a log record.
      */
-    @Override
     public void publish(LogRecord record) {
-        if (record.getLevel().intValue() >= Level.WARNING.intValue()) {
-            player.sendMessage(ChatColor.RED + record.getLevel().getName() + ": "
-                    + ChatColor.YELLOW + record.getMessage());
-        } else {
-            player.sendMessage(ChatColor.GRAY + record.getLevel().getName() + ": "
-                    + ChatColor.WHITE + record.getMessage());
-        }
+        player.sendMessage(ChatColor.GRAY + record.getLevel().getName() + ": "
+                + ChatColor.WHITE + record.getMessage());
     }
 }

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

@@ -0,0 +1,476 @@
+// $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.bukkit;
+
+import java.util.Iterator;
+import java.util.List;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockDamageLevel;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.World;
+import org.bukkit.event.block.*;
+import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
+import org.bukkit.inventory.ItemStack;
+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 {
+    /**
+     * Plugin.
+     */
+    private WorldGuardPlugin plugin;
+    
+    /**
+     * Construct the object;
+     * 
+     * @param plugin
+     */
+    public WorldGuardBlockListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Called when a block is damaged (or broken)
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockDamage(BlockDamageEvent event) {
+        Player player = event.getPlayer();
+
+        if (!plugin.itemDurability && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+            ItemStack held = player.getItemInHand();
+            if (held.getTypeId() > 0) {
+                held.setDurability((short) -1);
+                player.setItemInHand(held);
+            }
+        }
+        
+        if (plugin.useRegions && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+            Vector pt = BukkitUtil.toVector(event.getBlock());
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+            
+            if (!plugin.hasPermission(player, "/regionbypass")
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
+        if (plugin.blacklist != null && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+            if (!plugin.blacklist.check(
+                    new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(event.getBlock()),
+                            event.getBlock().getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (!plugin.blacklist.check(
+                    new DestroyWithBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(event.getBlock()),
+                            player.getItemInHand().getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a block flows (water/lava)
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockFlow(BlockFromToEvent event) {
+        World world = event.getBlock().getWorld();
+        Block blockFrom = event.getBlock();
+        Block blockTo = event.getToBlock();
+        
+        boolean isWater = blockFrom.getTypeId() == 8 || blockFrom.getTypeId() == 9;
+        boolean isLava = blockFrom.getTypeId() == 10 || blockFrom.getTypeId() == 11;
+
+        if (plugin.simulateSponge && isWater) {
+            int ox = blockTo.getX();
+            int oy = blockTo.getY();
+            int oz = blockTo.getZ();
+
+            for (int cx = -plugin.spongeRadius; cx <= plugin.spongeRadius; cx++) {
+                for (int cy = -plugin.spongeRadius; cy <= plugin.spongeRadius; cy++) {
+                    for (int cz = -plugin.spongeRadius; cz <= plugin.spongeRadius; cz++) {
+                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
+                        if (sponge.getTypeId() == 19
+                                && (!plugin.redstoneSponges || !sponge.isBlockIndirectlyPowered())) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+
+        /*if (plugin.classicWater && isWater) {
+            int blockBelow = blockFrom.getRelative(0, -1, 0).getTypeId();
+            if (blockBelow != 0 && blockBelow != 8 && blockBelow != 9) {
+                blockFrom.setTypeId(9);
+                if (blockTo.getTypeId() == 0) {
+                    blockTo.setTypeId(9);
+                }
+                return;
+            }
+        }*/
+
+        if (plugin.preventWaterDamage.size() > 0 && isWater) {
+            int targetId = world.getBlockTypeIdAt(
+                    blockTo.getX(), blockTo.getY(), blockTo.getZ());
+            if (plugin.preventWaterDamage.contains(targetId)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (plugin.allowedLavaSpreadOver.size() > 0 && isLava) {
+            int targetId = world.getBlockTypeIdAt(
+                    blockTo.getX(), blockTo.getY() - 1, blockTo.getZ());
+            if (!plugin.allowedLavaSpreadOver.contains(targetId)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a block gets ignited
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockIgnite(BlockIgniteEvent event) {
+        IgniteCause cause = event.getCause();
+        Block block = event.getBlock();
+        //Player player = event.getPlayer();
+        World world = block.getWorld();
+        boolean isFireSpread = cause == IgniteCause.SPREAD;
+        
+        if (plugin.preventLavaFire && cause == IgniteCause.LAVA) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.disableFireSpread && isFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+        
+        if (plugin.blockLighter && cause == IgniteCause.FLINT_AND_STEEL) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.fireSpreadDisableToggle && isFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.disableFireSpreadBlocks.size() > 0 && isFireSpread) {
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
+            
+            if (plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y - 1, z))
+                    || plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x + 1, y, z))
+                    || plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x - 1, y, z))
+                    || plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z - 1))
+                    || plugin.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z + 1))) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
+        /*if (plugin.useRegions) {
+            Vector pt = toVector(block);
+            
+            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.LAVA && !plugin.regionManager.getApplicableRegions(pt)
+                    .allowsFlag(AreaFlags.FLAG_LAVA_FIRE)) {
+                event.setCancelled(true);
+                return;
+            }
+        }*/
+    }
+
+    /**
+     * Called when a block is destroyed from burning
+     *
+     * @param event Relevant event details
+     */
+    public void onBlockBurn(BlockBurnEvent event) {
+        if (plugin.disableFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.fireSpreadDisableToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.disableFireSpreadBlocks.size() > 0) {
+            Block block = event.getBlock();
+
+            if (plugin.disableFireSpreadBlocks.contains(block.getTypeId())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when block physics occurs
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockPhysics(BlockPhysicsEvent event) {
+        int id = event.getChangedTypeId();
+
+        if (id == 13 && plugin.noPhysicsGravel) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (id == 12 && plugin.noPhysicsSand) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (id == 90 && plugin.allowPortalAnywhere) {
+            event.setCancelled(true);
+            return;
+        }
+    }
+    
+    /**
+     * Called when a block is interacted with
+     * 
+     * @param event Relevant event details
+     */
+    public void onBlockInteract(BlockInteractEvent event) {
+        Block block = event.getBlock();
+        LivingEntity entity = event.getEntity();
+        
+        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);
+                    return;
+                }
+            }
+        }
+        
+        if (plugin.blacklist != null && entity instanceof Player) {
+            Player player = (Player)entity;
+            
+            if (!plugin.blacklist.check(
+                    new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
+                            block.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a player places a block
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockPlace(BlockPlaceEvent event) {
+        Block blockPlaced = event.getBlock();
+        Player player = event.getPlayer();
+        World world = blockPlaced.getWorld();
+        
+        if (plugin.useRegions) {
+            Vector pt = toVector(blockPlaced);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (!plugin.hasPermission(player, "/regionbypass")
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
+        if (plugin.blacklist != null) {
+            if (!plugin.blacklist.check(
+                    new BlockPlaceBlacklistEvent(plugin.wrapPlayer(player), toVector(blockPlaced),
+                            blockPlaced.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (plugin.simulateSponge && blockPlaced.getTypeId() == 19) {
+            if (plugin.redstoneSponges && blockPlaced.isBlockIndirectlyPowered()) {
+                return;
+            }
+            
+            int ox = blockPlaced.getX();
+            int oy = blockPlaced.getY();
+            int oz = blockPlaced.getZ();
+
+            clearSpongeWater(world, ox, oy, oz);
+        }
+    }
+
+    /**
+     * Called when a player right clicks a block
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockRightClick(BlockRightClickEvent event) {
+        Player player = event.getPlayer();
+        
+        if (plugin.useRegions && event.getItemInHand().getTypeId() == plugin.regionWand) {
+            Vector pt = toVector(event.getBlock());
+            ApplicableRegionSet app = plugin.regionManager.getApplicableRegions(pt);
+            List<String> regions = plugin.regionManager.getApplicableRegionsIDs(pt);
+            
+            if (regions.size() > 0) {
+                player.sendMessage(ChatColor.YELLOW + "Can you build? "
+                        + (app.canBuild(plugin.wrapPlayer(player)) ? "Yes" : "No"));
+                
+                StringBuilder str = new StringBuilder();
+                for (Iterator<String> it = regions.iterator(); it.hasNext(); ) {
+                    str.append(it.next());
+                    if (it.hasNext()) {
+                        str.append(", ");
+                    }
+                }
+                
+                player.sendMessage(ChatColor.YELLOW + "Applicable regions: " + str.toString());
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "WorldGuard: No defined regions here!");
+            }
+        }
+    }
+
+
+    /**
+     * Called when redstone changes
+     * From: the source of the redstone change
+     * To: The redstone dust that changed
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockRedstoneChange(BlockRedstoneEvent event) {
+        World world = event.getBlock().getWorld();
+        Block blockTo = event.getBlock();
+
+        if (plugin.simulateSponge && plugin.redstoneSponges) {
+            int ox = blockTo.getX();
+            int oy = blockTo.getY();
+            int oz = blockTo.getZ();
+            
+            for (int cx = -1; cx <= 1; cx++) {
+                for (int cy = -1; cy <= 1; cy++) {
+                    for (int cz = -1; cz <= 1; cz++) {
+                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
+                        if (sponge.getTypeId() == 19
+                                && sponge.isBlockIndirectlyPowered()) {
+                            clearSpongeWater(world, ox + cx, oy + cy, oz + cz);
+                        }
+                    }
+                }
+            }
+            
+            return;
+        }
+    }
+    
+    /**
+     * Remove water around a sponge.
+     * 
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     */
+    private void clearSpongeWater(World world, int ox, int oy, int oz) {
+        for (int cx = -plugin.spongeRadius; cx <= plugin.spongeRadius; cx++) {
+            for (int cy = -plugin.spongeRadius; cy <= plugin.spongeRadius; cy++) {
+                for (int cz = -plugin.spongeRadius; cz <= plugin.spongeRadius; cz++) {
+                    Block block = world.getBlockAt(ox + cx, oy + cy, oz + cz);
+                    int id = block.getTypeId();
+                    if (id == 8 || id == 9) {
+                        world.getBlockAt(ox + cx, oy + cy, oz + cz)
+                                .setTypeId(0);
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,273 @@
+// $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.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
+{
+	/**
+	 * Plugin.
+	 */
+	private WorldGuardPlugin plugin;
+
+	/**
+	 * Construct the object;
+	 *
+	 * @param plugin
+	 */
+	public WorldGuardEntityListener(WorldGuardPlugin plugin)
+	{
+		this.plugin = plugin;
+	}
+
+	@Override
+	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.disableLavaDamage && type == DamageCause.LAVA)
+			{
+				event.setCancelled(true);
+				return;
+			}
+
+			if (plugin.disableContactDamage && type == DamageCause.CONTACT)
+			{
+				event.setCancelled(true);
+				return;
+			}
+
+			if (type == DamageCause.ENTITY_ATTACK)
+			{
+				Entity attacker = ((EntityDamageByEntityEvent)event).getDamager();
+
+				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;
+						}
+					}
+				}
+
+				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;
+							}
+						}
+					}
+				}
+			}
+
+			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 (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.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

@@ -0,0 +1,161 @@
+// $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.bukkit;
+
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.*;
+import org.bukkit.inventory.ItemStack;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.*;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.protection.AreaFlags;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+
+/**
+ * Handles all events thrown in relation to a Player
+ */
+public class WorldGuardPlayerListener extends PlayerListener {
+    /**
+     * Plugin.
+     */
+    private WorldGuardPlugin plugin;
+    
+    /**
+     * Construct the object;
+     * 
+     * @param plugin
+     */
+    public WorldGuardPlayerListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Called when a player joins a server
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerJoin(PlayerEvent event) {
+        Player player = event.getPlayer();
+        
+        if (plugin.fireSpreadDisableToggle) {
+            player.sendMessage(ChatColor.YELLOW
+                    + "Fire spread is currently globally disabled.");
+        }
+
+        if (plugin.inGroup(player, "wg-invincible")) {
+            plugin.invinciblePlayers.add(player.getName());
+        }
+
+        if (plugin.inGroup(player, "wg-amphibious")) {
+            plugin.amphibiousPlayers.add(player.getName());
+        }
+    }
+
+    /**
+     * Called when a player leaves a server
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerQuit(PlayerEvent event) {
+        Player player = event.getPlayer();
+        plugin.invinciblePlayers.remove(player.getName());
+        plugin.amphibiousPlayers.remove(player.getName());
+        if (plugin.blacklist != null) {
+            plugin.blacklist.forgetPlayer(plugin.wrapPlayer(player));
+        }
+    }
+    
+    /**
+     * Called when a player uses an item
+     * 
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerItem(PlayerItemEvent event) {
+        Player player = event.getPlayer();
+        Block block = event.getBlockClicked();
+        ItemStack item = event.getItem();
+
+        if (!plugin.itemDurability) {
+            // Hoes
+            if (item.getTypeId() >= 290 && item.getTypeId() <= 294) {
+                item.setDurability((byte)-1);
+                player.setItemInHand(item);
+            }
+        }
+        
+        if (plugin.useRegions && !event.isBlock() && block != null) {
+            Vector pt = toVector(block.getRelative(event.getBlockFace()));
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+            
+            if (!plugin.hasPermission(player, "/regionbypass")
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED
+                        + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
+        if (plugin.blacklist != null && item != null && block != null) {
+            if (!plugin.blacklist.check(
+                    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;
+            }
+        }
+    }
+
+    /**
+     * Called when a player attempts to log in to the server
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        Player player = event.getPlayer();
+        
+        if (plugin.enforceOneSession) {
+            String name = player.getName();
+            
+            for (Player pl : plugin.getServer().getOnlinePlayers()) {
+                if (pl.getName().equalsIgnoreCase(name)) {
+                    pl.kickPlayer("Logged in from another location.");
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,126 @@
+// $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.domains;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class DefaultDomain implements Domain {
+    private Set<String> groups;
+    private Set<String> players;
+    
+    public DefaultDomain() {
+        this.groups = new LinkedHashSet<String>();
+        this.players = new HashSet<String>();
+    }
+    
+    public void addPlayer(String name) {
+        players.add(name.toLowerCase());
+    }
+    
+    public void addPlayer(LocalPlayer player) {
+        players.add(player.getName().toLowerCase());
+    }
+    
+    public void removePlayer(String name) {
+        players.remove(name.toLowerCase());
+    }
+    
+    public void removePlayer(LocalPlayer player) {
+        players.remove(player.getName().toLowerCase());
+    }
+    
+    public void addGroup(String name) {
+        groups.add(name.toLowerCase());
+    }
+    
+    public void removeGroup(String name) {
+        groups.remove(name.toLowerCase());
+    }
+    
+    public Set<String> getGroups() {
+        return groups;
+    }
+    
+    public Set<String> getPlayers() {
+        return players;
+    }
+
+    public boolean contains(LocalPlayer player) {
+        if (players.contains(player.getName().toLowerCase())) {
+            return true;
+        }
+        
+        for (String group : groups) {
+            if (player.hasGroup(group)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
+    public int size() {
+        return groups.size();
+    }
+    
+    public String toPlayersString() {
+        StringBuilder str = new StringBuilder();
+        for (Iterator<String> it = players.iterator(); it.hasNext(); ) {
+            str.append(it.next());
+            if (it.hasNext()) {
+                str.append(", ");
+            }
+        }
+        return str.toString();
+    }
+    
+    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(", ");
+            }
+        }
+        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/domains/Domain.java

@@ -0,0 +1,13 @@
+package com.sk89q.worldguard.domains;
+
+import com.sk89q.worldguard.LocalPlayer;
+
+public interface Domain {
+    /**
+     * Returns true if a domain contains a player.
+     * 
+     * @param player
+     * @return
+     */
+    public boolean contains(LocalPlayer player);
+}

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

@@ -0,0 +1,55 @@
+// $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.domains;
+
+import java.util.Set;
+import java.util.LinkedHashSet;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class DomainCollection implements Domain {
+    private Set<Domain> domains;
+    
+    public DomainCollection() {
+        domains = new LinkedHashSet<Domain>();
+    }
+    
+    public void add(Domain domain) {
+        domains.add(domain);
+    }
+    
+    public void remove(Domain domain) {
+        domains.remove(domain);
+    }
+    
+    public int size() {
+        return domains.size();
+    }
+
+    public boolean contains(LocalPlayer player) {
+        for (Domain domain : domains) {
+            if (domain.contains(player)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+}

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

@@ -0,0 +1,56 @@
+// $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.domains;
+
+import java.util.Arrays;
+import java.util.Set;
+import java.util.LinkedHashSet;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class GroupDomain implements Domain {
+    private Set<String> groups;
+    
+    public GroupDomain() {
+        this.groups = new LinkedHashSet<String>();
+    }
+    
+    public GroupDomain(String[] groups) {
+        this.groups = new LinkedHashSet<String>(Arrays.asList(groups));
+    }
+    
+    public void addGroup(String name) {
+        groups.add(name);
+    }
+
+    public boolean contains(LocalPlayer player) {
+        for (String group : groups) {
+            if (player.hasGroup(group)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
+    public int size() {
+        return groups.size();
+    }
+
+}

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

@@ -0,0 +1,53 @@
+// $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.domains;
+
+import java.util.Set;
+import java.util.HashSet;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class PlayerDomain implements Domain {
+    private Set<String> players;
+    
+    public PlayerDomain() {
+        this.players = new HashSet<String>();
+    }
+    
+    public PlayerDomain(String[] players) {
+        this.players = new HashSet<String>();
+        
+        for (String name : players) {
+            this.players.add(name.toLowerCase());
+        }
+    }
+    
+    public void addPlayer(String name) {
+        players.add(name.toLowerCase());
+    }
+    
+    public boolean contains(LocalPlayer player) {
+        return players.contains(player.getName().toLowerCase());
+    }
+    
+    public int size() {
+        return players.size();
+    }
+
+}

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

@@ -0,0 +1,186 @@
+// $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.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.AreaFlags.State;
+
+/**
+ * Represents a set of regions and their rules as applied to one point.
+ * 
+ * @author sk89q
+ */
+public class ApplicableRegionSet {
+    private GlobalFlags global;
+    private Vector pt;
+    private Iterator<ProtectedRegion> applicable;
+    
+    /**
+     * Construct the object.
+     * 
+     * @param pt
+     * @param regions
+     * @param global
+     */
+    public ApplicableRegionSet(Vector pt, Iterator<ProtectedRegion> applicable,
+            GlobalFlags global) {
+        this.pt = pt;
+        this.applicable = applicable;
+        this.global = global;
+    }
+    
+    /**
+     * Checks if a player can build in an area.
+     * 
+     * @param player
+     * @return
+     */
+    public boolean canBuild(LocalPlayer player) {
+        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;
+        } else if (flag.equals(AreaFlags.FLAG_PVP)) {
+            def = global.canPvP;
+        }
+        
+        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>();
+        
+        while (applicable.hasNext()) {
+            ProtectedRegion region = applicable.next();
+            
+            // 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;
+            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);
+            }
+            
+            parent = parent.getParent();
+        }
+    }
+}

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

@@ -0,0 +1,145 @@
+// $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.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Holds the flags for a region.
+ * 
+ * @author sk89q
+ */
+public class AreaFlags {
+    public enum State {
+        NONE,
+        ALLOW,
+        DENY,
+    };
+
+    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) {
+        if (!(obj instanceof AreaFlags)) {
+            return false;
+        }
+        
+        AreaFlags other = (AreaFlags)obj;
+        return other.states.equals(this);
+    }
+}

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

@@ -0,0 +1,414 @@
+// $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.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.
+ * 
+ * @author sk89q
+ */
+public class CSVDatabase implements ProtectionDatabase {
+    private static Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+    
+    /**
+     * References the CSV file.
+     */
+    private File file;
+    /**
+     * Holds the list of regions.
+     */
+    private Map<String,ProtectedRegion> regions;
+    
+    /**
+     * Construct the database with a path to a file. No file is read or
+     * written at this time.
+     * 
+     * @param file
+     */
+    public CSVDatabase(File file) {
+        this.file = file;
+    }
+
+    /**
+     * Saves the database.
+     */
+    @Override
+    public void save() throws IOException {
+        CSVWriter writer = new CSVWriter(new FileWriter(file));
+        
+        try {
+            for (Map.Entry<String,ProtectedRegion> entry : regions.entrySet()) {
+                String id = entry.getKey();
+                ProtectedRegion region = entry.getValue();
+                
+                if (!(region instanceof ProtectedCuboidRegion)) {
+                    logger.warning("The CSV database only supports cuboid regions.");
+                    continue;
+                }
+                
+                ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion)region;
+                BlockVector min = cuboid.getMinimumPoint();
+                BlockVector max = cuboid.getMaximumPoint();
+                
+                writer.writeNext(new String[] {
+                        id,
+                        "cuboid.2",
+                        String.valueOf(min.getBlockX()),
+                        String.valueOf(min.getBlockY()),
+                        String.valueOf(min.getBlockZ()),
+                        String.valueOf(max.getBlockX()),
+                        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() != null ? cuboid.getEnterMessage() : "",
+                        cuboid.getLeaveMessage() != null ? cuboid.getLeaveMessage() : "",
+                        });
+            }
+        } finally {
+            try {
+                writer.close();
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    /**
+     * Load the database from file.
+     */
+    @Override
+    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));
+        
+        try {
+            String[] line;
+            
+            while ((line = reader.readNext()) != null) {
+                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;
+                    }
+                    
+                    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 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);
+                    regions.put(id, region);
+                } 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 {
+            try {
+                reader.close();
+            } catch (IOException e) {
+            }
+        }
+        
+        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;
+    }
+
+    /**
+     * Load the list of regions into a region manager.
+     * 
+     * @throws IOException
+     */
+    public void load(RegionManager manager) throws IOException {
+        load();
+        manager.setRegions(regions);
+    }
+    
+    /**
+     * Save the list of regions from a region manager.
+     * 
+     * @throws IOException
+     */
+    public void save(RegionManager manager) throws IOException {
+        regions = manager.getRegions();
+        save();
+    }
+    
+    /**
+     * Used to parse the specified domain in the CSV file.
+     * 
+     * @param data
+     * @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()) {
+                logger.warning("Invalid owner specification: " + part);
+                continue;
+            }
+
+            String type = matcher.group(1);
+            String id = matcher.group(2);
+
+            if (type.equals("u")) {
+                domain.addPlayer(id);
+            } else if (type.equals("g")) {
+                domain.addGroup(id);
+            } else {
+                logger.warning("Unknown owner specification: " + type);
+            }
+        }
+        
+        return domain;
+    }
+    
+    /**
+     * Used to parse the list of flags.
+     * 
+     * @param data
+     * @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 k = data.charAt(i);
+            if (k == '+') {
+                curState = State.ALLOW;
+            } else if (k == '-') {
+                curState = State.DENY;
+            } else {
+                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);
+            }
+        }
+        
+        return flags;
+    }
+    
+    /**
+     * Used to write the list of domains.
+     * 
+     * @param domain
+     * @return
+     */
+    private String writeDomains(DefaultDomain domain) {
+        StringBuilder str = new StringBuilder();
+        
+        for (String player : domain.getPlayers()) {
+            str.append("u:" + player + ",");
+        }
+        
+        for (String group : domain.getGroups()) {
+            str.append("g:" + group + ",");
+        }
+        
+        return str.length() > 0 ?
+                str.toString().substring(0, str.length() - 1) : "";
+    }
+    
+    /**
+     * Helper method to prepend '+' or '-' in front of a flag according
+     * to the flag's state.
+     * 
+     * @param state
+     * @param flag
+     * @return
+     */
+    private String writeFlag(State state, String flag) {
+        if (state == State.ALLOW) {
+            return "+" + flag;
+        } else if (state == State.DENY) {
+            return "-" + flag;
+        }
+        
+        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.
+     * 
+     * @param flags
+     * @return
+     */
+    private String writeFlags(AreaFlags flags) {
+        StringBuilder str = new StringBuilder();
+        for (Map.Entry<String, State> entry : flags.entrySet()) {
+            str.append(writeFlag(entry.getValue(), entry.getKey()));
+        }
+        return str.toString();
+    }
+
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    public Map<String,ProtectedRegion> getRegions() {
+        return regions;
+    }
+
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions) {
+        this.regions = regions;
+    }
+}

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

@@ -0,0 +1,183 @@
+// $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.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+/**
+ * A very simple implementation of the region manager that uses a flat list
+ * and iterates through the list to identify applicable regions. This method
+ * is not very efficient.
+ * 
+ * @author sk89q
+ */
+public class FlatRegionManager implements RegionManager {
+    /**
+     * List of protected regions.
+     */
+    private Map<String,ProtectedRegion> regions;
+    /**
+     * Global flags.
+     */
+    private GlobalFlags global;
+    
+    /**
+     * Construct the manager.
+     */
+    public FlatRegionManager(GlobalFlags global) {
+        regions = new TreeMap<String,ProtectedRegion>();
+        this.global = global;
+    }
+    
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    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(ProtectedRegion region) {
+        regions.put(region.getId(), 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());
+                }
+            }
+        }
+    }
+    
+    /**
+     * Return whether a region exists by an ID.
+     * 
+     * @param id
+     * @return
+     */
+    public boolean hasRegion(String id) {
+        return regions.containsKey(id);
+    }
+    
+    /**
+     * Get a region by its ID.
+     * 
+     * @param id
+     */
+    public ProtectedRegion getRegion(String id) {
+        return regions.get(id);
+    }
+    
+    /**
+     * Get an object for a point for rules to be applied with.
+     * 
+     * @param pt
+     * @return
+     */
+    public ApplicableRegionSet getApplicableRegions(Vector pt) {
+        return new ApplicableRegionSet(pt, regions.values().iterator(), global);
+    }
+    
+    /**
+     * Get a list of region IDs that contain a point.
+     * 
+     * @param pt
+     * @return
+     */
+    public List<String> getApplicableRegionsIDs(Vector pt) {
+        List<String> applicable = new ArrayList<String>();
+        
+        for (Map.Entry<String,ProtectedRegion> entry : regions.entrySet()) {
+            if (entry.getValue().contains(pt)) {
+                applicable.add(entry.getKey());
+            }
+        }
+        
+        return applicable;
+    }
+    
+    /**
+     * Returns true if the provided region overlaps with any other region that
+     * is not owned by the player.
+     * 
+     * @param region
+     * @param player
+     * @return
+     */
+    public boolean overlapsUnownedRegion(ProtectedRegion region, LocalPlayer player) {
+        for (ProtectedRegion other : regions.values()) {
+            if (other.getOwners().contains(player)) {
+                continue;
+            }
+            
+            try {
+                if (ProtectedRegion.intersects(region, other)) {
+                    return true;
+                }
+            } catch (UnsupportedIntersectionException e) {
+                // TODO: Maybe do something here
+            }
+        }
+        
+        return false;
+    }
+    
+    /**
+     * Get the number of regions.
+     * 
+     * @return
+     */
+    public int size() {
+        return regions.size();
+    }
+}

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

@@ -0,0 +1,31 @@
+// $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;
+
+/**
+ * Used for default flags.
+ * 
+ * @author sk89q
+ */
+public class GlobalFlags {
+    public boolean canBuild = true;
+    public boolean canAccessChests = false;
+    public boolean canPvP = true;
+}

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

@@ -0,0 +1,203 @@
+// $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.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import org.khelekore.prtree.MBRConverter;
+import org.khelekore.prtree.PRTree;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class PRTreeRegionManager implements RegionManager {
+    private static final int BRANCH_FACTOR = 30;
+
+    /**
+     * List of protected regions.
+     */
+    private Map<String,ProtectedRegion> regions;
+    /**
+     * Global flags.
+     */
+    private GlobalFlags global;
+    
+    /**
+     * Converter to get coordinates of the tree.
+     */
+    private MBRConverter<ProtectedRegion> converter
+            = new ProtectedRegionMBRConverter();
+    
+    /**
+     * Priority R-tree.
+     */
+    private PRTree<ProtectedRegion> tree;
+
+    /**
+     * Construct the manager.
+     */
+    public PRTreeRegionManager(GlobalFlags global) {
+        regions = new TreeMap<String,ProtectedRegion>();
+        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        this.global = global;
+    }
+    
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    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);
+        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        tree.load(regions.values());
+    }
+
+    /**
+     * Adds a region.
+     * 
+     * @param id
+     * @param region
+     */
+    public void addRegion(ProtectedRegion region) {
+        regions.put(region.getId(), region);
+        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        tree.load(regions.values());
+    }
+
+    /**
+     * Return whether a region exists by an ID.
+     * 
+     * @param id
+     * @return
+     */
+    public boolean hasRegion(String id) {
+        return regions.containsKey(id);
+    }
+
+    /**
+     * Get a region by its ID.
+     * 
+     * @param id
+     */
+    public ProtectedRegion getRegion(String id) {
+        return regions.get(id);
+    }
+    
+    /**
+     * 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());
+                }
+            }
+        }
+
+        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        tree.load(regions.values());
+    }
+
+    /**
+     * Get an object for a point for rules to be applied with.
+     * 
+     * @param pt
+     * @return
+     */
+    public ApplicableRegionSet getApplicableRegions(Vector pt) {
+        return new ApplicableRegionSet(pt, regions.values().iterator(), global);
+    }
+
+    /**
+     * Get a list of region IDs that contain a point.
+     * 
+     * @param pt
+     * @return
+     */
+    public List<String> getApplicableRegionsIDs(Vector pt) {
+        List<String> applicable = new ArrayList<String>();
+
+        int x = pt.getBlockX();
+        int z = pt.getBlockZ();
+        
+        for (ProtectedRegion region : tree.find(x, z, x, z)) {
+            if (region.contains(pt)) {
+                applicable.add(region.getId());
+            }
+        }
+        
+        return applicable;
+    }
+    
+    /**
+     * Returns true if the provided region overlaps with any other region that
+     * is not owned by the player.
+     * 
+     * @param region
+     * @param player
+     * @return
+     */
+    public boolean overlapsUnownedRegion(ProtectedRegion region, LocalPlayer player) {
+        for (ProtectedRegion other : regions.values()) {
+            if (other.getOwners().contains(player)) {
+                continue;
+            }
+            
+            try {
+                if (ProtectedRegion.intersects(region, other)) {
+                    return true;
+                }
+            } catch (UnsupportedIntersectionException e) {
+                // TODO: Maybe do something here
+            }
+        }
+        
+        return false;
+    }
+    
+    /**
+     * Get the number of regions.
+     * 
+     * @return
+     */
+    public int size() {
+        return regions.size();
+    }
+
+}

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

@@ -0,0 +1,110 @@
+// $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 com.sk89q.worldedit.*;
+
+/**
+ * Represents a cuboid region that can be protected.
+ *
+ * @author sk89q
+ */
+public class ProtectedCuboidRegion extends ProtectedRegion {
+    /**
+     * Store the first point.
+     */
+    private BlockVector min;
+    /**
+     * Store the second point.
+     */
+    private BlockVector max;
+
+    /**
+     * Construct a new instance of this cuboid region.
+     *
+     * @param id
+     * @param pos1
+     * @param pos2
+     * @param priority
+     */
+    public ProtectedCuboidRegion(String id, BlockVector min, BlockVector max) {
+        super(id);
+        this.min = min;
+        this.max = max;
+    }
+
+    /**
+     * Get the lower point of the cuboid.
+     *
+     * @return min point
+     */
+    public BlockVector getMinimumPoint() {
+        return min;
+    }
+
+    /**
+     * Set the lower point of the cuboid.
+     *
+     * @param pt
+     */
+    public void setMinimumPoint(BlockVector pt) {
+        min = pt;
+    }
+
+    /**
+     * Get the upper point of the cuboid.
+     *
+     * @return max point
+     */
+    public BlockVector getMaximumPoint() {
+        return max;
+    }
+
+    /**
+     * Set the upper point of the cuboid.
+     *
+     * @param pt
+     */
+    public void setMaximumPoint(BlockVector pt) {
+        max = pt;
+    }
+
+    /**
+     * Checks to see if a point is inside this region.
+     */
+    @Override
+    public boolean contains(Vector pt) {
+        int x = pt.getBlockX();
+        int y = pt.getBlockY();
+        int z = pt.getBlockZ();
+        return x >= min.getBlockX() && x <= max.getBlockX()
+                && 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

@@ -0,0 +1,334 @@
+// $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 com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.domains.DefaultDomain;
+
+/**
+ * Represents a region of any shape and size that can be protected.
+ * 
+ * @author sk89q
+ */
+public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
+    /**
+     * Holds the region's ID.
+     */
+    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 region.
+     *
+     * @param id
+     */
+    public ProtectedRegion(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @return the id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Get the lower point of the cuboid.
+     *
+     * @return min point
+     */
+    public abstract BlockVector getMinimumPoint();
+
+    /**
+     * Get the upper point of the cuboid.
+     *
+     * @return max point
+     */
+    public abstract BlockVector getMaximumPoint();
+
+    /**
+     * @return the priority
+     */
+    public int getPriority() {
+        return priority;
+    }
+
+    /**
+     * @param priority the priority to set
+     */
+    public void setPriority(int priority) {
+        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
+     */
+    public void setFlags(AreaFlags flags) {
+        this.flags = flags;
+    }
+    
+    /**
+     * @return the enterMessage
+     */
+    public String getEnterMessage() {
+        return enterMessage;
+    }
+
+    /**
+     * @param enterMessage the enterMessage to set
+     */
+    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
+     */
+    public DefaultDomain getOwners() {
+        return owners;
+    }
+
+    /**
+     * @param owners the owners to set
+     */
+    public void setOwners(DefaultDomain owners) {
+        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.
+     * 
+     * @return
+     */
+    public AreaFlags getFlags() {
+        return flags;
+    }
+    
+    /**
+     * Check to see if a point is inside this region.
+     * 
+     * @param pt
+     * @return
+     */
+    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.
+     * 
+     * @param region1
+     * @param region2
+     * @throws UnsupportedIntersectionException
+     * @return
+     */
+    public static boolean intersects(ProtectedRegion region1, ProtectedRegion region2)
+            throws UnsupportedIntersectionException {
+        if (region1 instanceof ProtectedCuboidRegion
+                && region2 instanceof ProtectedCuboidRegion) {
+            ProtectedCuboidRegion r1 = (ProtectedCuboidRegion)region1;
+            ProtectedCuboidRegion r2 = (ProtectedCuboidRegion)region2;
+            BlockVector min1 = r1.getMinimumPoint();
+            BlockVector max1 = r1.getMaximumPoint();
+            BlockVector min2 = r2.getMinimumPoint();
+            BlockVector max2 = r2.getMaximumPoint(); 
+            
+            return !(min1.getBlockX() > max2.getBlockX()
+                    || min1.getBlockY() > max2.getBlockY()
+                    || min1.getBlockZ() > max2.getBlockZ()
+                    || max1.getBlockX() < min2.getBlockX()
+                    || max1.getBlockY() < min2.getBlockY()
+                    || max1.getBlockZ() < min2.getBlockZ());
+        } else {
+            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/ProtectedRegionMBRConverter.java

@@ -0,0 +1,41 @@
+// $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 org.khelekore.prtree.MBRConverter;
+
+public class ProtectedRegionMBRConverter implements MBRConverter<ProtectedRegion> {
+    public double getMinX(ProtectedRegion t) {
+        return t.getMinimumPoint().getBlockX();
+    }
+
+    public double getMinY(ProtectedRegion t) {
+        return t.getMinimumPoint().getBlockZ();
+    }
+
+    public double getMaxX(ProtectedRegion t) {
+        return t.getMaximumPoint().getBlockX();
+    }
+
+    public double getMaxY(ProtectedRegion t) {
+        return t.getMaximumPoint().getBlockZ();
+    }
+
+}

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

@@ -0,0 +1,68 @@
+// $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.io.IOException;
+import java.util.Map;
+
+/**
+ * Represents a database to read and write lists of regions from and to.
+ * 
+ * @author sk89q
+ */
+public interface ProtectionDatabase {
+    /**
+     * Load the list of regions. The method should not modify the list returned
+     * by getRegions() unless the load finishes successfully.
+     * 
+     * @throws IOException
+     */
+    public void load() throws IOException;
+    /**
+     * Save the list of regions.
+     * 
+     * @throws IOException
+     */
+    public void save() throws IOException;
+    /**
+     * Load the list of regions into a region manager.
+     * 
+     * @throws IOException
+     */
+    public void load(RegionManager manager) throws IOException;
+    /**
+     * Save the list of regions from a region manager.
+     * 
+     * @throws IOException
+     */
+    public void save(RegionManager manager) throws IOException;
+    /**
+     * Get a list of regions.
+     * 
+     * @return
+     */
+    public Map<String,ProtectedRegion> getRegions();
+    /**
+     * Set the list of regions.
+     * 
+     * @param regions
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions);
+}

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

@@ -0,0 +1,112 @@
+// $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.List;
+import java.util.Map;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+/**
+ * An interface for getting, setting, and looking up regions. The most
+ * simple implementation uses a flat list and iterates through the entire
+ * list to look for applicable regions, but a more complicated (and more
+ * efficient) implementation may use space partitioning techniques.
+ *
+ * @author sk89q
+ */
+public interface RegionManager {
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    public Map<String, ProtectedRegion> getRegions();
+    
+    /**
+     * Set a list of protected regions.
+     *
+     * @return
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions);
+    
+    /**
+     * Adds a region.
+     * 
+     * @param id
+     * @param region
+     */
+    public void addRegion(ProtectedRegion region);
+    
+    /**
+     * Return whether a region exists by an ID.
+     * 
+     * @param id
+     * @return
+     */
+    public boolean hasRegion(String id);
+    
+    /**
+     * Get a region by its ID.
+     * 
+     * @param id
+     */
+    public ProtectedRegion getRegion(String id);
+    
+    /**
+     * Removes a region, including inheriting children.
+     * 
+     * @param id
+     */
+    public void removeRegion(String id);
+
+    /**
+     * Get an object for a point for rules to be applied with.
+     * 
+     * @param pt
+     * @return
+     */
+    public ApplicableRegionSet getApplicableRegions(Vector pt);
+    
+    /**
+     * Get a list of region IDs that contain a point.
+     * 
+     * @param pt
+     * @return
+     */
+    public List<String> getApplicableRegionsIDs(Vector pt);
+    
+    /**
+     * Returns true if the provided region overlaps with any other region that
+     * is not owned by the player.
+     * 
+     * @param region
+     * @param player
+     * @return
+     */
+    public boolean overlapsUnownedRegion(ProtectedRegion region, LocalPlayer player);
+    
+    /**
+     * Get the number of regions.
+     * 
+     * @return
+     */
+    public int size();
+}

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

@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.sk89q.worldguard.region;
+package com.sk89q.worldguard.protection;
 
 public class UnsupportedIntersectionException extends Exception {
     private static final long serialVersionUID = 6423189392345575148L;

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

@@ -25,24 +25,17 @@ public class ArrayReader<T> {
     public ArrayReader(T[] arr) {
         this.arr = arr;
     }
-
-    /**
-     * Gets an element from the array
-     * @param index The index to get an element at
-     * @return The element at {@code index} if the index is within bounds, otherwise null
-     */
+    
     public T get(int index) {
-        return get(index, null);
+        if (arr.length > index) {
+            return arr[index];
+        } else {
+            return null;
+        }
     }
-
-    /**
-     * Gets an element from the array
-     * @param index The index to get an element at
-     * @param def the default value, used when the given index is out of bounds
-     * @return The element at {@code index} if the index is within bounds, otherwise the default value
-     */
+    
     public T get(int index, T def) {
-        if (index >= 0 && arr.length > index) {
+        if (arr.length > index) {
             return arr[index];
         } else {
             return def;

src/main/assembly/default.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>default</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <files>
-    <file>
-      <source>${project.build.directory}/${artifactId}-${project.version}.jar</source>
-      <destName>WorldGuard.jar</destName>
-      <outputDirectory>/</outputDirectory>
-      <filtered>false</filtered>
-    </file>
-    <file>
-      <source>README.html</source>
-      <outputDirectory>/</outputDirectory>
-      <filtered>true</filtered>
-    </file>
-  </files>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>LICENSE.txt</include>
-        <include>NOTICE.txt</include>
-        <include>CHANGELOG.txt</include>
-        <include>contrib/blacklist_table.sql</include>
-        <include>contrib/region_storage.sql</include>
-        <include>contrib/region_storage_update_20110325.sql</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>

src/main/java/com/sk89q/rulelists/Action.java

@@ -1,35 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-/**
- * An action that will be performed if the conditions are matched of the rule.
- * 
- * @param <T> implementation-specific context object
- */
-public interface Action<T extends Context> {
-    
-    /**
-     * Apply the action.
-     * 
-     * @param context implementation-specific context object
-     */
-    void apply(T context);
-    
-}

src/main/java/com/sk89q/rulelists/Attachment.java

@@ -1,75 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-/**
- * An attachment is analogous to an event.
- */
-public final class Attachment {
-
-    private static int NEXT_ID = 0;
-
-    private final int id;
-    private final String alias;
-
-    /**
-     * Create a new attachment with the given alias. The alias is used in rule list
-     * files.
-     *
-     * @param alias alias name
-     */
-    public Attachment(String alias) {
-        this.alias = alias;
-
-        // No internal ID
-        id = -1;
-    }
-
-    /**
-     * Create a new attachment with the given alias. The alias is used in rule list
-     * files.
-     *
-     * @param alias alias name
-     * @param isInternal true to assign this attachment a standard internal ID
-     */
-    Attachment(String alias, boolean isInternal) {
-        this.alias = alias;
-
-        id = isInternal ? NEXT_ID++ : -1;
-    }
-
-    /**
-     * Get the internal ID.
-     *
-     * @return ID number, possibly -1 for no internal ID
-     */
-    int getId() {
-        return id;
-    }
-
-    /**
-     * Get the alias used inside rule list files.
-     *
-     * @return alias
-     */
-    public String getAlias() {
-        return alias;
-    }
-
-}

src/main/java/com/sk89q/rulelists/AttachmentManager.java

@@ -1,77 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import com.sk89q.rebar.config.Loader;
-import com.sk89q.rebar.config.LoaderBuilderException;
-
-/**
- * A database of valid attachments.
- */
-public final class AttachmentManager implements Loader<Attachment> {
-
-    private Set<Attachment> attachments = new HashSet<Attachment>();
-    private Map<String, Attachment> aliasMap = new HashMap<String, Attachment>();
-
-    public AttachmentManager() {
-    }
-
-    /**
-     * Register an attachment.
-     *
-     * @param attachment the attachment
-     */
-    public synchronized void register(Attachment attachment) {
-        if (attachments.contains(attachment)
-                || aliasMap.containsKey(attachment.getAlias().toLowerCase())) {
-            throw new IllegalArgumentException("Attachment '" + attachment + "' already registered.");
-        }
-
-        attachments.add(attachment);
-        aliasMap.put(attachment.getAlias().toLowerCase(), attachment);
-    }
-
-    /**
-     * Get an attachment by its alias.
-     *
-     * @param alias alias, case in-sensitive
-     * @return an attachment or null
-     */
-    public synchronized Attachment lookup(String alias) {
-        return aliasMap.get(alias.toLowerCase());
-    }
-
-    @Override
-    public Attachment read(Object value) throws LoaderBuilderException {
-        String id = String.valueOf(value);
-
-        Attachment attachment = lookup(id);
-        if (attachment == null) {
-            throw new LoaderBuilderException("Unknown RuleList attachment: " + id);
-        }
-
-        return attachment;
-    }
-
-}

src/main/java/com/sk89q/rulelists/Context.java

@@ -1,88 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-/**
- * A context has some shared variables that may be used by a number of different
- * events. Because the context contains common information, criteria and
- * actions do not have to be custom tailored to specific implementation-specific
- * events, and can refer to the the properties set on the context. The place
- * where the information is known as to what is considered the proper valid
- * value of a common property is during the initial handling of
- * the event in the implementation.
- * </p>
- * Implementations need to have custom contexts that can carry more
- * information than offered in this abstract implementation. Criteria and
- * actions can be implement-specific by tailoring themselves to one of these
- * implementation-specific contexts.
- * 
- * @author sk89q
- */
-public abstract class Context {
-    
-    private boolean matches = false;
-    private boolean cancelled = false;
-
-    /**
-     * Gets whether the event associated with this context has been set to
-     * be cancelled.
-     * 
-     * @return true if the event is set to be cancelled
-     */
-    public boolean isCancelled() {
-        return cancelled;
-    }
-    
-    /**
-     * Set the event associated with this context to be cancelled, if possible.
-     */
-    public void cancel() {
-        setCancelled(true);
-    }
-
-    /**
-     * Set the event associated with this context to be cancelled, if possible.
-     * 
-     * @param cancelled true to cancel
-     */
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    /**
-     * Set as to whether all the conditions associated with this context have
-     * evaluated to being true.
-     * 
-     * @param matches match state
-     */
-    void setMatches(boolean matches) {
-        this.matches = matches;
-    }
-    
-    /**
-     * Returns whether all the conditions associated with this context
-     * have been evaluated to true.
-     * 
-     * @return true if all the conditions have been true
-     */
-    public boolean matches() {
-        return matches;
-    }
-
-}

src/main/java/com/sk89q/rulelists/Criteria.java

@@ -1,37 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-/**
- * A criteria that is evaluated to decide whether the rule should undergo
- * further processing.
- * 
- * @param <T> an implementation-specific context
- */
-public interface Criteria<T extends Context> {
-
-    /**
-     * Returns whether the current event / context matches this criteria.
-     * 
-     * @param context context to verify
-     * @return true if it matches
-     */
-    boolean matches(T context);
-
-}

src/main/java/com/sk89q/rulelists/DefaultAttachments.java

@@ -1,80 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-/**
- * Contains names of standard attachments.
- */
-public final class DefaultAttachments {
-
-    public final static Attachment BLOCK_BREAK = new Attachment("block-break", true);
-    public final static Attachment BLOCK_PLACE = new Attachment("block-place", true);
-    public final static Attachment BLOCK_SPREAD = new Attachment("block-spread", true);
-    public final static Attachment BLOCK_PHYSICS = new Attachment("block-physics", true);
-    public final static Attachment BLOCK_INTERACT = new Attachment("block-interact", true);
-    public final static Attachment BLOCK_FADE = new Attachment("block-fade", true);
-    public final static Attachment BLOCK_FORM = new Attachment("block-form", true);
-    public final static Attachment PLAYER_JOIN = new Attachment("player-join", true);
-    public final static Attachment PLAYER_RESPAWN = new Attachment("player-respawn", true);
-    public final static Attachment PLAYER_QUIT = new Attachment("player-quit", true);
-    public final static Attachment ENTITY_EXPLODE = new Attachment("entity-explode", true);
-    public final static Attachment ENTITY_DAMAGE = new Attachment("entity-damage", true);
-    public final static Attachment ENTITY_DEATH = new Attachment("entity-death", true);
-    public final static Attachment ENTITY_IGNITE = new Attachment("entity-ignite", true);
-    public final static Attachment ENTITY_SPAWN = new Attachment("entity-spawn", true);
-    public final static Attachment ENTITY_STRIKE = new Attachment("entity-strike", true);
-    public final static Attachment ENTITY_INTERACT = new Attachment("entity-interact", true);
-    public final static Attachment CHAT = new Attachment("chat", true);
-    public final static Attachment ITEM_DROP = new Attachment("item-drop", true);
-    public final static Attachment ITEM_PICKUP = new Attachment("item-pickup", true);
-    public final static Attachment ITEM_USE = new Attachment("item-use", true);
-    public final static Attachment WEATHER_PHENOMENON = new Attachment("weather-phenomenon", true);
-    public final static Attachment WEATHER_TRANSITION = new Attachment("weather-transition", true);
-    public final static Attachment WORLD_LOAD = new Attachment("world-load", true);
-    public final static Attachment WORLD_UNLOAD = new Attachment("world-unload", true);
-    public final static Attachment WORLD_SAVE = new Attachment("world-save", true);
-
-    private DefaultAttachments() {
-
-    }
-
-    /**
-     * Register the attachments in this class with the given manager.
-     *
-     * @param manager the manager
-     */
-    public static void registerWith(AttachmentManager manager) {
-        for (Field field : DefaultAttachments.class.getFields()) {
-            if (Modifier.isStatic(field.getModifiers())
-                    && Attachment.class.isAssignableFrom(field.getType())) {
-                try {
-                    manager.register((Attachment) field.get(null));
-                } catch (IllegalArgumentException e) {
-                    throw new RuntimeException("Failed to register default attachment", e);
-                } catch (IllegalAccessException e) {
-                    throw new RuntimeException("Failed to register default attachment", e);
-                }
-            }
-        }
-    }
-
-}

src/main/java/com/sk89q/rulelists/DefinedRule.java

@@ -1,99 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * A {@link Rule} implementation with a list of {@link Criteria} and
- * {@link Action}s.
- *
- * @param <T> underlying implementation-specific context
- */
-public class DefinedRule<T extends Context> implements Rule<T> {
-    
-    private static Logger logger = Logger.getLogger(Rule.class.getCanonicalName());
-
-    private final List<Criteria<T>> criterion = new LinkedList<Criteria<T>>();
-    private final List<Action<T>> actions = new LinkedList<Action<T>>();
-    
-    /**
-     * Add a criteria to this rule.
-     * 
-     * @param criteria the criteria
-     */
-    public void add(Criteria<T> criteria) {
-        criterion.add(criteria);
-    }
-    
-    /**
-     * Add an action to this rule.
-     * 
-     * @param action the action
-     */
-    public void add(Action<T> action) {
-        actions.add(action);
-    }
-    
-    /**
-     * Returns whether criteria are defined.
-     * 
-     * @return true if there are criteria
-     */
-    public boolean hasCriterion() {
-        return criterion.size() > 0;
-    }
-    
-    /**
-     * Returns whether actions are defined.
-     * 
-     * @return true if there are actions
-     */
-    public boolean hasActions() {
-        return actions.size() > 0;
-    }
-    
-    @Override
-    public boolean matches(T context) {
-        for (Criteria<T> criteria : criterion) {
-            if (!criteria.matches(context)) {
-                context.setMatches(false);
-                return false;
-            }
-        }
-
-        context.setMatches(true);
-        return true;
-    }
-    
-    @Override
-    public void apply(T context) {
-        for (Action<T> action : actions) {
-            try {
-                action.apply(context);
-            } catch (Throwable t) {
-                logger.log(Level.WARNING, "Failed to apply action of rule", t);
-            }
-        }
-    }
-    
-}

src/main/java/com/sk89q/rulelists/DefinitionException.java

@@ -1,42 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import com.sk89q.rebar.config.LoaderBuilderException;
-
-public class DefinitionException extends LoaderBuilderException {
-
-    private static final long serialVersionUID = -5429457695711163632L;
-
-    public DefinitionException() {
-    }
-
-    public DefinitionException(String message) {
-        super(message);
-    }
-
-    public DefinitionException(Throwable cause) {
-        super(cause);
-    }
-
-    public DefinitionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}

src/main/java/com/sk89q/rulelists/DefinitionInitializeEvent.java

@@ -1,47 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-public class DefinitionInitializeEvent extends Event {
-
-    private static final HandlerList handlers = new HandlerList();
-    
-    private final RuleListsManager ruleListsManager;
-    
-    public DefinitionInitializeEvent(RuleListsManager ruleListsManager) {
-        this.ruleListsManager = ruleListsManager;
-    }
-    
-    public RuleListsManager getManager() {
-        return ruleListsManager;
-    }
-    
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-}

src/main/java/com/sk89q/rulelists/DefinitionManager.java

@@ -1,76 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.sk89q.rebar.config.ConfigurationNode;
-import com.sk89q.rebar.config.ConfigurationValue;
-import com.sk89q.rebar.config.Loader;
-
-/**
- * Manages loaders for definitions of the given generic type.
- *
- * @author sk89q
- * @param <V> type to create
- */
-public class DefinitionManager<V> {
-
-    /**
-     * Map of factories.
-     */
-    private Map<String, Loader<? extends V>> factories = new HashMap<String, Loader<? extends V>>();
-
-    /**
-     * Register a loader.
-     *
-     * @param id ID, case does not matter
-     * @param factory factory
-     */
-    public void register(String id, Loader<? extends V> factory) {
-        factories.put(id.toLowerCase(), factory);
-    }
-
-    /**
-     * Create a new instance.
-     *
-     * @param id type
-     * @param node configuration node
-     * @param value short-hand value, possibly null
-     * @return an object
-     * @throws DefinitionException thrown on error when parsing or instantiating
-     */
-    V newInstance(String id, ConfigurationNode node, ConfigurationValue value) throws DefinitionException {
-        Loader<? extends V> factory;
-
-        if (value != null) {
-            node = node.clone();
-            node.set("_", value.get());
-        }
-
-        if ((factory = factories.get(id)) != null) {
-            return factory.read(node);
-        }
-
-        throw new DefinitionException("Don't know what '" + id
-                + "' is (typo? criteria/action doesn't exist?)");
-    }
-
-}

src/main/java/com/sk89q/rulelists/ExpressionParser.java

@@ -1,35 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ExpressionParser {
-
-    private static final char COLOR_CHAR = '\u00A7';
-    private static final Pattern classicColors = Pattern.compile("&[A-Fa-z0-9klmnor]");
-
-    public String format(Context context, String string) {
-        Matcher m = classicColors.matcher(string);
-        string = m.replaceAll(COLOR_CHAR + "$1");
-        return string;
-    }
-
-}

src/main/java/com/sk89q/rulelists/InvertedCriteria.java

@@ -1,40 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-/**
- * A criteria wrapper that inverts the condition.
- * 
- * @author sk89q
- * @param <T> underlying criteria
- */
-public class InvertedCriteria<T extends Context> implements Criteria<T> {
-    
-    private final Criteria<T> criteria;
-    
-    public InvertedCriteria(Criteria<T> criteria) {
-        this.criteria = criteria;
-    }
-
-    @Override
-    public boolean matches(T context) {
-        return !criteria.matches(context);
-    }
-
-}

src/main/java/com/sk89q/rulelists/Resolver.java

@@ -1,30 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-/**
- * Attempts to resolve the requested object from other objects. For
- * example, a block place event can have multiple 'relevant' blocks, such as
- * the target block or the source block. A resolver is used to figure out
- * which block is requested, and then the resolver would return the object
- * requested by accessing it through a given context.
- */
-public interface Resolver {
-
-}

src/main/java/com/sk89q/rulelists/ResolverManager.java

@@ -1,63 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ResolverManager {
-
-    private final Map<Class<? extends Resolver>, Map<String, Resolver>> resolvers
-            = new HashMap<Class<? extends Resolver>, Map<String, Resolver>>();
-    private final Map<Resolver, String> reverse = new HashMap<Resolver, String>();
-
-    public <T extends Resolver> void register(Class<T> clazz, String id, T resolver) {
-        Map<String, Resolver> map = resolvers.get(clazz);
-        if (map == null) {
-            map = new HashMap<String, Resolver>();
-            resolvers.put(clazz, map);
-        }
-
-        reverse.put(resolver, id);
-
-        map.put(id.toLowerCase(), resolver);
-    }
-
-    public String getId(Object object) {
-        return reverse.get(object);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends Resolver> T get(Class<T> clazz, String id) throws DefinitionException {
-        Map<String, Resolver> map = resolvers.get(clazz);
-        if (map == null) {
-            throw new DefinitionException("Don't know how to resolve "
-                    + clazz.getCanonicalName());
-        }
-
-        Resolver resolver = map.get(id);
-        if (resolver == null) {
-            throw new DefinitionException("Don't know how to resolve "
-                    + clazz.getCanonicalName());
-        }
-
-        return (T) resolver;
-    }
-
-}

src/main/java/com/sk89q/rulelists/Rule.java

@@ -1,35 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software 
- * (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 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-/**
- * A rule that may match a number of events and can be applied in
- * a situation. See {@link DefinedRule} for a rule implementation that
- * consists of constituent {@link Criteria}s and {@link Action}s.
- * 
- * @author sk89q
- * @param <T> implementation-specific context
- */
-public interface Rule<T extends Context> {
-    
-    boolean matches(T context);
-    
-    void apply(T context);
-    
-}

src/main/java/com/sk89q/rulelists/RuleEntry.java

@@ -1,60 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.List;
-
-/**
- * A pair of attachments and a rule.
- */
-public class RuleEntry {
-
-    private final List<Attachment> attachments;
-    private final Rule<?> rule;
-
-    /**
-     * Construct the rule entry with the list of attachments and rules.
-     *
-     * @param attachments attachment names
-     * @param rule rules
-     */
-    public RuleEntry(List<Attachment> attachments, Rule<?> rule) {
-        this.attachments = attachments;
-        this.rule = rule;
-    }
-
-    /**
-     * Get the list of attachments.
-     *
-     * @return attachment
-     */
-    public List<Attachment> getAttachments() {
-        return attachments;
-    }
-
-    /**
-     * Get the rule.
-     *
-     * @return rule
-     */
-    public Rule<?> getRule() {
-        return rule;
-    }
-
-}

src/main/java/com/sk89q/rulelists/RuleEntryLoader.java

@@ -1,175 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.List;
-import java.util.logging.Logger;
-
-import com.sk89q.rebar.config.AbstractNodeLoader;
-import com.sk89q.rebar.config.ConfigurationNode;
-import com.sk89q.rebar.config.ConfigurationValue;
-import com.sk89q.rebar.config.LoaderBuilderException;
-import com.sk89q.rebar.util.LoggerUtils;
-
-/**
- * A loader that will load rule definitions for the RuleLists.
- */
-public class RuleEntryLoader extends AbstractNodeLoader<RuleEntry> {
-
-    public static final String INLINE = "_";
-
-    private static final Logger logger = LoggerUtils.getLogger(RuleEntryLoader.class);
-
-    private final AttachmentManager attachmentManager;
-    private final DefinitionLoader<Criteria<?>> criteriaLoader;
-    private final DefinitionLoader<Action<?>> actionLoader;
-
-    /**
-     * Construct the loader.
-     *
-     * @param ruleListsManager the action lists manager
-     */
-    public RuleEntryLoader(RuleListsManager ruleListsManager) {
-        attachmentManager = ruleListsManager.getAttachments();
-        criteriaLoader = new DefinitionLoader<Criteria<?>>(ruleListsManager.getCriterion(), true);
-        actionLoader = new DefinitionLoader<Action<?>>(ruleListsManager.getActions(), false);
-    }
-
-    @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public RuleEntry read(ConfigurationNode node) {
-        if (node.size() == 0) {
-            return null;
-        }
-
-        List<Attachment> when = node.listOf("when", attachmentManager);
-
-        // Check to see if the rule has any events defined
-        if (when.size() == 0) {
-            logger.warning("A rule has missing 'when' clause:\n" + node.toString());
-            return null;
-        }
-
-        try {
-            DefinedRule rule = new DefinedRule();
-
-            // Get criterion from the 'if' subnode
-            for (Criteria criteria : node.listOf("if", criteriaLoader)) {
-                rule.add(criteria);
-            }
-
-            // Get actions from the 'then' subnode
-            for (Action action : node.listOf("then", actionLoader)) {
-                rule.add(action);
-            }
-
-            // A rule needs actions!
-            if (rule.hasActions()) {
-                return new RuleEntry(when, rule);
-            } else {
-                logger.warning("The following rule has no actions in:\n" + node.toString());
-                return null;
-            }
-        } catch (LoaderBuilderException e) {
-            logger.warning("A rule had the error '" + e.getMessage() + ", and the rule is:\n" + node.toString());
-            return null;
-        }
-    }
-
-    /**
-     * Inverts an criteria, wrapping it in a {@link InvertedCriteria}.
-     *
-     * @param criteria to invert
-     * @param inverted true to invert (false to not)
-     * @return
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private static <V> V invertCriteria(V object, boolean inverted) {
-        if (object instanceof Criteria && inverted) {
-            return (V) new InvertedCriteria((Criteria<?>) object);
-        }
-
-        return object;
-    }
-
-    /**
-     * Loads specific definitions (criterion or actions) defined.
-     *
-     * @param <T> type of definition ({@link Action} or {@link Criteria})
-     */
-    private class DefinitionLoader<T> extends AbstractNodeLoader<T> {
-
-        private final DefinitionManager<T> manager;
-        private final boolean strict;
-
-        /**
-         * Construct the object.
-         *
-         * @param manager the definition manager
-         * @param strict true to throw exceptions on error
-         */
-        public DefinitionLoader(DefinitionManager<T> manager, boolean strict) {
-            this.manager = manager;
-            this.strict = strict;
-        }
-
-        @Override
-        public T read(ConfigurationNode node) {
-            String id = node.getString("?");
-            boolean inverted = node.getBoolean("negate", false);
-
-            try {
-                // Check for long hand notation (?: class)
-                if (id != null) {
-                    return invertCriteria(manager.newInstance(id, node, null), inverted);
-                }
-
-                // Check for short-hand notation (?class: value)
-                for (String key : node.getKeys(ConfigurationNode.ROOT)) {
-                    if (key.startsWith("?")) {
-                        id = key;
-
-                        Object value = node.get(key);
-                        return invertCriteria(
-                                manager.newInstance(key.substring(1), node, new ConfigurationValue(value)), inverted);
-                    }
-                }
-
-                // No class defined!
-                logger.warning("RuleList: Missing '?' parameter in definition " +
-                		"(to define what kind of criteria/action it is)");
-
-                return null;
-            } catch (DefinitionException e) {
-                logger.warning("RuleList: Invalid definition " +
-                        "identified by type '" + id + "': " + e.getMessage());
-
-                // Throw an exception in strict mode
-                if (strict) {
-                    throw new LoaderBuilderException("RuleList: Invalid definition " +
-                            "identified by type '" + id + "': " + e.getMessage());
-                }
-
-                return null;
-            }
-        }
-
-    }
-
-}

src/main/java/com/sk89q/rulelists/RuleList.java

@@ -1,83 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Holds all the rules.
- */
-public class RuleList {
-
-    private Map<Attachment, RuleSet> collections = new HashMap<Attachment, RuleSet>();
-
-    /**
-     * Build a new instance.
-     */
-    public RuleList() {
-    }
-
-    /**
-     * Get a rule set for a given attachment. A rule set is guaranteed to be
-     * returned for all given attachments.
-     *
-     * @param attachment the attachment
-     * @return the rule set
-     */
-    public synchronized RuleSet get(Attachment attachment) {
-        RuleSet collection = collections.get(attachment);
-        if (collection == null) {
-            collection = new RuleSet();
-            collections.put(attachment, collection);
-        }
-        return collection;
-    }
-
-    /**
-     * Register a rule with this rule list.
-     *
-     * @param entry entry
-     */
-    public void learn(RuleEntry entry) {
-        Rule<?> rule = entry.getRule();
-
-        for (Attachment attachment : entry.getAttachments()) {
-            learn(attachment, rule);
-        }
-    }
-
-    /**
-     * Register a rule with this rule list.
-     *
-     * @param attachment the attachment for the rule
-     * @param rule the rule itself
-     */
-    public void learn(Attachment attachment, Rule<?> rule) {
-        get(attachment).learn(rule);
-    }
-
-    /**
-     * Forget all rules.
-     */
-    public void clear() {
-        collections.clear();
-    }
-
-}

src/main/java/com/sk89q/rulelists/RuleListUtils.java

@@ -1,65 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.List;
-import java.util.logging.Logger;
-
-import com.sk89q.rebar.config.ConfigurationNode;
-
-/**
- * RuleList-related utility methods.
- */
-public class RuleListUtils {
-
-    private RuleListUtils() {
-    }
-
-    /**
-     * Warn of unknown directives in a rule list block.
-     *
-     * @param node node
-     * @param logger the logger to send to
-     * @param expected expected keys
-     */
-    public static void warnUnknown(ConfigurationNode node, Logger logger, String ... expected) {
-        List<String> keys = node.getKeys(ConfigurationNode.ROOT);
-
-        for (String key : keys) {
-            boolean found = false;
-
-            if (key.equals("?")) continue;
-            if (key.equals("negate")) continue;
-            if (key.equals("_")) continue;
-            if (key.length() > 0 && key.charAt(0) == '?') continue;
-
-            for (String expect : expected) {
-                if (expect.equals(key)) {
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found) {
-                logger.warning("[WorldGuard] RuleList: Unexpected parameter of '" + key + "' in " + node);
-            }
-        }
-    }
-
-}

src/main/java/com/sk89q/rulelists/RuleListsManager.java

@@ -1,77 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-/**
- * Manages action lists and details relevant to them.
- */
-public class RuleListsManager {
-
-    private final AttachmentManager attachments = new AttachmentManager();
-    private final DefinitionManager<Criteria<?>> criterion = new DefinitionManager<Criteria<?>>();
-    private final DefinitionManager<Action<?>> actions = new DefinitionManager<Action<?>>();
-    private final ResolverManager subjectResolvers = new ResolverManager();
-    private final ExpressionParser exprParser = new ExpressionParser();
-
-    /**
-     * Get the attachment manager.
-     *
-     * @return the attachment manager
-     */
-    public AttachmentManager getAttachments() {
-        return attachments;
-    }
-
-    /**
-     * Get the criterion manager.
-     *
-     * @return criterion manager
-     */
-    public DefinitionManager<Criteria<?>> getCriterion() {
-        return criterion;
-    }
-
-    /**
-     * Get the actions manager.
-     *
-     * @return actions manager
-     */
-    public DefinitionManager<Action<?>> getActions() {
-        return actions;
-    }
-
-    /**
-     * Get the subject resolvers manager.
-     *
-     * @return the subject resolvers manager
-     */
-    public ResolverManager getResolvers() {
-        return subjectResolvers;
-    }
-
-    /**
-     * Get the expression parser.
-     *
-     * @return the expression parser
-     */
-    public ExpressionParser getParser() {
-        return exprParser;
-    }
-
-}

src/main/java/com/sk89q/rulelists/RuleSet.java

@@ -1,93 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Holds a collection of rules that can be applied to a context.
- *
- * @see RuleList
- */
-public class RuleSet {
-
-    private List<Rule<?>> rules = new LinkedList<Rule<?>>();
-
-    RuleSet() {
-    }
-
-    /**
-     * Add the given rule to this set.
-     *
-     * @param rule the rule
-     */
-    public synchronized void learn(Rule<?> rule) {
-        rules.add(rule);
-    }
-
-    /**
-     * Forget all rules.
-     */
-    public synchronized void clear() {
-        rules.clear();
-    }
-
-    /**
-     * Return whether this set has rules.
-     *
-     * @return true if there are rules
-     */
-    public synchronized boolean hasRules() {
-        return rules.size() > 0;
-    }
-
-    /**
-     * Get the list of rules. The returned list cannot be modified.
-     *
-     * @return rule list
-     */
-    public synchronized List<Rule<?>> getRules() {
-        return Collections.unmodifiableList(rules);
-    }
-
-    /**
-     * Apply this rule set onto the given context. Only one thread should call
-     * this method at a given time.
-     *
-     * @param context the context
-     * @return true if the event has been cancelled
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public boolean process(Context context) {
-        if (context.isCancelled()) {
-            return true; // Ignore cancelled events for now
-        }
-
-        for (Rule rule : rules) {
-            if (rule.matches(context)) {
-                rule.apply(context);
-            }
-        }
-
-        return context.isCancelled();
-    }
-
-}

src/main/java/com/sk89q/rulelists/RuleTemplateEntryLoader.java

@@ -1,131 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.rulelists;
-
-import java.util.ArrayList;
-import java.util.List;
-import com.sk89q.rebar.config.AbstractNodeLoader;
-import com.sk89q.rebar.config.ConfigurationNode;
-import com.sk89q.rebar.config.LoaderBuilderException;
-import com.sk89q.rebar.config.types.StringLoaderBuilder;
-
-/**
- * A loader that will load the built-in rules used. It handles a slightly different
- * format that also stores parameter information and other goodies.
- */
-public class RuleTemplateEntryLoader extends AbstractNodeLoader<List<RuleEntry>> {
-
-    private static final StringLoaderBuilder stringLoader = new StringLoaderBuilder();
-
-    private final ConfigurationNode config;
-    private final RuleEntryLoader entryLoader;
-
-    /**
-     * Construct the loader with the given rule lists manager.
-     *
-     * @param manager the manager
-     * @param config the configuration node to read settings from
-     */
-    public RuleTemplateEntryLoader(RuleListsManager manager, ConfigurationNode config) {
-        entryLoader = new RuleEntryLoader(manager);
-        this.config = config;
-    }
-
-    @Override
-    public List<RuleEntry> read(ConfigurationNode node) throws LoaderBuilderException {
-        List<RuleEntry> rules = new ArrayList<RuleEntry>();
-
-        List<String> settings = node.listOf("setting", stringLoader);
-        if (settings.size() == 0) {
-            throw new LoaderBuilderException("No 'setting' value in:\n" + node.toString());
-        }
-
-        String selectedSetting = settings.get(0);
-        String type = node.getString("type", "boolean");
-
-        if (settings.size() > 1) {
-            boolean migrate = false;
-            boolean found = false;
-            Object value = null;
-
-            for (String setting : settings) {
-                if (config.contains(setting)) {
-                    value = config.get(setting);
-                    found = true;
-                    break;
-                } else {
-                    migrate = true;
-                }
-            }
-
-            if (found && migrate) {
-                config.set(settings.get(0), value);
-
-                int i = 0;
-                for (String setting : settings) {
-                    if (i++ != 0) {
-                        config.remove(setting);
-                    }
-                }
-            }
-        }
-
-        boolean active = false;
-
-        // See if the setting is active
-        if (type.equals("boolean")) {
-            boolean negate = node.getBoolean("negate", false);
-            boolean enabled = config.getBoolean(selectedSetting, negate);
-
-            if (negate) {
-                enabled = !enabled;
-            }
-
-            if (enabled) {
-                active = true;
-            }
-        } else if (type.equals("list")) {
-            Object val = config.get(selectedSetting);
-
-            if (val == null) {
-                config.set(selectedSetting, new ArrayList<Object>());
-            } else if (val instanceof List<?> && ((List<?>) val).size() > 0) {
-                active = true;
-            }
-        }
-
-        // Load the setting
-        if (active) {
-            List<String> paramPaths = node.getStringList("parameters.target", new ArrayList<String>());
-            if (paramPaths.size() > 0) {
-                Object val = config.get(selectedSetting);
-                for (String path : paramPaths) {
-                    node.set(path, val);
-                }
-            }
-
-            for (RuleEntry rule : node.listOf("rules", entryLoader)) {
-                rules.add(rule);
-            }
-        }
-
-        return rules;
-    }
-
-}

src/main/java/com/sk89q/worldguard/Classifier.java

@@ -1,26 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard;
-
-/**
- * A user, group, or other object that describes a set of users.
- */
-public interface Classifier {
-
-}

src/main/java/com/sk89q/worldguard/bukkit/BukkitContext.java

@@ -1,238 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
-import org.bukkit.inventory.ItemStack;
-
-import com.sk89q.rulelists.Context;
-import com.sk89q.worldguard.region.ApplicableRegionSet;
-
-/**
- * An implementation of a {@link Context} for Bukkit. This object is thread-safe, but
- * the underlying objects returned by this class may not be.
- *
- * @see Context
- */
-public class BukkitContext extends Context {
-
-    private final RegionQueryCache regionCache;
-    private final Event event;
-    private RegionQuery regionQuery;
-    private String message;
-    private Entity sourceEntity;
-    private Entity targetEntity;
-    private ItemStack item;
-    private BlockState sourceBlock;
-    private BlockState targetBlock;
-    private BlockState replacedTargetBlock;
-    private ApplicableRegionSet lastApplRegionSet;
-
-    /**
-     * Construct a context linked to the given event.
-     *
-     * @param plugin the WorldGuard plugin
-     * @param event the event
-     */
-    BukkitContext(WorldGuardPlugin plugin, Event event) {
-        this.regionCache = plugin.getRegionCache();
-        this.event = event;
-    }
-
-    /**
-     * Get the message attribute of this context.
-     *
-     * @return message or null
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * Set the message attribute of this context.
-     *
-     * @param message or null
-     */
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    /**
-     * Get the source entity for this context. The source entity is the 'cause' of
-     * this context, if it is available.
-     *
-     * @return entity or null
-     */
-    public Entity getSourceEntity() {
-        return sourceEntity;
-    }
-
-    /**
-     * Set the source entity for this context. The source entity is the 'cause' of
-     * this context, if it is available.
-     *
-     * @param sourceEntity entity or null
-     */
-    public void setSourceEntity(Entity sourceEntity) {
-        this.sourceEntity = sourceEntity;
-    }
-
-    /**
-     * Get the target entity for this context. The target entity is the 'subject'
-     * of this context, if it is available.
-     *
-     * @return entity or null
-     */
-    public Entity getTargetEntity() {
-        return targetEntity;
-    }
-
-    /**
-     * Set the target entity for this context. The target entity is the 'subject'
-     * of this context, if it is available.
-     *
-     * @param targetEntity entity or null
-     */
-    public void setTargetEntity(Entity targetEntity) {
-        this.targetEntity = targetEntity;
-    }
-
-    /**
-     * Get the primary item related to this context. Only events that are oriented
-     * around an item have this property set.
-     *
-     * @return item or null
-     */
-    public ItemStack getItem() {
-        return item;
-    }
-
-    /**
-     * Set the primary item related to this context. Only events that are oriented
-     * around an item have this property set.
-     *
-     * @param item  item or null
-     */
-    public void setItem(ItemStack item) {
-        this.item = item;
-    }
-
-    /**
-     * Get the source block for this context. The source block is the 'cause'
-     * of this context, if it is available.
-     *
-     * @return block or null
-     */
-    public BlockState getSourceBlock() {
-        return sourceBlock;
-    }
-
-    /**
-     * Set the source block for this context. The source block is the 'cause'
-     * of this context, if it is available.
-     *
-     * @param block block or null
-     */
-    public void setSourceBlock(BlockState block) {
-        this.sourceBlock = block;
-    }
-
-    /**
-     * Get a target block for this context. The target block is the 'subject' of
-     * this context, if it is available.
-     *
-     * @return block or null
-     */
-    public BlockState getTargetBlock() {
-        return targetBlock;
-    }
-
-    /**
-     * Set a target block for this context. The target block is the 'subject' of
-     * this context, if it is available.
-     *
-     * @param targetBlock block or null
-     */
-    public void setTargetBlock(BlockState targetBlock) {
-        this.targetBlock = targetBlock;
-    }
-
-    /**
-     * Get the placed block for this context. The placed block is the 'new' block
-     * that will replace the existing block in this context, if it is available.
-     *
-     * @return block or null
-     */
-    public BlockState getPlacedBlock() {
-        return replacedTargetBlock;
-    }
-
-    /**
-     * Set the placed block for this context. The placed block is the 'new' block
-     * that will replace the existing block in this context, if it is available.
-     *
-     * @param replacedTargetBlock block or null
-     */
-    public void setPlacedBlock(BlockState replacedTargetBlock) {
-        this.replacedTargetBlock = replacedTargetBlock;
-    }
-
-    /**
-     * Get the last {@link ApplicableRegionSet}. This can be set by a rule and used
-     * within one, but it cannot be guaranteed to exist across rules.
-     *
-     * @return an {@link ApplicableRegionSet} or null
-     */
-    public ApplicableRegionSet getApplicableRegionSet() {
-        return lastApplRegionSet;
-    }
-
-    /**
-     * Set the last {@link ApplicableRegionSet}.
-     *
-     * @param set an {@link ApplicableRegionSet} or null
-     */
-    public void setApplicableRegionSet(ApplicableRegionSet set) {
-        this.lastApplRegionSet = set;
-    }
-
-    /**
-     * Get the underlying event object.
-     *
-     * @return event object
-     */
-    public Event getEvent() {
-        return event;
-    }
-
-    /**
-     * Get the region query object.
-     *
-     * @return region query object
-     */
-    public synchronized RegionQuery getRegionQuery() {
-        if (regionQuery == null) {
-            regionQuery = regionCache.against(event);
-        }
-        return regionQuery;
-    }
-
-}

src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java

@@ -1,275 +0,0 @@
-// $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.bukkit;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.blocks.BlockType;
-import com.sk89q.worldedit.blocks.ItemID;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.*;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.List;
-
-public class BukkitUtil {
-
-    private BukkitUtil()  {
-
-    }
-
-    /**
-     * Converts the location of a Bukkit block to a WorldEdit vector.
-     *
-     * @param block The block to convert
-     * @return The block's location as a BlockVector
-     */
-    public static BlockVector toVector(Block block) {
-        return new BlockVector(block.getX(), block.getY(), block.getZ());
-    }
-
-    /**
-     * Converts a Bukkit location to a WorldEdit vector.
-     *
-     * @param loc A Bukkit Location
-     * @return A Vector with the location's x, y, and z values
-     */
-    public static Vector toVector(Location loc) {
-        return new Vector(loc.getX(), loc.getY(), loc.getZ());
-    }
-
-    /**
-     * Converts a Bukkit vector to a WorldEdit vector.
-     *
-     * @param vector The Bukkit vector
-     * @return A WorldEdit vector with the same values as the Bukkit vector.
-     */
-    public static Vector toVector(org.bukkit.util.Vector vector) {
-        return new Vector(vector.getX(), vector.getY(), vector.getZ());
-    }
-
-    /**
-     * Converts a WorldEdit vector to a Bukkit location.
-     *
-     * @param world The World to create the new Location with
-     * @param vec The vector to use for coordinates
-     * @return The Vector as a location with a World of world
-     */
-    public static Location toLocation(World world, Vector vec) {
-        return new Location(world, vec.getX(), vec.getY(), vec.getZ());
-    }
-
-    /**
-     * Matches one player based on name.
-     *
-     * @param server The server to check
-     * @param name The name to attempt to match
-     * @deprecated see {@link WorldGuardPlugin#matchSinglePlayer(org.bukkit.command.CommandSender, String)}
-     * @return The matched player if any, otherwise null
-     */
-    @Deprecated
-    public static Player matchSinglePlayer(Server server, String name) {
-        List<Player> players = server.matchPlayer(name);
-        if (players.size() == 0) {
-            return null;
-        }
-        return players.get(0);
-    }
-
-    /**
-     * Drops a sign item and removes a sign.
-     *
-     * @param block The block
-     * @deprecated see {@link org.bukkit.block.Block#breakNaturally()}
-     */
-    @Deprecated
-    public static void dropSign(Block block) {
-        block.setTypeId(0);
-        block.getWorld().dropItemNaturally(block.getLocation(),
-                new ItemStack(ItemID.SIGN, 1));
-    }
-
-    /**
-     * Sets the given block to fluid water.
-     * Used by addSpongeWater()
-     *
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    public static void setBlockToWater(World world, int ox, int oy, int oz) {
-        Block block = world.getBlockAt(ox, oy, oz);
-        int id = block.getTypeId();
-        if (id == 0) {
-            block.setTypeId(8);
-        }
-    }
-
-    /**
-     * Checks if the given block is water
-     *
-     * @param world the world
-     * @param ox x
-     * @param oy y
-     * @param oz z
-     * @return true if it's water
-     */
-    public static boolean isBlockWater(World world, int ox, int oy, int oz) {
-        Block block = world.getBlockAt(ox, oy, oz);
-        int id = block.getTypeId();
-        return id == 8 || id == 9;
-    }
-
-    /**
-     * 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 static 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 <= world.getMaxHeight() + 1) {
-            if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) {
-                free++;
-            } else {
-                free = 0;
-            }
-
-            if (free == 2) {
-                if (y - 1 != origY || y == 1) {
-                    loc.setX(x + 0.5);
-                    loc.setY(y);
-                    loc.setZ(z + 0.5);
-                    if (y <= 2 && world.getBlockAt(x,0,z).getTypeId() == BlockID.AIR) {
-                        world.getBlockAt(x,0,z).setTypeId(20);
-                        loc.setY(2);
-                    }
-                    player.setFallDistance(0F);
-                    player.teleport(loc);
-                }
-                return;
-            }
-
-            y++;
-        }
-    }
-
-    /**
-     * Replace color macros in a string. The macros are in the form of `[char]
-     * where char represents the color. R is for red, Y is for yellow,
-     * G is for green, C is for cyan, B is for blue, and P is for purple.
-     * The uppercase versions of those are the darker shades, while the
-     * lowercase versions are the lighter shades. For white, it's 'w', and
-     * 0-2 are black, dark grey, and grey, respectively.
-     *
-     * @param str
-     * @return color-coded string
-     */
-    public static String replaceColorMacros(String str) {
-        str = str.replace("&r", ChatColor.RED.toString());
-        str = str.replace("&R", ChatColor.DARK_RED.toString());
-
-        str = str.replace("&y", ChatColor.YELLOW.toString());
-        str = str.replace("&Y", ChatColor.GOLD.toString());
-
-        str = str.replace("&g", ChatColor.GREEN.toString());
-        str = str.replace("&G", ChatColor.DARK_GREEN.toString());
-
-        str = str.replace("&c", ChatColor.AQUA.toString());
-        str = str.replace("&C", ChatColor.DARK_AQUA.toString());
-
-        str = str.replace("&b", ChatColor.BLUE.toString());
-        str = str.replace("&B", ChatColor.DARK_BLUE.toString());
-
-        str = str.replace("&p", ChatColor.LIGHT_PURPLE.toString());
-        str = str.replace("&P", ChatColor.DARK_PURPLE.toString());
-
-        str = str.replace("&0", ChatColor.BLACK.toString());
-        str = str.replace("&1", ChatColor.DARK_GRAY.toString());
-        str = str.replace("&2", ChatColor.GRAY.toString());
-        str = str.replace("&w", ChatColor.WHITE.toString());
-
-        return str;
-    }
-
-    /**
-     * Returns whether our running CraftBukkit already supports
-     * the HangingEvent instead of the PaintingEvent
-     *
-     * @return true if the hanging event is supported
-     */
-    public static boolean hasHangingEvent() {
-        Class<?> tmp = null;
-        try {
-            tmp = Class.forName("org.bukkit.event.hanging.HangingEvent");
-        } catch (ClassNotFoundException ignored) { }
-        return (tmp != null);
-    }
-
-    /**
-     * Search an enum for a value, and return the first one found. Return null if the
-     * enum entry is not found.
-     *
-     * @param enumType enum class
-     * @param values values to test
-     * @return a value in the enum or null
-     */
-    public static <T extends Enum<T>> T tryEnum(Class<T> enumType, String ... values) {
-        for (String val : values) {
-            try {
-                return Enum.valueOf(enumType, val);
-            } catch (IllegalArgumentException e) {
-            }
-        }
-
-        return null;
-    }
-
-    static void checkAndDestroy(World world, int x, int y, int z, int required) {
-        if (world.getBlockTypeIdAt(x, y, z) == required) {
-            world.getBlockAt(x, y, z).setTypeId(BlockID.AIR);
-        }
-    }
-
-    static void checkAndDestroyAround(World world, int x, int y, int z, int required) {
-        checkAndDestroy(world, x, y, z + 1, required);
-        checkAndDestroy(world, x, y, z - 1, required);
-        checkAndDestroy(world, x, y + 1, z, required);
-        checkAndDestroy(world, x, y - 1, z, required);
-        checkAndDestroy(world, x + 1, y, z, required);
-        checkAndDestroy(world, x - 1, y, z, required);
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java

@@ -1,413 +0,0 @@
-// $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.bukkit;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.yaml.snakeyaml.DumperOptions.FlowStyle;
-
-import com.sk89q.commandbook.CommandBook;
-import com.sk89q.commandbook.GodComponent;
-import com.sk89q.rebar.config.ConfigurationException;
-import com.sk89q.rebar.config.PairedKeyValueLoaderBuilder;
-import com.sk89q.rebar.config.YamlConfigurationFile;
-import com.sk89q.rebar.config.YamlStyle;
-import com.sk89q.rebar.config.types.LowercaseStringLoaderBuilder;
-import com.sk89q.rebar.config.types.StringLoaderBuilder;
-import com.sk89q.rebar.util.LoggerUtils;
-import com.sk89q.rulelists.RuleEntryLoader;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.Blacklist;
-
-/**
- * Represents the global configuration and also delegates configuration
- * for individual worlds.
- */
-public class ConfigurationManager {
-
-    private static Logger logger = LoggerUtils.getLogger(RuleEntryLoader.class, "[WorldGuard] ");
-
-    private static final String DEFAULT_RULELIST_PATH = "rulelist.yml";
-    private static final String DEFAULT_BLACKLIST_PATH = "worlds/%world%/blacklist.txt";
-    private static final String DEFAULT_WORLD_CONFIG_PATH = "worlds/%world%/config.yml";
-
-    static final YamlStyle YAML_STYLE = new YamlStyle(FlowStyle.BLOCK);
-
-    private WorldGuardPlugin plugin;
-    private ConcurrentMap<String, WorldConfiguration> worlds;
-    private YamlConfigurationFile config;
-
-    private Map<String, String> ruleLists = new HashMap<String, String>();
-    private Map<String, String> blacklists = new HashMap<String, String>();
-    private Map<String, String> worldConfigs = new HashMap<String, String>();
-
-    @Deprecated
-    private Set<String> hasGodMode = new HashSet<String>();
-    private Set<String> hasAmphibious = new HashSet<String>();
-
-    private boolean hasCommandBookGodMode = false;
-
-    /* Configuration data start */
-    public boolean useRegionsScheduler;
-    public boolean useRegionsCreatureSpawnEvent;
-    public boolean usePlayerMove;
-    public Map<String, String> hostKeys = new HashMap<String, String>();
-
-    public boolean useSqlDatabase = false;
-    public String sqlDsn;
-    public String sqlUsername;
-    public String sqlPassword;
-    /* Configuration data end */
-
-    /**
-     * Construct the object.
-     *
-     * @param plugin the plugin instance
-     */
-    public ConfigurationManager(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-        this.worlds = new ConcurrentHashMap<String, WorldConfiguration>();
-    }
-
-    /**
-     * Load the configuration.
-     */
-    public void load() {
-        loadConfig();
-
-        // Regions settings
-        useRegionsScheduler = config.getBoolean("regions.use-scheduler", true);
-        useRegionsCreatureSpawnEvent = config.getBoolean("regions.use-creature-spawn-event", true);
-
-        // Regions SQL settings
-        useSqlDatabase = config.getBoolean("regions.sql.use", false);
-        sqlDsn = config.getString("regions.sql.dsn", "jdbc:mysql://localhost/worldguard");
-        sqlUsername = config.getString("regions.sql.username", "worldguard");
-        sqlPassword = config.getString("regions.sql.password", "worldguard");
-
-        // Other settings
-        usePlayerMove = config.getBoolean("use-player-move-event", true);
-
-        // Load host keys
-        hostKeys = config.mapOf("host-keys",
-                PairedKeyValueLoaderBuilder.build(
-                        new LowercaseStringLoaderBuilder(), new StringLoaderBuilder()));
-
-        // Load rule list filenames
-        if (config.contains("rulelists")) {
-            ruleLists = config.mapOf("rulelists",
-                    PairedKeyValueLoaderBuilder.build(
-                            new LowercaseStringLoaderBuilder(), new StringLoaderBuilder()));
-        } else {
-            config.setNode("rulelists").set("__default__", DEFAULT_RULELIST_PATH);
-            ruleLists = new HashMap<String, String>();
-            ruleLists.put("__default__", DEFAULT_RULELIST_PATH);
-        }
-
-        // Load blacklist filenames
-        if (config.contains("blacklists")) {
-            blacklists = config.mapOf("blacklists",
-                    PairedKeyValueLoaderBuilder.build(
-                            new LowercaseStringLoaderBuilder(), new StringLoaderBuilder()));
-        } else {
-            config.setNode("blacklists").set("__default__", DEFAULT_BLACKLIST_PATH);
-            blacklists = new HashMap<String, String>();
-            blacklists.put("__default__", DEFAULT_BLACKLIST_PATH);
-        }
-
-        // Load world config filenames
-        if (config.contains("world-configs")) {
-            worldConfigs = config.mapOf("world-configs",
-                    PairedKeyValueLoaderBuilder.build(
-                            new LowercaseStringLoaderBuilder(), new StringLoaderBuilder()));
-        } else {
-            config.setNode("world-configs").set("__default__", DEFAULT_WORLD_CONFIG_PATH);
-            worldConfigs = new HashMap<String, String>();
-            worldConfigs.put("__default__", DEFAULT_WORLD_CONFIG_PATH);
-        }
-
-        // Load configurations for each world
-        for (World world : plugin.getServer().getWorlds()) {
-            get(world);
-        }
-
-        saveConfig();
-    }
-
-    /**
-     * Unload the configuration.
-     */
-    public void unload() {
-        worlds.clear();
-    }
-
-    /**
-     * Load the configuration from file.
-     */
-    private void loadConfig() {
-        config = new YamlConfigurationFile(new File(plugin.getDataFolder(), "config.yml"), YAML_STYLE);
-
-        try {
-            config.load();
-        } catch (IOException e) {
-            logger.log(Level.SEVERE, "Error reading config.yml for global config", e);
-        } catch (ConfigurationException e) {
-            logger.log(Level.SEVERE, "Error reading config.yml for global config", e);
-        }
-    }
-
-    /**
-     * Save the configuration to file.
-     */
-    private void saveConfig() {
-        config.setHeader(
-                "# GLOBAL CONFIGURATION FILE\r\n" +
-                "#\r\n" +
-                "# Everything in here applies to all worlds. For world-specific settings, edit \r\n" +
-                "# the files in plugins/WorldGuard/worlds/WORLD_NAME_HERE/config.yml\r\n" +
-                "#\r\n" +
-                "# The official format of this file is called YAML. If you've never had to\r\n" +
-                "# edit one before, you should REALLY read http://wiki.sk89q.com/wiki/Editing_YAML\r\n");
-
-        try {
-            config.save();
-        } catch (IOException e) {
-            logger.log(Level.SEVERE, "Failed to save configuration", e);
-        }
-    }
-
-    /**
-     * Get the configuration for a world.
-     *
-     * @param world The world to get the configuration for
-     * @return {@code world}'s configuration
-     */
-    public WorldConfiguration get(World world) {
-        String worldName = world.getName();
-        WorldConfiguration config = worlds.get(worldName);
-        WorldConfiguration newConfig = null;
-
-        while (config == null) {
-            if (newConfig == null) {
-                newConfig = new WorldConfiguration(plugin, worldName, this, this.config);
-            }
-            worlds.putIfAbsent(world.getName(), newConfig);
-            config = worlds.get(world.getName());
-        }
-
-        return config;
-    }
-
-    /**
-     * Get the RuleList file for the given world.
-     *
-     * @param worldName world
-     * @return file (which may or may not exist)
-     */
-    File getRuleListFile(String worldName) {
-        String path = ruleLists.get(worldName.toLowerCase());
-
-        if (path == null) {
-            path = ruleLists.get("__default__");
-        }
-
-        if (path == null) {
-            path = DEFAULT_RULELIST_PATH;
-        }
-
-        path = path.replace("%world%", worldName);
-        File file = new File(plugin.getDataFolder(), path);
-
-        if (!file.exists()) {
-            plugin.createDefaultConfiguration(file, "rulelist.yml");
-        }
-
-        return file;
-    }
-
-    /**
-     * Get the blacklist file for the given world.
-     *
-     * @param worldName world
-     * @return file (which may or may not exist)
-     */
-    File getBlacklistFile(String worldName) {
-        String path = blacklists.get(worldName.toLowerCase());
-        File file;
-
-        if (path == null) {
-            path = blacklists.get("__default__");
-        }
-
-        if (path == null) {
-            path = DEFAULT_BLACKLIST_PATH;
-        }
-
-        path = path.replace("%world%", worldName);
-        file = new File(plugin.getDataFolder(), path);
-
-        if (!file.exists()) {
-            plugin.createDefaultConfiguration(file, "blacklist.txt");
-        }
-
-        return file;
-    }
-
-    /**
-     * Get the world configuration file for the given world.
-     *
-     * @param worldName world
-     * @return file (which may or may not exist)
-     */
-    File getWorldConfigFile(String worldName) {
-        String path = worldConfigs.get(worldName.toLowerCase());
-        File file;
-
-        if (path == null) {
-            path = worldConfigs.get("__default__");
-        }
-
-        if (path == null) {
-            path = DEFAULT_WORLD_CONFIG_PATH;
-        }
-
-        path = path.replace("%world%", worldName);
-        file = new File(plugin.getDataFolder(), path);
-
-        return file;
-    }
-
-    /**
-     * Forget a player.
-     *
-     * @param player The player to forget about
-     */
-    void forgetPlayer(LocalPlayer player) {
-        for (Map.Entry<String, WorldConfiguration> entry
-                : worlds.entrySet()) {
-
-            // The blacklist needs to forget players
-            Blacklist bl = entry.getValue().getBlacklist();
-            if (bl != null) {
-                bl.forgetPlayer(player);
-            }
-        }
-
-        hasGodMode.remove(player.getName());
-        hasAmphibious.remove(player.getName());
-    }
-
-    /**
-     * Enable god mode for a player.
-     *
-     * @param player The player to enable god mode for.
-     */
-    @Deprecated
-    public void enableGodMode(Player player) {
-        hasGodMode.add(player.getName());
-    }
-
-    /**
-     * Disable god mode for a player.
-     *
-     * @param player The player to disable godmode for
-     */
-    @Deprecated
-    public void disableGodMode(Player player) {
-        hasGodMode.remove(player.getName());
-    }
-
-    /**
-     * Check to see if god mode is enabled for a player.
-     *
-     * @param player The player to check
-     * @return Whether the player has godmode through WorldGuard or CommandBook
-     */
-    public boolean hasGodMode(Player player) {
-        if (hasCommandBookGodMode) {
-            GodComponent god = CommandBook.inst().getComponentManager().getComponent(GodComponent.class);
-            if (god != null) {
-                return god.hasGodMode(player);
-            }
-        }
-        return hasGodMode.contains(player.getName());
-    }
-
-    /**
-     * Enable amphibious mode for a player.
-     *
-     * @param player The player to enable amphibious mode for
-     */
-    public void enableAmphibiousMode(Player player) {
-        hasAmphibious.add(player.getName());
-    }
-
-    /**
-     * Disable amphibious mode  for a player.
-     *
-     * @param player The player to disable amphibious mode for
-     */
-    public void disableAmphibiousMode(Player player) {
-        hasAmphibious.remove(player.getName());
-    }
-
-    /**
-     * Check to see if amphibious mode is enabled for a player.
-     *
-     * @param player The player to check
-     * @return Whether {@code player} has amphibious mode
-     */
-    public boolean hasAmphibiousMode(Player player) {
-        return hasAmphibious.contains(player.getName());
-    }
-
-    /**
-     * Check and store whether CommandBook is installed.
-     */
-    void updateCommandBookGodMode() {
-        try {
-            if (plugin.getServer().getPluginManager().isPluginEnabled("CommandBook")) {
-                Class.forName("com.sk89q.commandbook.GodComponent");
-                hasCommandBookGodMode = true;
-                return;
-            }
-        } catch (ClassNotFoundException ignore) {}
-        hasCommandBookGodMode = false;
-    }
-
-    /**
-     * Return whether CommandBook is available for God mode usage.
-     *
-     * @return true if it available
-     */
-    boolean hasCommandBookGodMode() {
-        return hasCommandBookGodMode;
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/DisallowedPVPEvent.java

@@ -1,82 +0,0 @@
-// $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.bukkit;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-
-/**
- * This event is fired when PVP is disallowed between players due to a "pvp deny" flag.
- * Cancelling this event allows the PVP in spite of this.
- * 
- * @author Score_Under
- */
-public class DisallowedPVPEvent extends Event implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-
-    private boolean cancelled = false;
-    private final Player attacker;
-    private final Player defender;
-    private final EntityDamageByEntityEvent event;
-
-    public DisallowedPVPEvent(final Player attacker, final Player defender, EntityDamageByEntityEvent event) {
-        this.attacker = attacker;
-        this.defender = defender;
-        this.event = event;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    /**
-     * @return the attacking player.
-     */
-    public Player getAttacker() {
-        return attacker;
-    }
-
-    /**
-     * @return the defending player.
-     */
-    public Player getDefender() {
-        return defender;
-    }
-
-    public EntityDamageByEntityEvent getCause() {
-        return event;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/LagStopMode.java

@@ -1,305 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import java.util.logging.Logger;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Chunk;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.FallingBlock;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.entity.Tameable;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockFormEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.BlockSpreadEvent;
-import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.plugin.PluginManager;
-
-import com.sk89q.rebar.util.LoggerUtils;
-
-/**
- * Handles the "stop lag" mode.
- */
-public class LagStopMode implements Listener {
-
-    private static final Logger logger = LoggerUtils.getLogger(LagStopMode.class,
-            "[WorldGuard] Lag Stop Mode: ");
-
-    private final WorldGuardPlugin plugin;
-    private boolean enabled = false;
-    private boolean removeAnimals = true;
-
-    LagStopMode(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Register this class's events.
-     */
-    void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
-        pm.registerEvents(this, plugin);
-    }
-
-    /**
-     * Get whether the lag stop mode is enabled.
-     *
-     * @return true if it's enabled
-     */
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    /**
-     * Enable the lag stop mode. This will start the process and emit messages.
-     *
-     * @param unloadChunks true to unload chunks
-     */
-    public void enable(boolean unloadChunks) {
-        if (!enabled) {
-            Server server = plugin.getServer();
-
-            server.broadcastMessage(ChatColor.GRAY
-                    + "(WorldGuard's 'lag stop' mode has been enabled. Some parts of the game may be 'frozen'. Keep calm and carry on.)");
-
-            // Remove entities
-            server.broadcastMessage(ChatColor.GRAY + "(Please wait... removing entities...)");
-            for (World world : server.getWorlds()) {
-                freeUp(world);
-            }
-
-            // Unloading chunks
-            if (unloadChunks) {
-                server.broadcastMessage(ChatColor.GRAY + "(Please wait... garbage collecting chunks...)");
-                for (World world : server.getWorlds()) {
-                    Chunk[] chunks = world.getLoadedChunks();
-
-                    for (Chunk chunk : chunks) {
-                        chunk.unload(true, true);
-                    }
-                }
-            }
-
-            server.broadcastMessage(ChatColor.GRAY + "(Completed. Lag stop mode is still enabled.)");
-        }
-
-        this.enabled = true;
-
-    }
-
-    /**
-     * Disable the lag stop mode.
-     */
-    public void disable() {
-        if (enabled) {
-            Server server = plugin.getServer();
-            server.broadcastMessage(ChatColor.GRAY
-                    + "(WorldGuard's 'lag stop' mode is now off. Everything should proceed to start working again.)");
-        }
-
-        this.enabled = false;
-
-    }
-
-    /**
-     * Returns whether animals are being removed.
-     *
-     * @return true if animals are being removed
-     */
-    public boolean isRemovingAnimals() {
-        return removeAnimals;
-    }
-
-    /**
-     * Set whether animals should be removed.
-     *
-     * @param removeAnimals true to remove animals
-     */
-    public void setRemoveAnimals(boolean removeAnimals) {
-        this.removeAnimals = removeAnimals;
-    }
-
-    /**
-     * Remove items and other things within the chunk.
-     *
-     * @param plugin the plugin
-     * @param chunk the chunk to halt
-     */
-    private void freeUp(Chunk chunk) {
-        int removed = 0;
-
-        for (Entity entity : chunk.getEntities()) {
-            if (shouldRemove(entity)) {
-                entity.remove();
-                removed++;
-            }
-        }
-
-        if (removed > 50) {
-            logger.info(removed + " entities (>50) auto-removed from " + chunk.toString());
-        }
-    }
-
-    /**
-     * Remove items and other things within the world.
-     *
-     * @param plugin the plugin
-     * @param world the world to halt
-     */
-    private void freeUp(World world) {
-        int removed = 0;
-
-        for (Entity entity : world.getEntities()) {
-            if (shouldRemove(entity)) {
-                entity.remove();
-                removed++;
-            }
-        }
-
-        if (removed > 50) {
-            logger.info(removed + " entities (>50) auto-removed from " + world.toString());
-        }
-    }
-
-    /**
-     * Returns whether an entity should be removed.
-     *
-     * @param entity the entity to check
-     * @return true if it should be removed
-     */
-    private boolean shouldRemove(Entity entity) {
-        return entity instanceof Item
-                || entity instanceof TNTPrimed
-                || entity instanceof ExperienceOrb
-                || entity instanceof FallingBlock
-                || (entity instanceof LivingEntity
-                    && !(entity instanceof Tameable)
-                    && !(entity instanceof Player)
-                    && (removeAnimals || !(entity instanceof Animals)));
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-        World world = player.getWorld();
-
-        if (enabled) {
-            player.sendMessage(ChatColor.GRAY
-                    + "WorldGuard's 'lag stop' mode has been enabled. Some parts of the game may be 'frozen'.");
-            freeUp(world);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onBlockFromTo(BlockFromToEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onBlockIgnite(BlockIgniteEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onBlockBurn(BlockBurnEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onBlockPhysics(BlockPhysicsEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onBlockForm(BlockFormEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onLeavesDecay(LeavesDecayEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onBlockSpread(BlockSpreadEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onEntityExplode(EntityExplodeEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onExplosionPrime(ExplosionPrimeEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onCreatureSpawn(CreatureSpawnEvent event) {
-        if (enabled) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onChunkLoad(ChunkLoadEvent event) {
-        if (enabled) {
-            freeUp(event.getChunk());
-        }
-    }
-
-}

src/main/java/com/sk89q/worldguard/bukkit/RegionQuery.java

@@ -1,96 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.region.ApplicableRegionSet;
-import com.sk89q.worldguard.region.RegionManager;
-import com.sk89q.worldguard.region.RegionQueryCacheEntry;
-
-/**
- * A class that will cache all region queries. Instances of this class are created
- * via an instance of {@link RegionQueryCache} and represent a point in time.
- */
-public final class RegionQuery {
-
-    private final WorldGuardPlugin plugin;
-    private final RegionQueryCacheEntry entry;
-
-    /**
-     * Construct the instance with the underlying cache entry.
-     *
-     * @param entry
-     */
-    RegionQuery(WorldGuardPlugin plugin, RegionQueryCacheEntry entry) {
-        this.plugin = plugin;
-        this.entry = entry;
-    }
-
-    /**
-     * Get an {@link ApplicableRegionSet} for a given location. The result may have been
-     * temporarily cached for the given event, or null if region protection has
-     * been disabled for the the world of the given location.
-     *
-     * @param location the location to check
-     * @return the set, or null if region protection is disabled for the given location
-     */
-    public ApplicableRegionSet lookup(Location location) {
-        World world = location.getWorld();
-        Vector vector = BukkitUtil.toVector(location);
-
-        ConfigurationManager config = plugin.getGlobalStateManager();
-        WorldConfiguration worldConfig = config.get(world);
-        RegionManager regionManager = plugin.getGlobalRegionManager();
-
-        if (!worldConfig.useRegions) {
-            return null;
-        }
-
-        return entry.lookup(regionManager.get(world), vector);
-    }
-
-    /**
-     * Get an {@link ApplicableRegionSet} for a given block. The result may have been
-     * temporarily cached for the given event, or null if region protection has
-     * been disabled for the the world of the given block.
-     *
-     * @param block the block to check
-     * @return the set, or null if region protection is disabled for the given block
-     */
-    public ApplicableRegionSet lookup(Block block) {
-        return lookup(block.getLocation());
-    }
-
-    /**
-     * Get an {@link ApplicableRegionSet} for a given entity. The result may have been
-     * temporarily cached for the given event, or null if region protection has
-     * been disabled for the the world of the given entity.
-     *
-     * @param entity the entity to check
-     * @return the set, or null if region protection is disabled for the given entity
-     */
-    public ApplicableRegionSet lookup(Entity entity) {
-        return lookup(entity.getLocation());
-    }
-
-}

src/main/java/com/sk89q/worldguard/bukkit/RegionQueryCache.java

@@ -1,53 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (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
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.event.Event;
-
-import com.sk89q.worldguard.region.AbstractRegionQueryCache;
-
-/**
- * An implementation of {@link AbstractRegionQueryCache} for Bukkit. This implementation
- * is thread-safe.
- */
-public final class RegionQueryCache extends AbstractRegionQueryCache {
-
-    private final WorldGuardPlugin plugin;
-
-    /**
-     * Construct the cache with the given plugin instance.
-     *
-     * @param plugin plugin instance
-     */
-    public RegionQueryCache(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Get a {@link RegionQuery} object that can cache region queries. The object
-     * returned by this method does not need to be cached. It is merely a proxy class.
-     *
-     * @param event the event to cache against
-     * @return an object to perform lookups against
-     */
-    public RegionQuery against(Event event) {
-        return new RegionQuery(plugin, get(event));
-    }
-
-}