[maven-release-plugin] prepare release 5.7.3

Also cleaned up a few other things regarding tests.

.gitattributes

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

.gitignore

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

.travis.yml

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

CHANGELOG.txt

@@ -1,3 +1,324 @@
+5.7.3:
+- Fixed the error caused by Bukkit's change of the TNT minecart API.
+
+5.7.2:
+- Updated to MineCraft 1.5.
+- Added TNT Minecart support. They are handled with the same flags/settings as TNT.
+- Added mining and smelting xp handling to the xp drops flag and setting.
+- Fixed a few edge cases for placing items on region borders.
+- Legacy: Fixed issue with //stack not respecting item metadata.
+
+5.7.1:
+- Added a vine growth config option and flag.
+- Added support for many commands to be used from console.
+  Usage is with -w flag and a world name e.g.
+  /rg addmem <id> <player> -w <worldname>
+  /rg flag <id> <flag> -w <worldname> <flagvalue>
+- Fixed bug that blocks placing plants in flower pots.
+- Fixed permissions check for /rg tp
+- Fixed enderchests not being accessible (they are now part of the USE flag)
+- Fixed an issue with slabs being placable in protected regions. This was
+  also fixed in CraftBukkit but has been left in for users running other versions.
+- Fixed wither skulls being handled with other fireballs, despite having their own settings.
+- Fixed item frames being placable on region borders.
+- Fixed a bug that made explosions more ineffective than they should have been.
+- Fixed bonemeal usage in protected regions.
+- Fixed special minecarts being placable in protected regions.
+- Fixed bugs being placable on region borders.
+- Fixed wolves bypassing pvp flags.
+
+5.7:
+- Fixed thread sync issue with FlagStateManager.
+- Fixed dragon egg region protection not working in certain cases.
+- Added beacon and anvil usage protection in regions.
+- Add mobs.block-enderdragon-portal-creation to stop enderdragons
+    from making portals on death.
+- Fix TNT being lethal in some case when damage was disabled.
+- Fix snowballs and enderpearls being able to knock players back in
+    pvp deny regions.
+- Add subcommand support for allowed and blocked command flags.
+- Add max-players-allowed and max-players-reject-message flags to
+    limit the numbers of players in a region.
+- Fix players being able to plant cocoa beans in protected areas.
+- Add an enderpearl flag to prevent players from teleporting to and
+    from regions.
+- Added mobs.block-other-explosions config setting and other-explosion
+    flag to block explosions caused by uncovered things, such as other
+    plugins. (It doesn't actually have to be a mob)
+- Fix mob damage setting and flag not blocking the DoT wither effect.
+- Ghast fireball flag will not block blaze fireballs from lighting things
+    on fire.
+- Fixed players without region permissions being able to trigger tripwires,
+    use enderchests, use wooden buttons, and put plants in flower pots.
+- Added mobs.block-zombie-door-destruction setting to stop zombies from
+    breaking down doors while difficulty is set to hard.
+
+Thank you to thvortex, Dilandau, tophathacker, and Dark_arc for their contributions this release.
+
+5.6.5:
+- Fixed a regression that caused paintings and item frames to no longer be properly
+    protected.
+
+5.6.4:
+- Added mobs.block-above-ground-slimes to block slimes spawning naturally above ground.
+- Added security.deop-everyone-on-join to de-op all players when they join.
+- Added security.block-in-game-op-command to prevent usage of /op from in-game.
+- Fixed a NullPointerException in PlayerInteract involving water potions and
+    potion blocking.
+- Fixed an issue with snowballs being blocked in regions.
+- Changed dragon eggs to be checked like it is a broken block in regions.
+- Moved developer's WGBukkit class to package com.sk89q.worldguard.bukkit.
+
+5.6.3:
+- Added helper WGBukkit class to get references to WorldGuard from other plugins.
+- Added physics.vine-like-rope-ladders to make ladders work like vines. As long as the
+    top ladder block is present, ladder blocks will hold even if they have no block
+    behind them, like a rope ladder.
+- Fixed NullPointerException in PlayerInteractEvent caused by potion blocking.
+- Fixed mobs.block-{item-frame,painting}-destroy not working.
+
+Thank you to def for testing the above fixes and features.
+
+5.6.2:
+- Fixed potion blocking not working well for splash potions.
+
+5.6.1:
+- Added a mycelium-spread region flag.
+- Added a dynamics.disable-mycelium-spread configuration setting.
+- Added new gameplay.block-potions option. For example:
+    gameplay:
+        block-potions: [invisibility, speed]
+- Fixed a bug in the entity explosion event handler that caused a NullPointerException.
+
+Thank you for gabizou for his contribution in this release.
+
+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.
 
@@ -229,4 +550,4 @@
 - Added block lag fix.
 
 1.0
-- Initial release.
+- Initial release.

CONTRIBUTING.md

@@ -0,0 +1,69 @@
+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,116 +1,232 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>WorldGuard ${version}</title>
+<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: 20px;
-  background: #efefef;
-  color: #333;
+    margin: 0;
+    padding: 3em 1em;
+    background: #efefef;
+    color: #333;
+    line-height: 1.5;
 }
 #wrapper {
-  margin: 20px auto 20px auto;
-  width: 600px;
-  background: #fff;
-  padding: 40px;
-  border: 1px solid #fff;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 10px;
-  box-shadow: 0 0 2px #999;
-  -webkit-box-shadow: 0 0 3px #999;
-}
-a img {
-  border: 0;
+    width: 600px;
+    margin: auto;
 }
 body, th, td, input {
-  font: 13px/17px "Lucida Grande", "Lucida Sans Unicode", Arial, Verdana, sans-serif;
+    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: #00688f;
-  text-decoration: underline;
+    color: #0004b2;   
+    text-decoration: none;
 }
-a:hover, a:active {
-  color: #000;
-  border: 0;
+a:hover {
+    color: #ac0000;
+    text-decoration: none;
+    border-bottom: 1px solid #999;
 }
 h1 {
-  font: 170% "Trebuchet MS", Georgia, serif;
-  font-weight: bold;
-  color: #b90000;
-  margin: 15px 0 5px 0;
+    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: 130% "Trebuchet MS", Georgia, serif;
-  font-weight: bold;
-  color: #6a45ac;
-  margin: 50px 0 5px 0;
-  padding: 0 0 3px 0;
-  border-bottom: 1px solid #ccc;
+    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; 
 }
-.warning {
-  background: #fffedf;
-  padding: 8px;
-  border: 1px dashed #ccc;
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  font-size: 90%;
+h3 {
+    text-transform: uppercase;
+    font-weight: bold;
 }
-.subtle {
-  color: #999;
+h2 + * {
+    clear: both;
 }
-.optional {
-  background: none repeat scroll 0 0 #FFE081;
-  border-radius: 3px 3px 3px 3px;
-  font-size: 80%;
-	font-weight: normal;
-  padding: 1px 4px;
+@media (max-width: 650px) {
+    #wrapper {
+        width: 100%;
+    }
 }
 </style>
 </head>
 <body>
 
 <div id="wrapper">
-
-<h1>WorldGuard ${version}</h1>
-<p>Thanks for choosing WorldGuard!</p>
-<h2>First Steps</h2>
-
-<p>Now, to begin, you want to:</p>
-<ol>
-  <li><strong>Install the plugin:</strong> Copy WorldGuard.jar into your Bukkit server's &quot;plugins&quot; directory.</li>
-  <li><strong>Change the configuration:</strong> Run your server once (with WorldGuard) to generate the default configuration files. There are <em>two</em> types of configuration files:
-    <ul>
-      <li>The main config.yml file  inside &quot;plugins/WorldGuard&quot; is the main configuration. </li>
-      <li>Each world has a configuration file in &quot;plugins/WorldGuard/worlds&quot; that you can use to override any setting in the main configuration file for that specific world.</li>
-    </ul>
-  </li>
-  Use <em>/wg reload</em> in the console to reload the configuration.
-  <li><strong>Learn how to use WorldGuard:</strong> Check <a href="http://wiki.sk89q.com/wiki/WorldGuard">out the wiki</a> to learn how to disable things like fire and to protect regions.</li>
-</ol>
-<p class="warning"><strong>Note:</strong> Be sure you install <a href="http://www.sk89q.com/projects/worldedit/">WorldEdit</a>. If you don't want WorldEdit, just put WorldEdit.jar into your Bukkit root folder (outside of plugins/). Note that region protection  requires WorldEdit in plugins/.</p>
-<p>Be sure to:</p>
-<ul>
-  <li>Subscribe to <a href="http://minecraftnews.sk89q.com/">SK's Minecraft blog</a> for news about WorldGuard</li>
-  <li>Submit bug reports and suggestions to the <a href="http://redmine.sk89q.com/projects/worldguard/issues">issue tracker</a></li>
-  <li>Check out the <a href="http://wiki.sk89q.com/wiki/WorldGuard">WorldGuard wiki</a></li>
-</ul>
-<h2>Getting Help</h2>
-<p>If you need help, the best two ways to ask are:</p>
-<ul>
-  <li><a href="http://forum.sk89q.com/">Visit the WorldGuard forum</a></li>
-  <li>Ask in IRC chat on <a href="http://skq.me/irc/irc.esper.net/worldguard">irc.esper.net in #worldguard</a> (idle with us!)</li>
-</ul>
-<h2>Contributing</h2>
-<p>WorldGuard is entirely open source! You can download all of the plugin code to learn from it, modify it for your own self, or even contribute back!</p>
-<ul>
-  <li><a href="https://github.com/sk89q/worldguard">Download WorldGuard code from GitHub</a></li>
-  <li>You can also <a href="http://www.sk89q.com/donate/">donate</a></li>
-  </ul>
-<p>The code is covered under the GNU General Public License v3.</p>
-<p class="subtle">Maven information: ${groupId}/${artifactId}/${version}</p>
+    <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,25 +1,38 @@
-WorldGuard
+![WorldGuard](http://static.sk89q.com/readme/worldguard.png)
 ==========
 
-WorldGuard protects your Minecraft server. As Minecraft's oldest surviving world protection mod, you know you're in safe hands.
+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
 ---------
 
-You need to have Maven installed (http://maven.apache.org). Once installed,
-simply run:
+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).
 
-    mvn clean install
-    
-Maven will automatically download dependencies for you. Note: For that to work,
-be sure to add Maven to your "PATH".
+Dependencies are automatically handled by Maven.
 
 Contributing
 ------------
 
-We happily accept contributions. The best way to do this is to fork WorldGuard
-on GitHub, add your changes, and then submit a pull request. We'll look at it,
-make comments, and merge it into WorldGuard if everything works out.
+We happily accept contributions, especially through pull requests on GitHub. Submissions 
+must be licensed under the GNU General Public License v3.
 
-By submitting code, you agree to place to license your code under the 
-GNU General Public License v3.
+Please read CONTRIBUTING.md for important guidelines to follow.
+
+We recommend following our [mailing list](https://groups.google.com/d/forum/sk-dev-discuss), especially if you have some big ideas that you want to implement.
+
+Links
+-----
+
+* [Mailing list](https://groups.google.com/d/forum/sk-dev-discuss)
+* [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)

contrib/blacklist_table.sql

@@ -1,24 +1,24 @@
--- 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 
-
+-- 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 

contrib/region_storage.sql

@@ -0,0 +1,217 @@
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL';
+
+-- -----------------------------------------------------
+-- Table `group`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `group` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(64) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  UNIQUE INDEX `name` (`name` ASC) )
+ENGINE = InnoDB
+AUTO_INCREMENT = 5
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `world`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `world` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  UNIQUE INDEX `name` (`name` ASC) )
+ENGINE = InnoDB
+AUTO_INCREMENT = 9
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region` (
+  `id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `type` ENUM('cuboid','poly2d','global') CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `priority` SMALLINT(6) NOT NULL DEFAULT '0' ,
+  `parent` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NULL DEFAULT NULL ,
+  PRIMARY KEY (`id`, `world_id`) ,
+  INDEX `fk_region_world` (`world_id` ASC) ,
+  INDEX `parent` (`parent` ASC) ,
+  CONSTRAINT `fk_region_world1`
+    FOREIGN KEY (`world_id` )
+    REFERENCES `world` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `parent`
+    FOREIGN KEY (`parent` )
+    REFERENCES `region` (`id` )
+    ON DELETE SET NULL
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_cuboid`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_cuboid` (
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `min_x` BIGINT(20) NOT NULL ,
+  `min_y` BIGINT(20) NOT NULL ,
+  `min_z` BIGINT(20) NOT NULL ,
+  `max_x` BIGINT(20) NOT NULL ,
+  `max_y` BIGINT(20) NOT NULL ,
+  `max_z` BIGINT(20) NOT NULL ,
+  PRIMARY KEY (`region_id`, `world_id`) ,
+  INDEX `fk_region_cuboid_region` (`region_id` ASC) ,
+  CONSTRAINT `fk_region_cuboid_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_flag`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_flag` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `flag` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `value` VARCHAR(256) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  INDEX `fk_flags_region` (`region_id` ASC, `world_id` ASC) ,
+  CONSTRAINT `fk_flags_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+AUTO_INCREMENT = 3246
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_groups`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_groups` (
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `group_id` INT(10) UNSIGNED NOT NULL ,
+  `owner` TINYINT(1) NOT NULL ,
+  PRIMARY KEY (`region_id`, `world_id`, `group_id`) ,
+  INDEX `fk_region_groups_region` (`region_id` ASC) ,
+  INDEX `fk_region_groups_group` (`group_id` ASC) ,
+  CONSTRAINT `fk_region_groups_group`
+    FOREIGN KEY (`group_id` )
+    REFERENCES `group` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_region_groups_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `user`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `user` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(64) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  UNIQUE INDEX `name` (`name` ASC) )
+ENGINE = InnoDB
+AUTO_INCREMENT = 82
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_players`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_players` (
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `user_id` INT(10) UNSIGNED NOT NULL ,
+  `owner` TINYINT(1) NOT NULL ,
+  PRIMARY KEY (`region_id`, `world_id`, `user_id`) ,
+  INDEX `fk_region_players_region` (`region_id` ASC) ,
+  INDEX `fk_region_users_user` (`user_id` ASC) ,
+  CONSTRAINT `fk_region_users_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_region_users_user`
+    FOREIGN KEY (`user_id` )
+    REFERENCES `user` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_poly2d`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_poly2d` (
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `min_y` INT(11) NOT NULL ,
+  `max_y` INT(11) NOT NULL ,
+  PRIMARY KEY (`region_id`, `world_id`) ,
+  INDEX `fk_region_poly2d_region` (`region_id` ASC) ,
+  CONSTRAINT `fk_region_poly2d_region`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region` (`id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+-- -----------------------------------------------------
+-- Table `region_poly2d_point`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_poly2d_point` (
+  `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL ,
+  `world_id` INT(10) UNSIGNED NOT NULL ,
+  `x` BIGINT(20) NOT NULL ,
+  `z` BIGINT(20) NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  INDEX `fk_region_poly2d_point_region_poly2d` (`region_id` ASC, `world_id` ASC) ,
+  CONSTRAINT `fk_region_poly2d_point_region_poly2d`
+    FOREIGN KEY (`region_id` , `world_id` )
+    REFERENCES `region_poly2d` (`region_id` , `world_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB
+AUTO_INCREMENT = 15
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_bin;
+
+
+
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;

contrib/region_storage_update_20110325.sql

@@ -0,0 +1,106 @@
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL';
+
+ALTER TABLE `region_cuboid` DROP FOREIGN KEY `fk_region_cuboid_region` ;
+
+ALTER TABLE `region_flag` DROP FOREIGN KEY `fk_flags_region1` ;
+
+ALTER TABLE `region_groups` DROP FOREIGN KEY `fk_region_groups_region` ;
+
+ALTER TABLE `region_players` DROP FOREIGN KEY `fk_region_players_user` , DROP FOREIGN KEY `fk_region_players_region` ;
+
+ALTER TABLE `region_poly2d` DROP FOREIGN KEY `fk_region_poly2d_region` ;
+
+ALTER TABLE `region_poly2d_point` DROP FOREIGN KEY `fk_region_poly2d_point_region_poly2d` ;
+
+ALTER TABLE `group` COLLATE = utf8_bin ;
+
+ALTER TABLE `region_cuboid` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , CHANGE COLUMN `min_x` `min_x` BIGINT(20) NOT NULL  AFTER `world_id` , CHANGE COLUMN `min_y` `min_y` BIGINT(20) NOT NULL  AFTER `min_x` , CHANGE COLUMN `max_x` `max_x` BIGINT(20) NOT NULL  AFTER `min_z` , CHANGE COLUMN `max_y` `max_y` BIGINT(20) NOT NULL  AFTER `max_x` , 
+  ADD CONSTRAINT `fk_region_cuboid_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`region_id`, `world_id`) ;
+
+ALTER TABLE `region_flag` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , CHANGE COLUMN `flag` `flag` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL  , 
+  ADD CONSTRAINT `fk_flags_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP INDEX `fk_flags_region` 
+, ADD INDEX `fk_flags_region` (`region_id` ASC, `world_id` ASC) ;
+
+ALTER TABLE `region_groups` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , DROP FOREIGN KEY `fk_region_groups_group` ;
+
+ALTER TABLE `region_groups` 
+  ADD CONSTRAINT `fk_region_groups_group`
+  FOREIGN KEY (`group_id` )
+  REFERENCES `group` (`id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE, 
+  ADD CONSTRAINT `fk_region_groups_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`region_id`, `world_id`, `group_id`) ;
+
+ALTER TABLE `region_players` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , 
+  ADD CONSTRAINT `fk_region_users_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE, 
+  ADD CONSTRAINT `fk_region_users_user`
+  FOREIGN KEY (`user_id` )
+  REFERENCES `user` (`id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`region_id`, `world_id`, `user_id`) 
+, ADD INDEX `fk_region_users_user` (`user_id` ASC) 
+, DROP INDEX `fk_region_players_user` ;
+
+ALTER TABLE `region_poly2d` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , CHANGE COLUMN `min_y` `min_y` INT(11) NOT NULL  AFTER `world_id` , 
+  ADD CONSTRAINT `fk_region_poly2d_region`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region` (`id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP PRIMARY KEY 
+, ADD PRIMARY KEY (`region_id`, `world_id`) ;
+
+ALTER TABLE `region_poly2d_point` COLLATE = utf8_bin , ADD COLUMN `world_id` INT(10) UNSIGNED NOT NULL  AFTER `region_id` , CHANGE COLUMN `x` `x` BIGINT(20) NOT NULL  AFTER `world_id` , 
+  ADD CONSTRAINT `fk_region_poly2d_point_region_poly2d`
+  FOREIGN KEY (`region_id` , `world_id` )
+  REFERENCES `region_poly2d` (`region_id` , `world_id` )
+  ON DELETE CASCADE
+  ON UPDATE CASCADE
+, DROP INDEX `fk_region_poly2d_point_region_poly2d` 
+, ADD INDEX `fk_region_poly2d_point_region_poly2d` (`region_id` ASC, `world_id` ASC) ;
+
+ALTER TABLE `user` COLLATE = utf8_bin ;
+
+ALTER TABLE `world` COLLATE = utf8_bin ;
+
+
+UPDATE `region_cuboid` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_flag` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_groups` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_players` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_poly2d` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+UPDATE `region_poly2d_point` AS c SET c.`world_id` = (SELECT p.`world_id` FROM `region` AS p WHERE p.`id` = c.`region_id`);
+
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;

pom.xml

@@ -1,173 +1,319 @@
-<!--
-  Maven build file for WorldGuard
-  Copyright (c) 2011 sk89q <http://www.sk89q.com> 
-  CommandBook is available under the GNU General Public License v3
--->
-<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.1</version>
-  <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers</description>
-
-  <scm>
-    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
-    <url>https://github.com/sk89q/worldguard</url>
-    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
-  </scm>
-
-  <repositories>
-    <!-- Repository for other dependencies of SK's -->
-    <repository>
-      <id>sk89q-mvn2</id>
-      <url>http://mvn2.sk89q.com/repo</url>
-    </repository>
-    <!-- Repository for Bukkit -->
-    <repository>
-      <id>bukkit-repo</id>
-      <url>http://repo.bukkit.org/artifactory/repo</url>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <!-- Required component -->
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>4.4.2</version>
-    </dependency>
-    
-    <!-- Bukkit -->
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-    
-    <!-- Additional libraries -->
-    <dependency>
-      <groupId>com.nijikokun</groupId>
-      <artifactId>iconomy</artifactId>
-      <version>5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.khelekore</groupId>
-      <artifactId>prtree</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.opencsv</groupId>
-      <artifactId>opencsv</artifactId>
-      <version>2.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-
-    <!-- Resources -->
-    <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>config.yml</include>
-          <include>config_world.yml</include>
-          <include>blacklist.txt</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <!-- Plugins -->
-    <plugins>
-      <!-- Compile plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-      </plugin>
-
-      <!-- JAR creation 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>WorldEdit.jar WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <!-- Shade -->
-      <!-- We want to bundle in some dependencies -->
-      <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>
-                <!-- We want to bundle in the modified CSV library -->
-                <includes>
-                  <include>net.sf.opencsv:opencsv</include>
-                </includes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Assembly -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</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>
-
-      <!-- Release -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <preparationGoals>assembly:assembly</preparationGoals>
-          <goals>assembly:assembly</goals>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<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.3</version>
+  <packaging>jar</packaging>
+  
+  <!-- Project information -->
+  <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>
+  
+  <issueManagement>
+    <system>YouTrack</system>
+    <url>http://youtrack.sk89q.com</url>
+  </issueManagement>
+  
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>http://build.sk89q.com</url>
+  </ciManagement>
+  
+  <scm>
+    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
+    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
+    <url>https://github.com/sk89q/worldguard</url>
+    <tag>master</tag>
+  </scm>
+  
+  <mailingLists>
+    <mailingList>
+      <name>Developer Discussion</name>
+      <archive>https://groups.google.com/d/forum/sk-dev-discuss</archive>
+    </mailingList>
+  </mailingLists>
+  
+  <distributionManagement>
+    <site>
+      <id>sk89q-docs-upload</id>
+      <url>ftp://sk89q-maven-deploy/worldguard/</url>
+    </site>
+  </distributionManagement>
+  
+  <properties> <!-- Fix encoding warnings -->
+    <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.5.3</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.5-R0.1-SNAPSHOT</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>commandbook</artifactId>
+      <version>2.1</version>
+      <scope>compile</scope>
+      <type>jar</type>
+      <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>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.khelekore</groupId>
+      <artifactId>prtree</artifactId>
+      <version>1.5.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>net.sf.opencsv</groupId>
+      <artifactId>opencsv</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    
+    <extensions> <!-- Used for uploading the docs -->
+      <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>config.yml</include>
+          <include>config_world.yml</include>
+          <include>blacklist.txt</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>
+                </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>
+  
+  <profiles>
+    <!-- Attach javadocs and source .jars -->
+    <profile>
+      <id>attach-docs</id>
+      
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.8.1</version>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

src/main/assembly/default.xml

@@ -3,7 +3,6 @@
   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>
@@ -28,7 +27,10 @@
       <includes>
         <include>LICENSE.txt</include>
         <include>NOTICE.txt</include>
-        <include>blacklist_table.sql</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>

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

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

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

@@ -19,14 +19,19 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.util.Map;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
-import java.util.logging.Logger;
+import java.util.Map;
 import java.util.logging.Level;
-import java.io.*;
+import java.util.logging.Logger;
+
 import org.bukkit.ChatColor;
+
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
@@ -36,11 +41,7 @@ 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.
      */
@@ -60,18 +61,19 @@ public abstract class Blacklist {
     Map<String,BlacklistTrackedEvent> lastAffected =
             new HashMap<String,BlacklistTrackedEvent>();
 
-
     private boolean useAsWhitelist;
 
-    public Blacklist(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
+     *
+     * @return whether the blacklist is empty
      */
     public boolean isEmpty() {
         return blacklist.isEmpty();
@@ -79,36 +81,36 @@ public abstract class Blacklist {
 
     /**
      * Get the entries for an item or list.
-     * 
-     * @param id 
-     * @return 
+     *
+     * @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
+     *
+     * @return The number of items in the blacklist
      */
     public int getItemCount() {
         return blacklist.size();
     }
-    
+
     /**
      * Returns whether the blacklist is used as a whitelist.
-     * 
-     * @return
+     *
+     * @return whether the blacklist is be used as a whitelist
      */
     public boolean isWhitelist() {
         return useAsWhitelist;
     }
-    
+
     /**
      * Get the logger.
-     * 
-     * @return
+     *
+     * @return The logger used in this blacklist
      */
     public BlacklistLogger getLogger() {
         return blacklistLogger;
@@ -116,11 +118,11 @@ public abstract class Blacklist {
 
     /**
      * Method to handle the event.
-     * 
-     * @param event
-     * @param forceRepeat
-     * @param silent
-     * @return
+     *
+     * @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
      */
     public boolean check(BlacklistEvent event, boolean forceRepeat, boolean silent) {
         List<BlacklistEntry> entries = getEntries(event.getType());
@@ -139,8 +141,8 @@ public abstract class Blacklist {
     /**
      * Load the blacklist.
      *
-     * @param file
-     * @throws IOException
+     * @param file The file to load from
+     * @throws IOException if an error occurred reading from the file
      */
     public void load(File file) throws IOException {
         FileReader input = null;
@@ -168,14 +170,14 @@ public abstract class Blacklist {
                     currentEntries = new ArrayList<BlacklistEntry>();
 
                     for (String item : items) {
-                        int id = 0;
+                        int id;
 
                         try {
                             id = Integer.parseInt(item.trim());
                         } catch (NumberFormatException e) {
                             id = getItemID(item.trim());
                             if (id == 0) {
-                                logger.log(Level.WARNING, "WorldGuard: Unknown block name: "
+                                logger.log(Level.WARNING, "Unknown block name: "
                                         + item);
                                 break;
                             }
@@ -205,6 +207,8 @@ 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")) {
@@ -244,48 +248,48 @@ public abstract class Blacklist {
                 if (input != null) {
                     input.close();
                 }
-            } catch (IOException e2) {
+            } catch (IOException ignore) {
             }
         }
     }
-    
+
     /**
      * Get the last event.
-     * 
-     * @return
+     *
+     * @return The last event
      */
     public BlacklistEvent getLastEvent() {
         return lastEvent;
     }
-    
+
     /**
      * Notify administrators.
-     * 
-     * @param event
-     * @param comment 
+     *
+     * @param event The event to notify about
+     * @param comment The comment to notify with
      */
     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
+     *
+     * @param msg The message to broadcast
      */
     public abstract void broadcastNotification(String msg);
 
     /**
      * Forget a player.
      *
-     * @param player
+     * @param player The player to forget
      */
     public void forgetPlayer(LocalPlayer player) {
         lastAffected.remove(player.getName());
@@ -300,8 +304,9 @@ public abstract class Blacklist {
 
     /**
      * Get an item's ID from its name.
-     * 
-     * @param name
+     *
+     * @param name the name of the item to look up
+     * @return the id for name if contained in ItemId, else -1
      */
     private static int getItemID(String name) {
         ItemType type = ItemType.lookup(name);
@@ -314,8 +319,9 @@ public abstract class Blacklist {
 
     /**
      * Get an item's friendly name with its ID.
-     * 
-     * @param id
+     *
+     * @param id The id to look up
+     * @return The item's friendly name
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);

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

@@ -19,9 +19,12 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.util.Set;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.Set;
+
 import org.bukkit.ChatColor;
+
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
@@ -42,11 +45,17 @@ 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;
@@ -54,14 +63,14 @@ public class BlacklistEntry {
     private String[] useActions;
     private String[] dropActions;
     private String[] acquireActions;
-    
+
     private String message;
     private String comment;
 
     /**
      * Construct the object.
-     * 
-     * @param blacklist
+     *
+     * @param blacklist The blacklist that contains this entry
      */
     public BlacklistEntry(Blacklist blacklist) {
         this.blacklist = blacklist;
@@ -74,6 +83,13 @@ 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
      */
@@ -86,98 +102,107 @@ public class BlacklistEntry {
     }
 
     /**
-     * @return
+     * @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
      */
     public String[] getBreakActions() {
         return breakActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when breaking
      */
     public void setBreakActions(String[] actions) {
         this.breakActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that occur when destroying with a specific item
      */
     public String[] getDestroyWithActions() {
         return destroyWithActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when destroying with an item
      */
     public void setDestroyWithActions(String[] actions) {
         this.destroyWithActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when placing
      */
     public String[] getPlaceActions() {
         return placeActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when placing
      */
     public void setPlaceActions(String[] actions) {
         this.placeActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when interacting
      */
     public String[] getInteractActions() {
         return interactActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when interacting
      */
     public void setInteractActions(String[] actions) {
         this.interactActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when using
      */
     public String[] getUseActions() {
         return useActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when using
      */
     public void setUseActions(String[] actions) {
         this.useActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when dropping
      */
     public String[] getDropActions() {
         return dropActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when dropping
      */
     public void setDropActions(String[] actions) {
         this.dropActions = actions;
     }
 
     /**
-     * @return
+     * @return The actions that will occur when acquiring
      */
     public String[] getAcquireActions() {
         return acquireActions;
     }
 
     /**
-     * @param actions
+     * @param actions The actions to occur when acquiring
      */
     public void setAcquireActions(String[] actions) {
         this.acquireActions = actions;
@@ -214,50 +239,57 @@ public class BlacklistEntry {
     /**
      * Returns true if this player should be ignored.
      *
-     * @param player
-     * @return
+     * @param player The player to check
+     * @return whether this player should be ignored for blacklist blocking
      */
     public boolean shouldIgnore(LocalPlayer player) {
-        if (ignoreGroups == null) {
-            return false;
+        if (ignoreGroups != null) {
+            for (String group : player.getGroups()) {
+                if (ignoreGroups.contains(group.toLowerCase())) {
+                    return true;
+                }
+            }
         }
-        for (String group : player.getGroups()) {
-            if (ignoreGroups.contains(group.toLowerCase())) {
-                return true;
+
+        if (ignorePermissions != null) {
+            for (String perm : ignorePermissions) {
+                if (player.hasPermission(perm)) {
+                    return true;
+                }
             }
         }
 
         return false;
     }
-    
+
     /**
      * Get the associated actions with an event.
-     * 
-     * @param event
-     * @return
+     *
+     * @param event The event to check
+     * @return The actions for the given event
      */
     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;
         }
@@ -265,16 +297,16 @@ public class BlacklistEntry {
 
     /**
      * Method to handle the event.
-     * 
-     * @param useAsWhitelist 
-     * @param event
-     * @param forceRepeat
-     * @param silent
-     * @return
+     *
+     * @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
      */
     public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean forceRepeat, boolean silent) {
         LocalPlayer player = event.getPlayer();
-        
+
         if (shouldIgnore(player)) {
             return true;
         }
@@ -295,21 +327,21 @@ public class BlacklistEntry {
 
         String actions[] = getActions(event);
 
-        
-        boolean ret = useAsWhitelist ? false : true;
-        
+
+        boolean ret = !useAsWhitelist;
+
         // Nothing to do
         if (actions == null) {
-            return useAsWhitelist ? false : true;
+            return ret;
         }
-        
+
         for (String action : actions) {
             // Deny
             if (action.equalsIgnoreCase("deny")) {
                 if (silent) {
                     return false;
                 }
-                
+
                 ret = false;
 
             // Allow
@@ -325,7 +357,7 @@ public class BlacklistEntry {
                 if (silent) {
                     continue;
                 }
-                
+
                 if (this.message != null) {
                     player.kick(String.format(this.message,
                             getFriendlyItemName(event.getType())));
@@ -339,7 +371,7 @@ public class BlacklistEntry {
                 if (silent) {
                     continue;
                 }
-                
+
                 if (this.message != null) {
                     player.ban("Banned: " + String.format(this.message,
                             getFriendlyItemName(event.getType())));
@@ -348,12 +380,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);
@@ -378,8 +410,8 @@ public class BlacklistEntry {
 
     /**
      * Get an item's friendly name with its ID.
-     * 
-     * @param id
+     *
+     * @param id The id to get a name for
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/java/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/main/java/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java

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

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

@@ -19,17 +19,19 @@
 
 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.SQLException;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 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;
@@ -40,58 +42,58 @@ 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 String dsn;
+    private final String dsn;
     /**
      * Username.
      */
-    private String user;
+    private final String user;
     /**
      * Password.
      */
-    private String pass;
+    private final String pass;
     /**
      * Table.
      */
-    private String table;
+    private final String table;
     /**
      * World name.
      */
-    private String worldName;
+    private final String worldName;
     /**
      * Database connection.
      */
     private Connection conn;
+    
+    private final Logger logger;
 
     /**
      * Construct the object.
-     * 
-     * @param dsn
-     * @param user
-     * @param pass
-     * @param table 
-     * @param worldName 
+     *
+     * @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
      */
-    public DatabaseLoggerHandler(String dsn, String user, String pass, String table, String worldName) {
+    public DatabaseLoggerHandler(String dsn, String user, String pass, String table, String worldName, Logger logger) {
         this.dsn = dsn;
         this.user = user;
         this.pass = pass;
         this.table = table;
         this.worldName = worldName;
+        this.logger = logger;
     }
 
     /**
      * Gets the database connection.
-     * 
-     * @return
-     * @throws SQLException
+     *
+     * @return The database connection
+     * @throws SQLException when the connection cannot be created
      */
     private Connection getConnection() throws SQLException {
         if (conn == null || conn.isClosed()) {
@@ -102,14 +104,12 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
 
     /**
      * Log an event to the database.
-     * 
-     * @param event
-     * @param name
-     * @param x
-     * @param y
-     * @param z
-     * @param item
-     * @param comment
+     *
+     * @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
      */
     private void logEvent(String event, LocalPlayer player, Vector pos, int item,
             String comment) {
@@ -134,11 +134,11 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
                     + e.getMessage());
         }
     }
-    
+
     /**
      * Log an event.
      *
-     * @param event
+     * @param event The event to log
      */
     public void logEvent(BlacklistEvent event, String comment) {
         // Block break
@@ -146,43 +146,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 BlockPlaceBlacklistEvent) {
-            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+        } else if (event instanceof BlockInteractBlacklistEvent) {
+            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)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 +198,8 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
             if (conn != null && !conn.isClosed()) {
                 conn.close();
             }
-        } catch (SQLException e) {
-            
+        } catch (SQLException ignore) {
+
         }
     }
 }

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

@@ -19,26 +19,32 @@
 
 package com.sk89q.worldguard.blacklist.loggers;
 
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.io.*;
-import java.util.regex.*;
-import java.util.*;
+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 com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 
 /**
  *
  * @author sk89q
  */
 public class FileLoggerHandler implements BlacklistLoggerHandler {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
     /**
      * Regex for patterns in the path.
      */
@@ -66,38 +72,45 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
      */
     private TreeMap<String,FileLoggerWriter> writers =
             new TreeMap<String,FileLoggerWriter>();
+    
+    private final Logger logger;
 
     /**
      * Construct the object.
      *
-     * @param pathPattern
-     * @param worldName 
+     * @param pathPattern The pattern for the logflie path
+     * @param worldName The name of the world
+     * @param logger The logger used to log errors
      */
-    public FileLoggerHandler(String pathPattern, String worldName) {
+    public FileLoggerHandler(String pathPattern, String worldName, Logger logger) {
         this.pathPattern = pathPattern;
         this.worldName = worldName;
+        this.logger = logger;
     }
 
     /**
      * Construct the object.
      *
-     * @param pathPattern
-     * @param cacheSize
-     * @param worldName 
+     * @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
      */
-    public FileLoggerHandler(String pathPattern, int cacheSize, String worldName) {
+    public FileLoggerHandler(String pathPattern, int cacheSize, String worldName, Logger logger) {
         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.
-     * 
-     * @return
+     *
+     * @param playerName The name of the playername
+     * @return The path for the logfile
      */
     private String buildPath(String playerName) {
         GregorianCalendar calendar = new GregorianCalendar();
@@ -142,20 +155,21 @@ 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
-     * @param message
+     *
+     * @param player The player to log
+     * @param message The message to log
+     * @param comment The comment associated with the logged event
      */
     private void log(LocalPlayer player, String message, String comment) {
         String path = buildPath(player.getName());
@@ -163,7 +177,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!
@@ -185,7 +199,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);
@@ -203,7 +217,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
                     Map.Entry<String,FileLoggerWriter> entry = it.next();
                     try {
                         entry.getValue().getWriter().close();
-                    } catch (IOException e) {
+                    } catch (IOException ignore) {
                     }
                     it.remove();
 
@@ -222,71 +236,33 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
 
     /**
      * Gets the coordinates in text form for the log.
-     * 
-     * @param pos
-     * @return
+     *
+     * @param pos The position to get coordinates for
+     * @return The position's coordinates in human-readable form
      */
     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
+     * @param event The event to log
      */
     public void logEvent(BlacklistEvent event, String 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);
-        }
+        logEvent(event, event.getDescription(), event.getType(), event.getPosition(), comment);
     }
 
     /**
      * Get an item's friendly name with its ID.
      *
-     * @param id
+     * @param id The id to get a friendly name for
+     * @return The friendly name
      */
     private static String getFriendlyItemName(int id) {
         ItemType type = ItemType.fromID(id);
@@ -304,7 +280,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
         for (Map.Entry<String,FileLoggerWriter> entry : writers.entrySet()) {
             try {
                 entry.getValue().getWriter().close();
-            } catch (IOException e) {
+            } catch (IOException ignore) {
             }
         }
 

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

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

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

@@ -25,7 +25,7 @@ public class BukkitBlacklist extends Blacklist {
     private WorldGuardPlugin plugin;
     
     public BukkitBlacklist(Boolean useAsWhitelist, WorldGuardPlugin plugin) {
-        super(useAsWhitelist);
+        super(useAsWhitelist, plugin.getLogger());
         this.plugin = plugin;
     }
     
@@ -33,5 +33,4 @@ public class BukkitBlacklist extends Blacklist {
     public void broadcastNotification(String msg) {
         plugin.broadcastNotification(msg);
     }
-
 }

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

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

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

@@ -19,48 +19,51 @@
 
 package com.sk89q.worldguard.bukkit;
 
-import java.util.List;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.World;
 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
-     * @return
+     *
+     * @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
-     * @return
+     *
+     * @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
-     * @return
+     *
+     * @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());
@@ -68,22 +71,24 @@ public class BukkitUtil {
 
     /**
      * Converts a WorldEdit vector to a Bukkit location.
-     * 
-     * @param world
-     * @param vec 
-     * @return
+     *
+     * @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
-     * @param name
-     * @return
+     *
+     * @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) {
@@ -91,22 +96,24 @@ public class BukkitUtil {
         }
         return players.get(0);
     }
-    
+
     /**
      * Drops a sign item and removes a sign.
-     * 
-     * @param block
+     *
+     * @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(Material.SIGN));
+                new ItemStack(ItemID.SIGN, 1));
     }
 
     /**
      * Sets the given block to fluid water.
      * Used by addSpongeWater()
-     * 
+     *
      * @param world
      * @param ox
      * @param oy
@@ -122,21 +129,168 @@ public class BukkitUtil {
 
     /**
      * Checks if the given block is water
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     * @return 
+     *
+     * @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();
-        if (id == 8 || id == 9) {
-            return true;
-        } else {
-            return false;
+        return id == 8 || id == 9;
+    }
+
+    /**
+     * Checks if the given potion is a vial of water.
+     *
+     * @param item the item to check
+     * @return true if it's a water vial
+     */
+    public static boolean isWaterPotion(ItemStack item) {
+        return (item.getDurability() & 0x3F) == 0;
+    }
+
+    /**
+     * Get just the potion effect bits. This is to work around bugs with potion
+     * parsing.
+     *
+     * @param item item
+     * @return new bits
+     */
+    public static int getPotionEffectBits(ItemStack item) {
+        return item.getDurability() & 0x3F;
+    }
+
+    /**
+     * 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 an entity should be removed for the halt activity mode.
+     *
+     * @param entity
+     * @return true if it's to be removed
+     */
+    public static boolean isIntensiveEntity(Entity entity) {
+        return entity instanceof Item
+                || entity instanceof TNTPrimed
+                || entity instanceof ExperienceOrb
+                || entity instanceof FallingSand
+                || (entity instanceof LivingEntity
+                    && !(entity instanceof Tameable)
+                    && !(entity instanceof Player));
+    }
+
+    /**
+     * 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;
+    }
 }

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

@@ -18,28 +18,39 @@
  */
 package com.sk89q.worldguard.bukkit;
 
+import com.sk89q.commandbook.CommandBook;
+import com.sk89q.commandbook.GodComponent;
+import com.sk89q.util.yaml.YAMLFormat;
+import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.Blacklist;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
 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 org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.config.Configuration;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  * Represents the global configuration and also delegates configuration
  * for individual worlds.
- * 
+ *
  * @author sk89q
  * @author Michael
  */
 public class ConfigurationManager {
-    
-    public static final String CONFIG_HEADER = "#\r\n" +
-            "# WorldGuard's configuration file\r\n" +
+
+    private static final String CONFIG_HEADER = "#\r\n" +
+            "# WorldGuard's main configuration file\r\n" +
+            "#\r\n" +
+            "# This is the global configuration file. Anything placed into here will\r\n" +
+            "# be applied to all worlds. However, each world has its own configuration\r\n" +
+            "# file to allow you to replace most settings in here for that world only.\r\n" +
             "#\r\n" +
             "# About editing this file:\r\n" +
             "# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If\r\n" +
@@ -59,51 +70,102 @@ public class ConfigurationManager {
      * Reference to the plugin.
      */
     private WorldGuardPlugin plugin;
-    
+
     /**
      * Holds configurations for different worlds.
      */
-    private Map<String, WorldConfiguration> worlds;
-    
+    private ConcurrentMap<String, WorldConfiguration> worlds;
+
+    /**
+     * The global configuration for use when loading worlds
+     */
+    private YAMLProcessor config;
+
     /**
      * List of people with god mode.
      */
+    @Deprecated
     private Set<String> hasGodMode = new HashSet<String>();
-    
+
     /**
      * List of people who can breathe underwater.
      */
     private Set<String> hasAmphibious = new HashSet<String>();
-    
-    public boolean suppressTickSyncWarnings;
+
+    private boolean hasCommandBookGodMode = false;
+
     public boolean useRegionsScheduler;
+    public boolean useRegionsCreatureSpawnEvent;
     public boolean activityHaltToggle = false;
+    public boolean autoGodMode;
+    public boolean usePlayerMove;
+    public boolean deopOnJoin;
+    public boolean blockInGameOp;
+    public Map<String, String> hostKeys = new HashMap<String, String>();
+
+    /**
+     * Region Storage Configuration method, and config values
+     */
+    public boolean useSqlDatabase = false;
+    public String sqlDsn;
+    public String sqlUsername;
+    public String sqlPassword;
 
     /**
      * Construct the object.
-     * 
-     * @param plugin
+     *
+     * @param plugin The plugin instance
      */
     public ConfigurationManager(WorldGuardPlugin plugin) {
         this.plugin = plugin;
-        this.worlds = new HashMap<String, WorldConfiguration>();
+        this.worlds = new ConcurrentHashMap<String, WorldConfiguration>();
     }
 
     /**
      * Load the configuration.
      */
+    @SuppressWarnings("unchecked")
     public void load() {
         // Create the default configuration file
-        WorldGuardPlugin.createDefaultConfiguration(
+        plugin.createDefaultConfiguration(
                 new File(plugin.getDataFolder(), "config.yml"), "config.yml");
-        
-        Configuration config = plugin.getConfiguration();
-        config.load();
 
-        suppressTickSyncWarnings = config.getBoolean(
-                "suppress-tick-sync-warnings", false);
-        useRegionsScheduler = config.getBoolean(
-                "regions.use-scheduler", true);
+        config = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), true, YAMLFormat.EXTENDED);
+        try {
+            config.load();
+        } catch (IOException e) {
+            plugin.getLogger().severe("Error reading configuration for global config: ");
+            e.printStackTrace();
+        }
+
+        config.removeProperty("suppress-tick-sync-warnings");
+        useRegionsScheduler = config.getBoolean("regions.use-scheduler", true);
+        useRegionsCreatureSpawnEvent = config.getBoolean("regions.use-creature-spawn-event", true);
+        autoGodMode = config.getBoolean("auto-invincible", config.getBoolean("auto-invincible-permission", false));
+        config.removeProperty("auto-invincible-permission");
+        usePlayerMove = config.getBoolean("use-player-move-event", true);
+
+        deopOnJoin = config.getBoolean("security.deop-everyone-on-join", false);
+        blockInGameOp = config.getBoolean("security.block-in-game-op-command", false);
+
+        hostKeys = new HashMap<String, String>();
+        Object hostKeysRaw = config.getProperty("host-keys");
+        if (hostKeysRaw == null || !(hostKeysRaw instanceof Map)) {
+            config.setProperty("host-keys", new HashMap<String, String>());
+        } else {
+            for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) hostKeysRaw).entrySet()) {
+                String key = String.valueOf(entry.getKey());
+                String value = String.valueOf(entry.getValue());
+                hostKeys.put(key.toLowerCase(), value);
+            }
+        }
+
+        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");
 
         // Load configurations for each world
         for (World world : plugin.getServer().getWorlds()) {
@@ -111,7 +173,10 @@ public class ConfigurationManager {
         }
 
         config.setHeader(CONFIG_HEADER);
-        config.save();
+
+        if (!config.save()) {
+            plugin.getLogger().severe("Error saving configuration!");
+        }
     }
 
     /**
@@ -123,17 +188,21 @@ public class ConfigurationManager {
 
     /**
      * Get the configuration for a world.
-     * 
-     * @param world
-     * @return
+     *
+     * @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);
-        
-        if (config == null) {
-            config = new WorldConfiguration(plugin, worldName);
-            worlds.put(worldName, config);
+        WorldConfiguration newConfig = null;
+
+        while (config == null) {
+            if (newConfig == null) {
+                newConfig = new WorldConfiguration(plugin, worldName, this.config);
+            }
+            worlds.putIfAbsent(world.getName(), newConfig);
+            config = worlds.get(world.getName());
         }
 
         return config;
@@ -141,77 +210,101 @@ public class ConfigurationManager {
 
     /**
      * Forget a player.
-     * 
-     * @param player
+     *
+     * @param player The player to forget about
      */
     public 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
+     *
+     * @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
+     *
+     * @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
-     * @return 
+     *
+     * @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
+     *
+     * @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
+     *
+     * @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
-     * @return 
+     * 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());
     }
+
+    public void updateCommandBookGodMode() {
+        try {
+            if (plugin.getServer().getPluginManager().isPluginEnabled("CommandBook")) {
+                Class.forName("com.sk89q.commandbook.GodComponent");
+                hasCommandBookGodMode = true;
+                return;
+            }
+        } catch (ClassNotFoundException ignore) {}
+        hasCommandBookGodMode = false;
+    }
+
+    public boolean hasCommandBookGodMode() {
+        return hasCommandBookGodMode;
+    }
 }

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

@@ -19,36 +19,40 @@
 
 package com.sk89q.worldguard.bukkit;
 
-import java.util.HashMap;
-import java.util.Map;
-import org.bukkit.entity.Player;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+import org.bukkit.GameMode;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
 
 /**
  * This processes per-player state information and is also meant to be used
  * as a scheduled task.
- * 
+ *
  * @author sk89q
  */
 public class FlagStateManager implements Runnable {
-    
+
     public static final int RUN_DELAY = 20;
-    
+
     private WorldGuardPlugin plugin;
     private Map<String, PlayerFlagState> states;
-    
+
     /**
      * Construct the object.
-     * 
-     * @param plugin
+     *
+     * @param plugin The plugin instance
      */
     public FlagStateManager(WorldGuardPlugin plugin) {
         this.plugin = plugin;
-        
+
         states = new HashMap<String, PlayerFlagState>();
     }
 
@@ -61,16 +65,16 @@ public class FlagStateManager implements Runnable {
 
         for (Player player : players) {
             WorldConfiguration worldConfig = config.get(player.getWorld());
-            
+
             if (!worldConfig.useRegions) {
                 continue;
             }
-            
+
             PlayerFlagState state;
-            
+
             synchronized (this) {
                 state = states.get(player.getName());
-                
+
                 if (state == null) {
                     state = new PlayerFlagState();
                     states.put(player.getName(), state);
@@ -78,82 +82,160 @@ public class FlagStateManager implements Runnable {
             }
 
             Vector playerLocation = toVector(player.getLocation());
-            RegionManager regionManager = plugin.getGlobalRegionManager()
-                    .get(player.getWorld());
-            ApplicableRegionSet applicable = regionManager
-                    .getApplicableRegions(playerLocation);
-            
-            processHeal(applicable, player, state);
+            RegionManager regionManager = plugin.getGlobalRegionManager().get(player.getWorld());
+            ApplicableRegionSet applicable = regionManager.getApplicableRegions(playerLocation);
+
+            if (!RegionQueryUtil.isInvincible(plugin, player, applicable)
+                    && !plugin.getGlobalStateManager().hasGodMode(player)
+                    && !(player.getGameMode() == GameMode.CREATIVE)) {
+                processHeal(applicable, player, state);
+                processFeed(applicable, player, state);
+            }
         }
     }
-    
+
     /**
      * Process healing for a player.
-     * 
-     * @param applicable
-     * @param player
-     * @param state
+     *
+     * @param applicable The set of applicable regions
+     * @param player The player to process healing flags on
+     * @param state The player's state
      */
     private void processHeal(ApplicableRegionSet applicable, Player player,
             PlayerFlagState state) {
-        
-        if (player.getHealth() >= 20 || player.getHealth() <= 0) {
+
+        if (player.getHealth() <= 0) {
             return;
         }
-        
+
         long now = System.currentTimeMillis();
 
         Integer healAmount = applicable.getFlag(DefaultFlag.HEAL_AMOUNT);
         Integer healDelay = applicable.getFlag(DefaultFlag.HEAL_DELAY);
-        
-        if (healAmount == null || healDelay == null || healAmount < 1 || healDelay < 0) {
+        Integer minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
+        Integer maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);
+
+        if (healAmount == null || healDelay == null || healAmount == 0 || healDelay < 0) {
             return;
         }
-        
+        if (minHealth == null) minHealth = 0;
+        if (maxHealth == null) maxHealth = 20;
+
+        // Apply a cap to prevent possible exceptions
+        minHealth = Math.min(player.getMaxHealth(), minHealth);
+        maxHealth = Math.min(player.getMaxHealth(), maxHealth);
+
+        if (player.getHealth() >= maxHealth && healAmount > 0) {
+            return;
+        }
+
         if (healDelay <= 0) {
-            player.setHealth(20);
+            player.setHealth(healAmount > 0 ? maxHealth : minHealth); // this will insta-kill if the flag is unset
             state.lastHeal = now;
         } else if (now - state.lastHeal > healDelay * 1000) {
-            player.setHealth(Math.min(20, player.getHealth() + healAmount));
+            // clamp health between minimum and maximum
+            player.setHealth(Math.min(maxHealth, Math.max(minHealth, player.getHealth() + healAmount)));
             state.lastHeal = now;
         }
     }
-    
+
+    /**
+     * Process restoring hunger for a player.
+     *
+     * @param applicable The set of applicable regions
+     * @param player The player to process hunger flags on
+     * @param state The player's state
+     */
+    private void processFeed(ApplicableRegionSet applicable, Player player,
+            PlayerFlagState state) {
+
+        long now = System.currentTimeMillis();
+
+        Integer feedAmount = applicable.getFlag(DefaultFlag.FEED_AMOUNT);
+        Integer feedDelay = applicable.getFlag(DefaultFlag.FEED_DELAY);
+        Integer minHunger = applicable.getFlag(DefaultFlag.MIN_FOOD);
+        Integer maxHunger = applicable.getFlag(DefaultFlag.MAX_FOOD);
+
+        if (feedAmount == null || feedDelay == null || feedAmount == 0 || feedDelay < 0) {
+            return;
+        }
+        if (minHunger == null) minHunger = 0;
+        if (maxHunger == null) maxHunger = 20;
+
+        // Apply a cap to prevent possible exceptions
+        minHunger = Math.min(20, minHunger);
+        maxHunger = Math.min(20, maxHunger);
+
+        if (player.getFoodLevel() >= maxHunger && feedAmount > 0) {
+            return;
+        }
+
+        if (feedDelay <= 0) {
+            player.setFoodLevel(feedAmount > 0 ? maxHunger : minHunger);
+            state.lastFeed = now;
+        } else if (now - state.lastFeed > feedDelay * 1000) {
+            // clamp health between minimum and maximum
+            player.setFoodLevel(Math.min(maxHunger, Math.max(minHunger, player.getFoodLevel() + feedAmount)));
+            state.lastFeed = now;
+        }
+    }
+
     /**
      * Forget a player.
-     * 
-     * @param player
+     *
+     * @param player The player to forget
      */
     public synchronized void forget(Player player) {
         states.remove(player.getName());
     }
-    
+
     /**
-     * Get a player's flag state.
-     * 
-     * @param player
-     * @return
+     * Forget all managed players. Use with caution.
+     */
+    public synchronized void forgetAll() {
+        states.clear();
+    }
+
+    /**
+     * Get a player's flag state. A new state will be created if there is no existing
+     * state for the player.
+     *
+     * @param player The player to get a state for
+     * @return The {@code player}'s state
      */
     public synchronized PlayerFlagState getState(Player player) {
         PlayerFlagState state = states.get(player.getName());
-        
+
         if (state == null) {
             state = new PlayerFlagState();
             states.put(player.getName(), state);
         }
-        
+
         return state;
     }
-    
+
     /**
      * Keeps state per player.
      */
     public static class PlayerFlagState {
         public long lastHeal;
+        public long lastFeed;
         public String lastGreeting;
         public String lastFarewell;
-        public Boolean notifiedForEnter = false;
+        public Boolean lastExitAllowed = null;
         public Boolean notifiedForLeave = false;
-    }
+        public Boolean notifiedForEnter = false;
+        public GameMode lastGameMode;
+        public World lastWorld;
+        public int lastBlockX;
+        public int lastBlockY;
+        public int lastBlockZ;
 
+        /* Used to cache invincibility status */
+        public World lastInvincibleWorld;
+        public int lastInvincibleX;
+        public int lastInvincibleY;
+        public int lastInvincibleZ;
+        public boolean wasInvincible;
+    }
 }

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

@@ -19,9 +19,16 @@
 
 package com.sk89q.worldguard.bukkit;
 
-import java.io.*;
-import java.util.logging.Logger;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import org.bukkit.World;
+
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
 import com.sk89q.worldguard.protection.databases.CSVDatabase;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 
@@ -31,15 +38,11 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
  * @author sk89q
  */
 public class LegacyWorldGuardMigration {
-    /**
-     * Logger for messages.
-     */
-    protected static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
     
     /**
      * Port over the blacklist.
      * 
-     * @param plugin
+     * @param plugin The plugin instance
      */
     public static void migrateBlacklist(WorldGuardPlugin plugin) {
         World mainWorld = plugin.getServer().getWorlds().get(0);
@@ -50,7 +53,7 @@ public class LegacyWorldGuardMigration {
         File newFile = new File(plugin.getDataFolder(), newPath);
         
         if (!newFile.exists() && oldFile.exists()) {
-            logger.warning("WorldGuard: WorldGuard will now update your blacklist "
+            plugin.getLogger().warning("WorldGuard will now update your blacklist "
                     + "from an older version of WorldGuard.");
             
             // Need to make root directories
@@ -60,9 +63,9 @@ public class LegacyWorldGuardMigration {
                 oldFile.renameTo(new File(plugin.getDataFolder(),
                         "blacklist.txt.old"));
             } else {
-                logger.warning("WorldGuard: blacklist.txt has been converted " +
+                plugin.getLogger().warning("blacklist.txt has been converted " +
                         "for the main world at " + newPath + "");
-                logger.warning("WorldGuard: Your other worlds currently have no " +
+                plugin.getLogger().warning("Your other worlds currently have no " +
                 		"blacklist defined!");
             }
             
@@ -72,22 +75,22 @@ public class LegacyWorldGuardMigration {
     /**
      * Migrate region settings.
      * 
-     * @param plugin
+     * @param plugin The plugin instance
      */
     public static void migrateRegions(WorldGuardPlugin plugin) {
         try {
             File oldDatabase = new File(plugin.getDataFolder(), "regions.txt");
             if (!oldDatabase.exists()) return;
             
-            logger.info("WorldGuard: The regions database has changed in 4.x. "
+            plugin.getLogger().info("The regions database has changed in 5.x. "
                     + "Your old regions database will be converted to the new format "
-                    + "and set as your primarily world's database.");
+                    + "and set as your primary world's database.");
 
             World w = plugin.getServer().getWorlds().get(0);
             RegionManager mgr = plugin.getGlobalRegionManager().get(w);
 
             // First load up the old database using the CSV loader
-            CSVDatabase db = new CSVDatabase(oldDatabase);
+            CSVDatabase db = new CSVDatabase(oldDatabase, plugin.getLogger());
             db.load();
             
             // Then save the new database
@@ -96,10 +99,9 @@ public class LegacyWorldGuardMigration {
             
             oldDatabase.renameTo(new File(plugin.getDataFolder(), "regions.txt.old"));
 
-            logger.info("WorldGuard: Regions database converted!");
-        } catch (FileNotFoundException e) {
-        } catch (IOException e) {
-            logger.warning("WorldGuard: Failed to load regions: "
+            plugin.getLogger().info("Regions database converted!");
+        } catch (ProtectionDatabaseException e) {
+            plugin.getLogger().warning("Failed to load regions: "
                     + e.getMessage());
         }
     }
@@ -107,8 +109,8 @@ public class LegacyWorldGuardMigration {
     /**
      * Copies a file.
      * 
-     * @param from
-     * @param to
+     * @param from The source file
+     * @param to The destination file
      * @return true if successful
      */
     private static boolean copyFile(File from, File to) {
@@ -129,20 +131,20 @@ public class LegacyWorldGuardMigration {
             out.close();
             
             return true;
-        } catch (FileNotFoundException ex) {
-        } catch (IOException e) {
+        } catch (FileNotFoundException ignore) {
+        } catch (IOException ignore) {
         } finally {
             if (in != null) {
                 try {
                     in.close();
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                 }
             }
             
             if (out != null) {
                 try {
                     out.close();
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                 }
             }
         }

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

@@ -21,6 +21,7 @@ package com.sk89q.worldguard.bukkit;
 
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
@@ -37,7 +38,7 @@ public class LoggerToChatHandler extends Handler {
 
     /**
      * Construct the object.
-     * 
+     *
      * @param player
      */
     public LoggerToChatHandler(CommandSender player) {

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

@@ -0,0 +1,83 @@
+// $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.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+public class RegionQueryUtil {
+
+    public static boolean isInvincible(WorldGuardPlugin plugin, Player player) {
+        return isInvincible(plugin, player, null);
+    }
+
+    public static boolean isInvincible(WorldGuardPlugin plugin, Player player,
+                                       ApplicableRegionSet set) {
+        Location loc = player.getLocation();
+        World world = player.getWorld();
+        
+        FlagStateManager.PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+
+        if (state.lastInvincibleWorld == null ||
+                !state.lastInvincibleWorld.equals(world) ||
+                state.lastInvincibleX != loc.getBlockX() ||
+                state.lastInvincibleY != loc.getBlockY() ||
+                state.lastInvincibleZ != loc.getBlockZ()) {
+            state.lastInvincibleX = loc.getBlockX();
+            state.lastInvincibleY = loc.getBlockY();
+            state.lastInvincibleZ = loc.getBlockZ();
+            state.lastInvincibleWorld = world;
+
+            if (set == null) {
+                Vector vec = new Vector(state.lastInvincibleX,
+                        state.lastInvincibleY, state.lastInvincibleZ);
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                set = mgr.getApplicableRegions(vec);
+            }
+
+            state.wasInvincible = set.allows(DefaultFlag.INVINCIBILITY, plugin.wrapPlayer(player));
+        }
+
+        return state.wasInvincible;
+    }
+
+    public static Boolean isAllowedInvinciblity(WorldGuardPlugin plugin, Player player) {
+        World world = player.getWorld();
+        FlagStateManager.PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+        Vector vec = new Vector(state.lastInvincibleX, state.lastInvincibleY, state.lastInvincibleZ);
+
+        StateFlag.State regionState = plugin.getGlobalRegionManager().get(world).
+                getApplicableRegions(vec).getFlag(DefaultFlag.INVINCIBILITY, plugin.wrapPlayer(player));
+        if (regionState == StateFlag.State.ALLOW) {
+            return Boolean.TRUE;
+        } else if (regionState == StateFlag.State.DENY) {
+            return Boolean.FALSE;
+        } else {
+            return null;
+        }
+    }
+}

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

@@ -23,16 +23,18 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.lang.reflect.*;
+import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.plugin.Plugin;
+
 import com.sk89q.worldguard.protection.GlobalRegionManager;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.Flag;
@@ -120,11 +122,12 @@ public class ReportWriter {
         Class<? extends ConfigurationManager> cls = config.getClass();
         for (Field field : cls.getFields()) {
             try {
+                if (field.getName().equalsIgnoreCase("CONFIG_HEADER")) continue;
                 Object val = field.get(config);
                 configLog.put(field.getName(), val);
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
-            } catch (IllegalAccessException e) {
+            } catch (IllegalAccessException ignore) {
             }
         }
         
@@ -163,7 +166,7 @@ public class ReportWriter {
     }
     
     private void appendPluginInformation(Plugin[] plugins) {
-        appendHeader("Plugins");
+        appendHeader("Plugins (" + plugins.length + ")");
         
         LogListBlock log = new LogListBlock();
         
@@ -202,7 +205,7 @@ public class ReportWriter {
             LogListBlock infoLog = worldLog.putChild("Information");
             LogListBlock entitiesLog = worldLog.putChild("Entities");
             
-            infoLog.put("ID", world.getId());
+            infoLog.put("Seed", world.getSeed());
             infoLog.put("Environment", world.getEnvironment().toString());
             infoLog.put("Player count", world.getPlayers().size());
             infoLog.put("Entity count", world.getEntities().size());
@@ -271,7 +274,7 @@ public class ReportWriter {
                     configLog.put(field.getName(), String.valueOf(val));
                 } catch (IllegalArgumentException e) {
                     e.printStackTrace();
-                } catch (IllegalAccessException e) {
+                } catch (IllegalAccessException ignore) {
                 }
             }
             
@@ -321,7 +324,7 @@ public class ReportWriter {
             if (writer != null) {
                 try {
                     writer.close();
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                 }
             }
         }
@@ -331,5 +334,4 @@ public class ReportWriter {
     public String toString() {
         return output.toString();
     }
-    
 }

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

@@ -19,19 +19,21 @@
 
 package com.sk89q.worldguard.bukkit;
 
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.isBlockWater;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.setBlockToWater;
+
 import org.bukkit.World;
 
 public class SpongeUtil {
 
     /**
      * Remove water around a sponge.
-     * 
-     * @param plugin 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
+     *
+     * @param plugin The plugin instace
+     * @param world The world the sponge isin
+     * @param ox The x coordinate of the 'sponge' block
+     * @param oy The y coordinate of the 'sponge' block
+     * @param oz The z coordinate of the 'sponge' block
      */
     public static void clearSpongeWater(WorldGuardPlugin plugin, World world, int ox, int oy, int oz) {
         ConfigurationManager cfg = plugin.getGlobalStateManager();
@@ -51,11 +53,11 @@ public class SpongeUtil {
     /**
      * Add water around a sponge.
      * 
-     * @param plugin 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
+     * @param plugin The plugin instance
+     * @param world The world the sponge is located in
+     * @param ox The x coordinate of the 'sponge' block
+     * @param oy The y coordinate of the 'sponge' block
+     * @param oz The z coordinate of the 'sponge' block
      */
     public static void addSpongeWater(WorldGuardPlugin plugin, World world, int ox, int oy, int oz) {
         ConfigurationManager cfg = plugin.getGlobalStateManager();

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

@@ -0,0 +1,73 @@
+// $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.Bukkit;
+import org.bukkit.World;
+
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+/**
+ * Helper class to get a reference to WorldGuard and its components.
+ */
+public class WGBukkit {
+    private static WorldGuardPlugin cachedPlugin = null;
+
+    private WGBukkit() {
+    }
+
+    /**
+     * Get the WorldGuard plugin. If WorldGuard isn't loaded yet, then this will
+     * return null.
+     * <p>
+     * If you are depending on WorldGuard in your plugin, you should place
+     * <code>softdepend: [WorldGuard]</code> or <code>depend: [WorldGuard]</code>
+     * in your plugin.yml so that this won't return null for you.
+     *
+     * @return the WorldGuard plugin or null
+     */
+    public static WorldGuardPlugin getPlugin() {
+        if (cachedPlugin == null) {
+            cachedPlugin = (WorldGuardPlugin) Bukkit.getServer().getPluginManager().getPlugin("WorldGuard");
+        }
+        return cachedPlugin;
+    }
+
+    /**
+     * Set cache to null for reload WorldGuardPlugin
+     */
+    public static void cleanCache() {
+        cachedPlugin = null;
+    }
+
+    /**
+     * Returns the region manager for a given world. May return null if WorldGuard
+     * is not loaded or region protection is not enabled for the given world.
+     *
+     * @param world world
+     * @return a region manager or null
+     */
+    public static RegionManager getRegionManager(World world) {
+        if (getPlugin() == null) {
+            return null;
+        }
+        return cachedPlugin.getRegionManager(world);
+    }
+
+}

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

@@ -19,6 +19,24 @@
 
 package com.sk89q.worldguard.bukkit;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffectType;
+
+import com.sk89q.util.yaml.YAMLFormat;
+import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldguard.blacklist.Blacklist;
 import com.sk89q.worldguard.blacklist.BlacklistLogger;
 import com.sk89q.worldguard.blacklist.loggers.ConsoleLoggerHandler;
@@ -26,18 +44,6 @@ import com.sk89q.worldguard.blacklist.loggers.DatabaseLoggerHandler;
 import com.sk89q.worldguard.blacklist.loggers.FileLoggerHandler;
 import com.sk89q.worldguard.chest.ChestProtection;
 import com.sk89q.worldguard.chest.SignChestProtection;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.block.Block;
-import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.Player;
-import org.bukkit.util.config.Configuration;
 
 /**
  * Holds the configuration for individual worlds.
@@ -48,66 +54,66 @@ import org.bukkit.util.config.Configuration;
 public class WorldConfiguration {
 
     public static final String CONFIG_HEADER = "#\r\n" +
-            "# WorldGuard's configuration file.\r\n" +
+            "# WorldGuard's world configuration file\r\n" +
             "#\r\n" +
-            "# This is the a per-world configuration file. It only affects one\r\n" +
-            "# corresponding world.\r\n" +
+            "# This is a world configuration file. Anything placed into here will only\r\n" +
+            "# affect this world. If you don't put anything in this file, then the\r\n" +
+            "# settings will be inherited from the main configuration file.\r\n" +
             "#\r\n" +
-            "# About editing this file:\r\n" +
-            "# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If\r\n" +
-            "#   you use an editor like Notepad++ (recommended for Windows users), you\r\n" +
-            "#   must configure it to \"replace tabs with spaces.\" In Notepad++, this can\r\n" +
-            "#   be changed in Settings > Preferences > Language Menu.\r\n" +
-            "# - Don't get rid of the indents. They are indented so some entries are\r\n" +
-            "#   in categories (like \"enforce-single-session\" is in the \"protection\"\r\n" +
-            "#   category.\r\n" +
-            "# - If you want to check the format of this file before putting it\r\n" +
-            "#   into WorldGuard, paste it into http://yaml-online-parser.appspot.com/\r\n" +
-            "#   and see if it gives \"ERROR:\".\r\n" +
-            "# - Lines starting with # are comments and so they are ignored.\r\n" +
+            "# If you see {} below, that means that there are NO entries in this file.\r\n" +
+            "# Remove the {} and add your own entries.\r\n" +
             "#\r\n";
 
-    private static final Logger logger = Logger
-            .getLogger("Minecraft.WorldGuard");
-
     private WorldGuardPlugin plugin;
 
     private String worldName;
-    private Configuration parentConfig;
-    private Configuration config;
-    private File configFile;
+    private YAMLProcessor parentConfig;
+    private YAMLProcessor config;
     private File blacklistFile;
 
     private Blacklist blacklist;
     private ChestProtection chestProtection = new SignChestProtection();
 
     /* Configuration data start */
+    public boolean summaryOnStart;
     public boolean opPermissions;
     public boolean fireSpreadDisableToggle;
-    public boolean enforceOneSession;
     public boolean itemDurability;
-    public boolean classicWater;
     public boolean simulateSponge;
     public int spongeRadius;
+    public boolean disableExpDrops;
+    public Set<PotionEffectType> blockPotions;
+    public boolean blockPotionsAlways;
     public boolean pumpkinScuba;
     public boolean redstoneSponges;
     public boolean noPhysicsGravel;
     public boolean noPhysicsSand;
+    public boolean ropeLadders;
     public boolean allowPortalAnywhere;
     public Set<Integer> preventWaterDamage;
-    public boolean blockTNT;
     public boolean blockLighter;
     public boolean disableFireSpread;
     public Set<Integer> disableFireSpreadBlocks;
     public boolean preventLavaFire;
     public Set<Integer> allowedLavaSpreadOver;
+    public boolean blockTNTExplosions;
+    public boolean blockTNTBlockDamage;
     public boolean blockCreeperExplosions;
     public boolean blockCreeperBlockDamage;
-    public int loginProtection;
-    public int spawnProtection;
-    public boolean kickOnDeath;
-    public boolean exactRespawn;
-    public boolean teleportToHome;
+    public boolean blockWitherExplosions;
+    public boolean blockWitherBlockDamage;
+    public boolean blockWitherSkullExplosions;
+    public boolean blockWitherSkullBlockDamage;
+    public boolean blockEnderDragonBlockDamage;
+    public boolean blockEnderDragonPortalCreation;
+    public boolean blockFireballExplosions;
+    public boolean blockFireballBlockDamage;
+    public boolean blockOtherExplosions;
+    public boolean blockEntityPaintingDestroy;
+    public boolean blockEntityItemFrameDestroy;
+    public boolean blockPluginSpawning;
+    public boolean blockGroundSlimes;
+    public boolean blockZombieDoorDestruction;
     public boolean disableContactDamage;
     public boolean disableFallDamage;
     public boolean disableLavaDamage;
@@ -122,16 +128,17 @@ public class WorldConfiguration {
     public boolean disableMobDamage;
     public boolean useRegions;
     public boolean highFreqFlags;
-    public int regionWand = 287;
-    public Set<CreatureType> blockCreatureSpawn;
-    public boolean useiConomy;
-    public boolean buyOnClaim;
-    public double buyOnClaimPrice;
+    public int regionWand;
+    public Set<EntityType> blockCreatureSpawn;
+    // public boolean useiConomy;
+    // public boolean buyOnClaim;
+    // public double buyOnClaimPrice;
     public int maxClaimVolume;
     public boolean claimOnlyInsideExistingRegions;
     public int maxRegionCountPerPlayer;
     public boolean antiWolfDumbness;
     public boolean signChestProtection;
+    public boolean disableSignChestProtectionCheck;
     public boolean removeInfiniteStacks;
     public boolean disableCreatureCropTrampling;
     public boolean disablePlayerCropTrampling;
@@ -143,106 +150,190 @@ public class WorldConfiguration {
     public boolean alwaysThundering;
     public boolean disablePigZap;
     public boolean disableCreeperPower;
+    public boolean disableHealthRegain;
+    public boolean disableMushroomSpread;
+    public boolean disableIceMelting;
+    public boolean disableSnowMelting;
+    public boolean disableSnowFormation;
+    public boolean disableIceFormation;
+    public boolean disableLeafDecay;
+    public boolean disableGrassGrowth;
+    public boolean disableMyceliumSpread;
+    public boolean disableVineGrowth;
+    public boolean disableEndermanGriefing;
+    public boolean regionInvinciblityRemovesMobs;
+    public boolean disableDeathMessages;
+    public boolean disableObsidianGenerators;
+
+    private Map<String, Integer> maxRegionCounts;
 
     /* Configuration data end */
 
     /**
      * Construct the object.
      *
-     * @param plugin
-     * @param worldName
+     * @param plugin The WorldGuardPlugin instance
+     * @param worldName The world name that this WorldConfiguration is for.
+     * @param parentConfig The parent configuration to read defaults from
      */
-    public WorldConfiguration(WorldGuardPlugin plugin, String worldName) {
+    public WorldConfiguration(WorldGuardPlugin plugin, String worldName, YAMLProcessor parentConfig) {
         File baseFolder = new File(plugin.getDataFolder(), "worlds/" + worldName);
-        configFile = new File(baseFolder, "config.yml");
+        File configFile = new File(baseFolder, "config.yml");
         blacklistFile = new File(baseFolder, "blacklist.txt");
 
         this.plugin = plugin;
         this.worldName = worldName;
-        this.parentConfig = plugin.getConfiguration();
+        this.parentConfig = parentConfig;
 
-        WorldGuardPlugin.createDefaultConfiguration(configFile, "config_world.yml");
-        WorldGuardPlugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
+        plugin.createDefaultConfiguration(configFile, "config_world.yml");
+        plugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
 
-        config = new Configuration(this.configFile);
+        config = new YAMLProcessor(configFile, true, YAMLFormat.EXTENDED);
         loadConfiguration();
 
-        logger.info("WorldGuard: Loaded configuration for world '" + worldName + '"');
+        if (summaryOnStart) {
+            plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
+        }
     }
 
     private boolean getBoolean(String node, boolean def) {
+        boolean val = parentConfig.getBoolean(node, def);
+
         if (config.getProperty(node) != null) {
             return config.getBoolean(node, def);
         } else {
-            return parentConfig.getBoolean(node, def);
+            return val;
         }
     }
 
     private String getString(String node, String def) {
+        String val = parentConfig.getString(node, def);
+
         if (config.getProperty(node) != null) {
             return config.getString(node, def);
         } else {
-            return parentConfig.getString(node, def);
+            return val;
         }
     }
 
     private int getInt(String node, int def) {
+        int val = parentConfig.getInt(node, def);
+
         if (config.getProperty(node) != null) {
             return config.getInt(node, def);
         } else {
-            return parentConfig.getInt(node, def);
+            return val;
         }
     }
 
+    @SuppressWarnings("unused")
     private double getDouble(String node, double def) {
+        double val = parentConfig.getDouble(node, def);
+
         if (config.getProperty(node) != null) {
             return config.getDouble(node, def);
         } else {
-            return parentConfig.getDouble(node, def);
+            return val;
         }
     }
 
     private List<Integer> getIntList(String node, List<Integer> def) {
-        if (config.getProperty(node) != null) {
-            return config.getIntList(node, def);
-        } else {
-            return parentConfig.getIntList(node, def);
+        List<Integer> res = parentConfig.getIntList(node, def);
+
+        if (res == null || res.size() == 0) {
+            parentConfig.setProperty(node, new ArrayList<Integer>());
         }
+
+        if (config.getProperty(node) != null) {
+            res = config.getIntList(node, def);
+        }
+
+        return res;
     }
 
     private List<String> getStringList(String node, List<String> def) {
-        if (config.getProperty(node) != null) {
-            return config.getStringList(node, def);
-        } else {
-            return parentConfig.getStringList(node, def);
+        List<String> res = parentConfig.getStringList(node, def);
+
+        if (res == null || res.size() == 0) {
+            parentConfig.setProperty(node, new ArrayList<String>());
         }
+
+        if (config.getProperty(node) != null) {
+            res = config.getStringList(node, def);
+        }
+
+        return res;
+    }
+
+    private List<String> getKeys(String node) {
+        List<String> res = parentConfig.getKeys(node);
+
+        if (res == null || res.size() == 0) {
+            res = config.getKeys(node);
+        }
+        if (res == null) {
+            res = new ArrayList<String>();
+        }
+
+        return res;
+    }
+
+    private Object getProperty(String node) {
+        Object res = parentConfig.getProperty(node);
+
+        if (config.getProperty(node) != null) {
+            res = config.getProperty(node);
+        }
+
+        return res;
     }
 
     /**
      * Load the configuration.
      */
     private void loadConfiguration() {
-        config.load();
+        try {
+            config.load();
+        } catch (IOException e) {
+            plugin.getLogger().severe("Error reading configuration for world " + worldName + ": ");
+            e.printStackTrace();
+        }
 
+        summaryOnStart = getBoolean("summary-on-start", true);
         opPermissions = getBoolean("op-permissions", true);
 
-        enforceOneSession = getBoolean("protection.enforce-single-session", true);
         itemDurability = getBoolean("protection.item-durability", true);
         removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
+        disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);
+        disableObsidianGenerators = getBoolean("protection.disable-obsidian-generators", false);
+
+        blockPotions = new HashSet<PotionEffectType>();
+        for (String potionName : getStringList("gameplay.block-potions", null)) {
+            PotionEffectType effect = PotionEffectType.getByName(potionName);
+
+            if (effect == null) {
+                plugin.getLogger().warning("Unknown potion effect type '" + potionName + "'");
+            } else {
+                blockPotions.add(effect);
+            }
+        }
+        blockPotionsAlways = getBoolean("gameplay.block-potions-overly-reliably", false);
 
-        classicWater = getBoolean("simulation.classic-water", false);
         simulateSponge = getBoolean("simulation.sponge.enable", true);
         spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
         redstoneSponges = getBoolean("simulation.sponge.redstone", false);
 
-        pumpkinScuba = getBoolean("pumpkin-scuba", false);
+        pumpkinScuba = getBoolean("default.pumpkin-scuba", false);
+        disableHealthRegain = getBoolean("default.disable-health-regain", false);
 
         noPhysicsGravel = getBoolean("physics.no-physics-gravel", false);
         noPhysicsSand = getBoolean("physics.no-physics-sand", false);
+        ropeLadders = getBoolean("physics.vine-like-rope-ladders", false);
         allowPortalAnywhere = getBoolean("physics.allow-portal-anywhere", false);
         preventWaterDamage = new HashSet<Integer>(getIntList("physics.disable-water-damage-blocks", null));
 
-        blockTNT = getBoolean("ignition.block-tnt", false);
+        blockTNTExplosions = getBoolean("ignition.block-tnt", false);
+        blockTNTBlockDamage = getBoolean("ignition.block-tnt-block-damage", false);
         blockLighter = getBoolean("ignition.block-lighter", false);
 
         preventLavaFire = getBoolean("fire.disable-lava-fire-spread", true);
@@ -252,13 +343,22 @@ public class WorldConfiguration {
 
         blockCreeperExplosions = getBoolean("mobs.block-creeper-explosions", false);
         blockCreeperBlockDamage = getBoolean("mobs.block-creeper-block-damage", false);
+        blockWitherExplosions = getBoolean("mobs.block-wither-explosions", false);
+        blockWitherBlockDamage = getBoolean("mobs.block-wither-block-damage", false);
+        blockWitherSkullExplosions = getBoolean("mobs.block-wither-skull-explosions", false);
+        blockWitherSkullBlockDamage = getBoolean("mobs.block-wither-skull-block-damage", false);
+        blockEnderDragonBlockDamage = getBoolean("mobs.block-enderdragon-block-damage", false);
+        blockEnderDragonPortalCreation = getBoolean("mobs.block-enderdragon-portal-creation", false);
+        blockFireballExplosions = getBoolean("mobs.block-fireball-explosions", false);
+        blockFireballBlockDamage = getBoolean("mobs.block-fireball-block-damage", false);
         antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
-
-        loginProtection = getInt("spawn.login-protection", 3);
-        spawnProtection = getInt("spawn.spawn-protection", 0);
-        kickOnDeath = getBoolean("spawn.kick-on-death", false);
-        exactRespawn = getBoolean("spawn.exact-respawn", false);
-        teleportToHome = getBoolean("spawn.teleport-to-home-on-death", false);
+        disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
+        blockEntityPaintingDestroy = getBoolean("mobs.block-painting-destroy", false);
+        blockEntityItemFrameDestroy = getBoolean("mobs.block-item-frame-destroy", false);
+        blockPluginSpawning = getBoolean("mobs.block-plugin-spawning", true);
+        blockGroundSlimes = getBoolean("mobs.block-above-ground-slimes", false);
+        blockOtherExplosions = getBoolean("mobs.block-other-explosions", false);
+        blockZombieDoorDestruction = getBoolean("mobs.block-zombie-door-destruction", false);
 
         disableFallDamage = getBoolean("player-damage.disable-fall-damage", false);
         disableLavaDamage = getBoolean("player-damage.disable-lava-damage", false);
@@ -272,8 +372,10 @@ public class WorldConfiguration {
         teleportOnVoid = getBoolean("player-damage.teleport-on-void-falling", false);
         disableExplosionDamage = getBoolean("player-damage.disable-explosion-damage", false);
         disableMobDamage = getBoolean("player-damage.disable-mob-damage", false);
+        disableDeathMessages = getBoolean("player-damage.disable-death-messages", false);
 
         signChestProtection = getBoolean("chest-protection.enable", false);
+        disableSignChestProtectionCheck = getBoolean("chest-protection.disable-off-check", false);
 
         disableCreatureCropTrampling = getBoolean("crops.disable-creature-trampling", false);
         disablePlayerCropTrampling = getBoolean("crops.disable-player-trampling", false);
@@ -287,23 +389,48 @@ public class WorldConfiguration {
         alwaysRaining = getBoolean("weather.always-raining", false);
         alwaysThundering = getBoolean("weather.always-thundering", false);
 
+        disableMushroomSpread = getBoolean("dynamics.disable-mushroom-spread", false);
+        disableIceMelting = getBoolean("dynamics.disable-ice-melting", false);
+        disableSnowMelting = getBoolean("dynamics.disable-snow-melting", false);
+        disableSnowFormation = getBoolean("dynamics.disable-snow-formation", false);
+        disableIceFormation = getBoolean("dynamics.disable-ice-formation", false);
+        disableLeafDecay = getBoolean("dynamics.disable-leaf-decay", false);
+        disableGrassGrowth = getBoolean("dynamics.disable-grass-growth", false);
+        disableMyceliumSpread = getBoolean("dynamics.disable-mycelium-spread", false);
+        disableVineGrowth = getBoolean("dynamics.disable-vine-growth", false);
+
         useRegions = getBoolean("regions.enable", true);
+        regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
         highFreqFlags = getBoolean("regions.high-frequency-flags", false);
-        regionWand = getInt("regions.wand", 287);
+        regionWand = getInt("regions.wand", 334);
         maxClaimVolume = getInt("regions.max-claim-volume", 30000);
         claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);
-        maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player", 7);
 
-        useiConomy = getBoolean("iconomy.enable", false);
-        buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
-        buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);
+        maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player.default", 7);
+        maxRegionCounts = new HashMap<String, Integer>();
+        maxRegionCounts.put(null, maxRegionCountPerPlayer);
 
-        blockCreatureSpawn = new HashSet<CreatureType>();
+        for (String key : getKeys("regions.max-region-count-per-player")) {
+            if (!key.equalsIgnoreCase("default")) {
+                Object val = getProperty("regions.max-region-count-per-player." + key);
+                if (val != null && val instanceof Number) {
+                    maxRegionCounts.put(key, ((Number) val).intValue());
+                }
+            }
+        }
+
+        // useiConomy = getBoolean("iconomy.enable", false);
+        // buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
+        // buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);
+
+        blockCreatureSpawn = new HashSet<EntityType>();
         for (String creatureName : getStringList("mobs.block-creature-spawn", null)) {
-            CreatureType creature = CreatureType.fromName(creatureName);
+            EntityType creature = EntityType.fromName(creatureName);
 
             if (creature == null) {
-                logger.warning("WorldGuard: Unknown mob type '" + creatureName + "'");
+                plugin.getLogger().warning("Unknown mob type '" + creatureName + "'");
+            } else if (!creature.isAlive()) {
+                plugin.getLogger().warning("Entity type '" + creatureName + "' is not a creature");
             } else {
                 blockCreatureSpawn.add(creature);
             }
@@ -343,61 +470,61 @@ public class WorldConfiguration {
                 this.blacklist = null;
             } else {
                 this.blacklist = blist;
-                logger.log(Level.INFO, "WorldGuard: Blacklist loaded.");
+                if (summaryOnStart) {
+                    plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
+                }
 
                 BlacklistLogger blacklistLogger = blist.getLogger();
 
                 if (logDatabase) {
-                    blacklistLogger.addHandler(new DatabaseLoggerHandler(dsn, user, pass, table, worldName));
+                    blacklistLogger.addHandler(new DatabaseLoggerHandler(dsn, user, pass, table, worldName, plugin.getLogger()));
                 }
 
                 if (logConsole) {
-                    blacklistLogger.addHandler(new ConsoleLoggerHandler(worldName));
+                    blacklistLogger.addHandler(new ConsoleLoggerHandler(worldName, plugin.getLogger()));
                 }
 
                 if (logFile) {
                     FileLoggerHandler handler =
-                            new FileLoggerHandler(logFilePattern, logFileCacheSize, worldName);
+                            new FileLoggerHandler(logFilePattern, logFileCacheSize, worldName, plugin.getLogger());
                     blacklistLogger.addHandler(handler);
                 }
             }
         } catch (FileNotFoundException e) {
-            logger.log(Level.WARNING, "WorldGuard blacklist does not exist.");
+            plugin.getLogger().log(Level.WARNING, "WorldGuard blacklist does not exist.");
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Could not load WorldGuard blacklist: "
+            plugin.getLogger().log(Level.WARNING, "Could not load WorldGuard blacklist: "
                     + e.getMessage());
         }
 
         // Print an overview of settings
-        if (getBoolean("summary-on-start", true)) {
-            logger.log(Level.INFO, enforceOneSession
-                    ? "WorldGuard: (" + worldName + ") Single session is enforced."
-                    : "WorldGuard: (" + worldName + ") Single session is NOT ENFORCED.");
-            logger.log(Level.INFO, blockTNT
-                    ? "WorldGuard: (" + worldName + ") TNT ignition is blocked."
-                    : "WorldGuard: (" + worldName + ") TNT ignition is PERMITTED.");
-            logger.log(Level.INFO, blockLighter
-                    ? "WorldGuard: (" + worldName + ") Lighters are blocked."
-                    : "WorldGuard: (" + worldName + ") Lighters are PERMITTED.");
-            logger.log(Level.INFO, preventLavaFire
-                    ? "WorldGuard: (" + worldName + ") Lava fire is blocked."
-                    : "WorldGuard: (" + worldName + ") Lava fire is PERMITTED.");
+        if (summaryOnStart) {
+            plugin.getLogger().log(Level.INFO, blockTNTExplosions
+                    ? "(" + worldName + ") TNT ignition is blocked."
+                    : "(" + worldName + ") TNT ignition is PERMITTED.");
+            plugin.getLogger().log(Level.INFO, blockLighter
+                    ? "(" + worldName + ") Lighters are blocked."
+                    : "(" + worldName + ") Lighters are PERMITTED.");
+            plugin.getLogger().log(Level.INFO, preventLavaFire
+                    ? "(" + worldName + ") Lava fire is blocked."
+                    : "(" + worldName + ") Lava fire is PERMITTED.");
 
             if (disableFireSpread) {
-                logger.log(Level.INFO, "WorldGuard: (" + worldName + ") All fire spread is disabled.");
+                plugin.getLogger().log(Level.INFO, "(" + worldName + ") All fire spread is disabled.");
             } else {
                 if (disableFireSpreadBlocks.size() > 0) {
-                    logger.log(Level.INFO, "WorldGuard: (" + worldName
+                    plugin.getLogger().log(Level.INFO, "(" + worldName
                             + ") Fire spread is limited to "
                             + disableFireSpreadBlocks.size() + " block types.");
                 } else {
-                    logger.log(Level.INFO, "WorldGuard: (" + worldName
+                    plugin.getLogger().log(Level.INFO, "(" + worldName
                             + ") Fire spread is UNRESTRICTED.");
                 }
             }
         }
 
         config.setHeader(CONFIG_HEADER);
+
         config.save();
     }
 
@@ -408,7 +535,7 @@ public class WorldConfiguration {
     public String getWorldName() {
         return this.worldName;
     }
-    
+
     public boolean isChestProtected(Block block, Player player) {
         if (!signChestProtection) {
             return false;
@@ -419,14 +546,12 @@ public class WorldConfiguration {
         }
         return chestProtection.isProtected(block, player);
     }
-    
+
     public boolean isChestProtected(Block block) {
-        if (!signChestProtection) {
-            return false;
-        }
-        return chestProtection.isProtected(block, null);
+
+        return signChestProtection && chestProtection.isProtected(block, null);
     }
-    
+
     public boolean isChestProtectedPlacement(Block block, Player player) {
         if (!signChestProtection) {
             return false;
@@ -452,5 +577,18 @@ public class WorldConfiguration {
     public ChestProtection getChestProtection() {
         return chestProtection;
     }
-    
+
+    public int getMaxRegionCount(Player player) {
+        int max = -1;
+        for (String group : plugin.getGroups(player)) {
+            if (maxRegionCounts.containsKey(group)) {
+                int groupMax = maxRegionCounts.get(group);
+                if (max < groupMax) max = groupMax;
+            }
+        }
+        if (max <= -1) {
+            max = maxRegionCountPerPlayer;
+        }
+        return max;
+    }
 }

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

@@ -18,47 +18,64 @@
  */
 package com.sk89q.worldguard.bukkit;
 
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.block.Block;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.entity.Player;
 import org.bukkit.World;
-import org.bukkit.event.block.*;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockDispenseEvent;
+import org.bukkit.event.block.BlockExpEvent;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.block.BlockFormEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
 import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.BlockRedstoneEvent;
+import org.bukkit.event.block.BlockSpreadEvent;
+import org.bukkit.event.block.LeavesDecayEvent;
+import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.Potion;
+import org.bukkit.potion.PotionEffect;
+
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
-
-import java.util.logging.Logger;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
 
 /**
  * The listener for block events.
- * 
+ *
  * @author sk89q
  */
-public class WorldGuardBlockListener extends BlockListener {
-    /**
-     * Logger for messages.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+public class WorldGuardBlockListener implements Listener {
 
     private WorldGuardPlugin plugin;
 
     /**
      * Construct the object.
-     * 
-     * @param plugin
+     *
+     * @param plugin The plugin instance
      */
     public WorldGuardBlockListener(WorldGuardPlugin plugin) {
         this.plugin = plugin;
@@ -68,74 +85,40 @@ public class WorldGuardBlockListener extends BlockListener {
      * Register events.
      */
     public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
-
-        registerEvent("BLOCK_DAMAGE", Priority.High);
-        registerEvent("BLOCK_BREAK", Priority.High);
-        registerEvent("BLOCK_FROMTO", Priority.Normal);
-        registerEvent("BLOCK_IGNITE", Priority.High);
-        registerEvent("BLOCK_PHYSICS", Priority.Normal);
-        registerEvent("BLOCK_PLACE", Priority.High);
-        registerEvent("BLOCK_BURN", Priority.High);
-        registerEvent("SIGN_CHANGE", Priority.High);
-        registerEvent("REDSTONE_CHANGE", Priority.High);
-        registerEvent("SNOW_FORM", Priority.High);
-        registerEvent("LEAVES_DECAY", Priority.High);
-        registerEvent("BLOCK_FORM", Priority.High);
-        registerEvent("BLOCK_SPREAD", Priority.High);
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
-    /**
-     * Register an event, but not failing if the event is not implemented.
-     *
-     * @param typeName
-     * @param priority
-     */
-    private void registerEvent(String typeName, Priority priority) {
-        try {
-            Event.Type type = Event.Type.valueOf(typeName);
-            PluginManager pm = plugin.getServer().getPluginManager();
-            pm.registerEvent(type, this, priority, plugin);
-        } catch (IllegalArgumentException e) {
-            logger.info("WorldGuard: Unable to register missing event type " + typeName);
-        }
-    }
-    
     /**
      * Get the world configuration given a world.
-     * 
-     * @param world
-     * @return
+     *
+     * @param world The world to get the configuration for.
+     * @return The configuration for {@code world}
      */
     protected WorldConfiguration getWorldConfig(World world) {
         return plugin.getGlobalStateManager().get(world);
     }
-    
+
     /**
      * Get the world configuration given a player.
-     * 
-     * @param player
-     * @return
+     *
+     * @param player The player to get the wold from
+     * @return The {@link WorldConfiguration} for the player's world
      */
     protected WorldConfiguration getWorldConfig(Player player) {
-        return plugin.getGlobalStateManager().get(player.getWorld());
+        return getWorldConfig(player.getWorld());
     }
-    
-    /**
+
+    /*
      * Called when a block is damaged.
      */
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockDamage(BlockDamageEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
         Player player = event.getPlayer();
         Block blockDamaged = event.getBlock();
 
         // Cake are damaged and not broken when they are eaten, so we must
         // handle them a bit separately
-        if (blockDamaged.getType() == Material.CAKE_BLOCK) {
+        if (blockDamaged.getTypeId() == BlockID.CAKE_BLOCK) {
             if (!plugin.getGlobalRegionManager().canBuild(player, blockDamaged)) {
                 player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
                 event.setCancelled(true);
@@ -143,16 +126,12 @@ public class WorldGuardBlockListener extends BlockListener {
             }
         }
     }
-    
-    /**
+
+    /*
      * Called when a block is broken.
      */
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
         Player player = event.getPlayer();
         WorldConfiguration wcfg = getWorldConfig(player);
 
@@ -161,12 +140,13 @@ public class WorldGuardBlockListener extends BlockListener {
             if (held.getTypeId() > 0
                     && !(ItemType.usesDamageValue(held.getTypeId())
                     || BlockType.usesData(held.getTypeId()))) {
-                held.setDurability((short) -1);
+                held.setDurability(Material.getMaterial(held.getTypeId()).getMaxDurability());
                 player.setItemInHand(held);
             }
         }
 
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlock())) {
+        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlock())
+         || !plugin.getGlobalRegionManager().canConstruct(player, event.getBlock())) {
             player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
             event.setCancelled(true);
             return;
@@ -189,7 +169,7 @@ public class WorldGuardBlockListener extends BlockListener {
                 return;
             }
         }
-        
+
         if (wcfg.isChestProtected(event.getBlock(), player)) {
             player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
             event.setCancelled(true);
@@ -197,21 +177,18 @@ public class WorldGuardBlockListener extends BlockListener {
         }
     }
 
-    /**
+    /*
      * Called when fluids flow.
      */
-    @Override
+    @EventHandler(ignoreCancelled = true)
     public void onBlockFromTo(BlockFromToEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
         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;
+        boolean isAir = blockFrom.getTypeId() == 0;
 
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
@@ -255,8 +232,8 @@ public class WorldGuardBlockListener extends BlockListener {
         // If so and the target block is protected, cancel the event
         if (wcfg.preventWaterDamage.size() > 0) {
             int targetId = blockTo.getTypeId();
-            
-            if ((blockFrom.getTypeId() == 0 || isWater) && 
+
+            if ((isAir || isWater) &&
                     wcfg.preventWaterDamage.contains(targetId)) {
                 event.setCancelled(true);
                 return;
@@ -265,7 +242,7 @@ public class WorldGuardBlockListener extends BlockListener {
 
         if (wcfg.allowedLavaSpreadOver.size() > 0 && isLava) {
             int targetId = blockTo.getRelative(0, -1, 0).getTypeId();
-            
+
             if (!wcfg.allowedLavaSpreadOver.contains(targetId)) {
                 event.setCancelled(true);
                 return;
@@ -285,17 +262,19 @@ public class WorldGuardBlockListener extends BlockListener {
             event.setCancelled(true);
             return;
         }
-    }
 
-    /**
-     * Called when a block gets ignited.
-     */
-    @Override
-    public void onBlockIgnite(BlockIgniteEvent event) {
-        if (event.isCancelled()) {
+        if (wcfg.disableObsidianGenerators && (isAir || isLava)
+                && blockTo.getTypeId() == 55) {
+            blockTo.setTypeId(0);
             return;
         }
+    }
 
+    /*
+     * Called when a block gets ignited.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockIgnite(BlockIgniteEvent event) {
         IgniteCause cause = event.getCause();
         Block block = event.getBlock();
         World world = block.getWorld();
@@ -307,7 +286,6 @@ public class WorldGuardBlockListener extends BlockListener {
             event.setCancelled(true);
             return;
         }
-
         boolean isFireSpread = cause == IgniteCause.SPREAD;
 
         if (wcfg.preventLightningFire && cause == IgniteCause.LIGHTNING) {
@@ -325,7 +303,7 @@ public class WorldGuardBlockListener extends BlockListener {
             return;
         }
 
-        if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL
+        if (wcfg.blockLighter && (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL)
                 && event.getPlayer() != null
                 && !plugin.hasPermission(event.getPlayer(), "worldguard.override.lighter")) {
             event.setCancelled(true);
@@ -361,12 +339,12 @@ public class WorldGuardBlockListener extends BlockListener {
             if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
                 LocalPlayer localPlayer = plugin.wrapPlayer(player);
 
-                if (cause == IgniteCause.FLINT_AND_STEEL) {
+                if (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL) {
                     if (!set.canBuild(localPlayer)) {
                         event.setCancelled(true);
                         return;
                     }
-                    if (!set.allows(DefaultFlag.LIGHTER)
+                    if (!set.allows(DefaultFlag.LIGHTER, localPlayer)
                             && !plugin.hasPermission(player, "worldguard.override.lighter")) {
                         event.setCancelled(true);
                         return;
@@ -385,20 +363,27 @@ public class WorldGuardBlockListener extends BlockListener {
                 event.setCancelled(true);
                 return;
             }
-        }
 
+            if (cause == IgniteCause.FIREBALL && event.getPlayer() == null) {
+                // wtf bukkit, FIREBALL is supposed to be reserved to players
+                if (!set.allows(DefaultFlag.GHAST_FIREBALL)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (cause == IgniteCause.LIGHTNING && !set.allows(DefaultFlag.LIGHTNING)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
     }
 
-    /**
+    /*
      * Called when a block is destroyed from burning.
      */
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockBurn(BlockBurnEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
 
@@ -413,7 +398,9 @@ public class WorldGuardBlockListener extends BlockListener {
         }
 
         if (wcfg.fireSpreadDisableToggle) {
+            Block block = event.getBlock();
             event.setCancelled(true);
+            checkAndDestroyAround(block.getWorld(), block.getX(), block.getY(), block.getZ(), BlockID.FIRE);
             return;
         }
 
@@ -422,6 +409,7 @@ public class WorldGuardBlockListener extends BlockListener {
 
             if (wcfg.disableFireSpreadBlocks.contains(block.getTypeId())) {
                 event.setCancelled(true);
+                checkAndDestroyAround(block.getWorld(), block.getX(), block.getY(), block.getZ(), BlockID.FIRE);
                 return;
             }
         }
@@ -430,14 +418,18 @@ public class WorldGuardBlockListener extends BlockListener {
             event.setCancelled(true);
             return;
         }
-        
+
         if (wcfg.useRegions) {
             Block block = event.getBlock();
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
             Vector pt = toVector(block);
             RegionManager mgr = plugin.getGlobalRegionManager().get(block.getWorld());
             ApplicableRegionSet set = mgr.getApplicableRegions(pt);
 
             if (!set.allows(DefaultFlag.FIRE_SPREAD)) {
+                checkAndDestroyAround(block.getWorld(), x, y, z, BlockID.FIRE);
                 event.setCancelled(true);
                 return;
             }
@@ -445,16 +437,26 @@ public class WorldGuardBlockListener extends BlockListener {
         }
     }
 
-    /**
+    private 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);
+    }
+
+    private 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);
+        }
+    }
+
+    /*
      * Called when block physics occurs.
      */
-    @Override
+    @EventHandler(ignoreCancelled = true)
     public void onBlockPhysics(BlockPhysicsEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
 
@@ -479,18 +481,20 @@ public class WorldGuardBlockListener extends BlockListener {
             event.setCancelled(true);
             return;
         }
+
+        if (wcfg.ropeLadders && event.getBlock().getType() == Material.LADDER) {
+            if (event.getBlock().getRelative(0, 1, 0).getType() == Material.LADDER) {
+                event.setCancelled(true);
+                return;
+            }
+        }
     }
 
-    /**
+    /*
      * Called when a player places a block.
      */
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockPlace(BlockPlaceEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
         Block blockPlaced = event.getBlock();
         Player player = event.getPlayer();
         World world = blockPlaced.getWorld();
@@ -499,7 +503,9 @@ public class WorldGuardBlockListener extends BlockListener {
         WorldConfiguration wcfg = cfg.get(world);
 
         if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, blockPlaced.getLocation())) {
+            final Location location = blockPlaced.getLocation();
+            if (!plugin.getGlobalRegionManager().canBuild(player, location)
+             || !plugin.getGlobalRegionManager().canConstruct(player, location)) {
                 player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
                 event.setCancelled(true);
                 return;
@@ -514,8 +520,8 @@ public class WorldGuardBlockListener extends BlockListener {
                 return;
             }
         }
-        
-        if (wcfg.signChestProtection && wcfg.getChestProtection().isChest(blockPlaced.getType())) {
+
+        if (wcfg.signChestProtection && wcfg.getChestProtection().isChest(blockPlaced.getTypeId())) {
             if (wcfg.isAdjacentChestProtected(event.getBlock(), player)) {
                 player.sendMessage(ChatColor.DARK_RED + "This spot is for a chest that you don't have permission for.");
                 event.setCancelled(true);
@@ -536,12 +542,11 @@ public class WorldGuardBlockListener extends BlockListener {
         }
     }
 
-    /**
+    /*
      * Called when redstone changes.
      */
-    @Override
+    @EventHandler(priority = EventPriority.HIGH)
     public void onBlockRedstoneChange(BlockRedstoneEvent event) {
-
         Block blockTo = event.getBlock();
         World world = blockTo.getWorld();
 
@@ -572,29 +577,28 @@ public class WorldGuardBlockListener extends BlockListener {
         }
     }
 
-    /**
+    /*
      * Called when a sign is changed.
      */
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onSignChange(SignChangeEvent event) {
-
         Player player = event.getPlayer();
         WorldConfiguration wcfg = getWorldConfig(player);
-        
+
         if (wcfg.signChestProtection) {
             if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
                 if (wcfg.isChestProtectedPlacement(event.getBlock(), player)) {
                     player.sendMessage(ChatColor.DARK_RED + "You do not own the adjacent chest.");
-                    dropSign(event.getBlock());
+                    event.getBlock().breakNaturally();
                     event.setCancelled(true);
                     return;
                 }
-                
-                if (event.getBlock().getType() != Material.SIGN_POST) {
+
+                if (event.getBlock().getTypeId() != BlockID.SIGN_POST) {
                     player.sendMessage(ChatColor.RED
                             + "The [Lock] sign must be a sign post, not a wall sign.");
 
-                    dropSign(event.getBlock());
+                    event.getBlock().breakNaturally();
                     event.setCancelled(true);
                     return;
                 }
@@ -603,33 +607,33 @@ public class WorldGuardBlockListener extends BlockListener {
                     player.sendMessage(ChatColor.RED
                             + "The first owner line must be your name.");
 
-                    dropSign(event.getBlock());
+                    event.getBlock().breakNaturally();
                     event.setCancelled(true);
                     return;
                 }
-                
-                Material below = event.getBlock().getRelative(0, -1, 0).getType();
 
-                if (below == Material.TNT || below == Material.SAND
-                        || below == Material.GRAVEL || below == Material.SIGN_POST) {
+                int below = event.getBlock().getRelative(0, -1, 0).getTypeId();
+
+                if (below == BlockID.TNT || below == BlockID.SAND
+                        || below == BlockID.GRAVEL || below == BlockID.SIGN_POST) {
                     player.sendMessage(ChatColor.RED
                             + "That is not a safe block that you're putting this sign on.");
 
-                    dropSign(event.getBlock());
+                    event.getBlock().breakNaturally();
                     event.setCancelled(true);
                     return;
                 }
-                
+
                 event.setLine(0, "[Lock]");
                 player.sendMessage(ChatColor.YELLOW
                         + "A chest or double chest above is now protected.");
             }
-        } else {
+        } else if (!wcfg.disableSignChestProtectionCheck) {
             if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
                 player.sendMessage(ChatColor.RED
                         + "WorldGuard's sign chest protection is disabled.");
-                
-                dropSign(event.getBlock());
+
+                event.getBlock().breakNaturally();
                 event.setCancelled(true);
                 return;
             }
@@ -641,68 +645,246 @@ public class WorldGuardBlockListener extends BlockListener {
             return;
         }
     }
-    
-    /**
-     * Called when snow is formed.
-     */
-    @Override
-    public void onSnowForm(SnowFormEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
 
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (!plugin.getGlobalRegionManager().allows(DefaultFlag.SNOW_FALL,
-                event.getBlock().getLocation())) {
-            event.setCancelled(true);
-        }
-    }
-
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onLeavesDecay(LeavesDecayEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
         ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
 
         if (cfg.activityHaltToggle) {
             event.setCancelled(true);
             return;
         }
 
-        if (!plugin.getGlobalRegionManager().allows(DefaultFlag.LEAF_DECAY, event.getBlock().getLocation())) {
+        if (wcfg.disableLeafDecay) {
             event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.LEAF_DECAY,
+                    event.getBlock().getLocation())) {
+                event.setCancelled(true);
+            }
         }
     }
 
-    /**
+    /*
      * Called when a block is formed based on world conditions.
      */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockForm(BlockFormEvent event) {
         ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
 
         if (cfg.activityHaltToggle) {
             event.setCancelled(true);
             return;
         }
+
+        int type = event.getNewState().getTypeId();
+
+        if (type == BlockID.ICE) {
+            if (wcfg.disableIceFormation) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.ICE_FORM, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (type == BlockID.SNOW) {
+            if (wcfg.disableSnowFormation) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.SNOW_FALL, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
     }
 
-    /**
+    /*
      * Called when a block spreads based on world conditions.
      */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockSpread(BlockSpreadEvent event) {
         ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
 
         if (cfg.activityHaltToggle) {
             event.setCancelled(true);
             return;
         }
+
+        int fromType = event.getSource().getTypeId();
+
+        if (fromType == BlockID.RED_MUSHROOM || fromType == BlockID.BROWN_MUSHROOM) {
+            if (wcfg.disableMushroomSpread) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.MUSHROOMS, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (fromType == BlockID.GRASS) {
+            if (wcfg.disableGrassGrowth) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.GRASS_SPREAD, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (fromType == BlockID.MYCELIUM) {
+            if (wcfg.disableMyceliumSpread) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.MYCELIUM_SPREAD, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (fromType == BlockID.VINE) {
+            if (wcfg.disableVineGrowth) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.VINE_GROWTH, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
     }
+
+    /*
+     * Called when a block fades.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockFade(BlockFadeEvent event) {
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        int type = event.getBlock().getTypeId();
+
+        if (type == BlockID.ICE) {
+            if (wcfg.disableIceMelting) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.ICE_MELT, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (type == BlockID.SNOW) {
+            if (wcfg.disableSnowMelting) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.SNOW_MELT, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a piston extends
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+            for (Block block : event.getBlocks()) {
+                if (!plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, block.getLocation())) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }
+
+    /*
+     * Called when a piston retracts
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (wcfg.useRegions && event.isSticky()) {
+            if (!(plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getRetractLocation()))
+                    || !(plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getBlock().getLocation()))) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /*
+     * Called when a block is damaged.
+     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onBlockDispense(BlockDispenseEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (wcfg.blockPotions.size() > 0) {
+            ItemStack item = event.getItem();
+            if (item.getType() == Material.POTION && !BukkitUtil.isWaterPotion(item)) {
+                Potion potion = Potion.fromDamage(BukkitUtil.getPotionEffectBits(item));
+                for (PotionEffect effect : potion.getEffects()) {
+                    if (potion.isSplash() && wcfg.blockPotions.contains(effect.getType())) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * Called when a block yields exp
+     */
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockExp(BlockExpEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getBlock().getLocation())) {
+            event.setExpToDrop(0);
+        }
+    }
+
 }

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

@@ -0,0 +1,75 @@
+/*
+ * WorldGuard
+ * Copyright (C) 2012 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.commandbook.InfoComponent;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+/**
+ * @author zml2008
+ */
+public class WorldGuardCommandBookListener implements Listener {
+    private final WorldGuardPlugin plugin;
+    
+    public WorldGuardCommandBookListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+    
+    @EventHandler
+    public void onPlayerWhois(InfoComponent.PlayerWhoisEvent event) {
+        if (event.getPlayer() instanceof Player) {
+            Player player = (Player) event.getPlayer();
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+            if (plugin.getGlobalStateManager().get(player.getWorld()).useRegions) {
+                ApplicableRegionSet regions = plugin.getGlobalRegionManager()
+                        .get(player.getWorld()).getApplicableRegions(player.getLocation());
+                
+                // Current regions
+                StringBuilder regionStr = new StringBuilder();
+                boolean first = true;
+                
+                for (ProtectedRegion region : regions) {
+                    if (!first) {
+                        regionStr.append(", ");
+                    }
+                    
+                    if (region.isOwner(localPlayer)) {
+                        regionStr.append("+");
+                    } else if (region.isMemberOnly(localPlayer)) {
+                        regionStr.append("-");
+                    }
+                    
+                    regionStr.append(region.getId());
+                    
+                    first = false;
+                }
+                
+                if (regions.size() > 0) {
+                    event.addWhoisInformation("Current Regions", regionStr);
+                }
+                event.addWhoisInformation("Can build", regions.canBuild(localPlayer));
+            }
+        }
+    }
+}

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

@@ -0,0 +1,211 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Hanging;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.Painting;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.hanging.HangingBreakByEntityEvent;
+import org.bukkit.event.hanging.HangingBreakEvent;
+import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause;
+import org.bukkit.event.hanging.HangingPlaceEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+import com.sk89q.worldedit.blocks.ItemID;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+
+/**
+ * Listener for painting related events.
+ *
+ * @author BangL <henno.rickowski@gmail.com>
+ */
+public class WorldGuardHangingListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardHangingListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onHangingingBreak(HangingBreakEvent event) {
+        Hanging hanging = event.getEntity();
+        World world = hanging.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (event instanceof HangingBreakByEntityEvent) {
+            HangingBreakByEntityEvent entityEvent = (HangingBreakByEntityEvent) event;
+            Entity removerEntity = entityEvent.getRemover();
+            if (removerEntity instanceof Projectile) {
+                Projectile projectile = (Projectile) removerEntity; 
+                removerEntity = projectile.getShooter() != null ? projectile.getShooter() : removerEntity; 
+            }
+
+            if (removerEntity instanceof Player) {
+                Player player = (Player) removerEntity;
+
+                if (wcfg.getBlacklist() != null) {
+                    if (hanging instanceof Painting
+                            && !wcfg.getBlacklist().check(
+                                new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                                        toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                        event.setCancelled(true);
+                        return;
+                    } else if (hanging instanceof ItemFrame
+                            && !wcfg.getBlacklist().check(
+                                new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                                        toVector(player.getLocation()), ItemID.ITEM_FRAME), false, false)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+
+                if (wcfg.useRegions) {
+                    if (!plugin.getGlobalRegionManager().canBuild(player, hanging.getLocation())) {
+                        player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            } else {
+                if (removerEntity instanceof Creeper) {
+                    if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                    if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.CREEPER_EXPLOSION, hanging.getLocation())) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+
+                if (hanging instanceof Painting
+                        && (wcfg.blockEntityPaintingDestroy
+                        || (wcfg.useRegions
+                        && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_PAINTING_DESTROY, hanging.getLocation())))) {
+                    event.setCancelled(true);
+                } else if (hanging instanceof ItemFrame
+                        && (wcfg.blockEntityItemFrameDestroy
+                        || (wcfg.useRegions
+                        && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, hanging.getLocation())))) {
+                    event.setCancelled(true);
+                }
+            }
+        } else {
+            // Explosions from mobs are not covered by HangingBreakByEntity
+            if (hanging instanceof Painting && wcfg.blockEntityPaintingDestroy
+                    && event.getCause() == RemoveCause.EXPLOSION) {
+                event.setCancelled(true);
+            } else if (hanging instanceof ItemFrame && wcfg.blockEntityItemFrameDestroy
+                    && event.getCause() == RemoveCause.EXPLOSION) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onHangingPlace(HangingPlaceEvent event) {
+        Block placedOn = event.getBlock();
+        Player player = event.getPlayer();
+        World world = placedOn.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.getBlacklist() != null) {
+
+            if (event.getEntity() instanceof Painting
+                    && !wcfg.getBlacklist().check(
+                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                                toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                event.setCancelled(true);
+                return;
+            } else if (event.getEntity() instanceof ItemFrame
+                    && !wcfg.getBlacklist().check(
+                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                                toVector(player.getLocation()), ItemID.ITEM_FRAME), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getRelative(event.getBlockFace()))) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityInteract(PlayerInteractEntityEvent event) {
+        Player player = event.getPlayer();
+        Entity entity = event.getRightClicked();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (wcfg.useRegions && (entity instanceof ItemFrame || entity instanceof Painting)) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, entity.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+
+//            if (entity instanceof ItemFrame
+//                    && ((!plugin.getGlobalRegionManager().allows(
+//                            DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, entity.getLocation())))) {
+//                event.setCancelled(true);
+//            } else if (entity instanceof Painting
+//                    && ((!plugin.getGlobalRegionManager().allows(
+//                            DefaultFlag.ENTITY_PAINTING_DESTROY, entity.getLocation())))) {
+//                event.setCancelled(true);
+//            }
+        }
+    }
+}

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

@@ -0,0 +1,174 @@
+// $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 static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Warning;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Painting;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.painting.PaintingBreakByEntityEvent;
+import org.bukkit.event.painting.PaintingBreakEvent;
+import org.bukkit.event.painting.PaintingPlaceEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+import com.sk89q.worldedit.blocks.ItemID;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+
+/**
+ * Listener for painting related events.
+ *
+ * @author sk89q
+ * @deprecated Use {@link com.sk89q.worldguard.bukkit.WorldGuardHangingListener} instead.
+ */
+@Deprecated
+@Warning(reason="This listener has been replaced by WorldGuardHangingListener")
+public class WorldGuardPaintingListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardPaintingListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPaintingBreak(PaintingBreakEvent breakEvent) {
+        if (!(breakEvent instanceof PaintingBreakByEntityEvent)) {
+            return;
+        }
+
+        PaintingBreakByEntityEvent event = (PaintingBreakByEntityEvent) breakEvent;
+        Painting painting = event.getPainting();
+        World world = painting.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (event.getRemover() instanceof Player) {
+            Player player = (Player) event.getRemover();
+
+            if (wcfg.getBlacklist() != null) {
+                if (!wcfg.getBlacklist().check(
+                            new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                                    toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (wcfg.useRegions) {
+                if (!plugin.getGlobalRegionManager().canBuild(player, painting.getLocation())) {
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        } else {
+            if (event.getRemover() instanceof Creeper) {
+                if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.CREEPER_EXPLOSION, painting.getLocation())) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (wcfg.blockEntityPaintingDestroy
+                    || (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_PAINTING_DESTROY, painting.getLocation()))) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPaintingPlace(PaintingPlaceEvent event) {
+        Block placedOn = event.getBlock();
+        Player player = event.getPlayer();
+        World world = placedOn.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.getBlacklist() != null) {
+
+            if (!wcfg.getBlacklist().check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityInteract(PlayerInteractEntityEvent event) {
+        Player player = event.getPlayer();
+        Entity entity = event.getRightClicked();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (wcfg.useRegions && entity instanceof Painting) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, entity.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (entity instanceof Painting
+                    && ((!plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.ENTITY_PAINTING_DESTROY, entity.getLocation())))) {
+                event.setCancelled(true);
+            }
+        }
+    }
+}

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

@@ -19,6 +19,21 @@
 
 package com.sk89q.worldguard.bukkit;
 
+import static com.sk89q.worldguard.bukkit.BukkitUtil.hasHangingEvent;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -28,33 +43,35 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
-import com.sk89q.bukkit.migration.*;
-import com.sk89q.minecraft.util.commands.*;
+
+import com.sk89q.bukkit.util.CommandsManagerRegistration;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissionsException;
+import com.sk89q.minecraft.util.commands.CommandUsageException;
+import com.sk89q.minecraft.util.commands.CommandsManager;
+import com.sk89q.minecraft.util.commands.MissingNestedCommandException;
+import com.sk89q.minecraft.util.commands.SimpleInjector;
+import com.sk89q.minecraft.util.commands.WrappedCommandException;
+import com.sk89q.wepif.PermissionsResolverManager;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.TickSyncDelayLoggerFilter;
 import com.sk89q.worldguard.bukkit.commands.GeneralCommands;
 import com.sk89q.worldguard.bukkit.commands.ProtectionCommands;
 import com.sk89q.worldguard.bukkit.commands.ToggleCommands;
-import com.sk89q.worldguard.protection.*;
-import java.io.*;
-import java.util.*;
-import java.util.logging.Filter;
-import java.util.logging.Logger;
+import com.sk89q.worldguard.protection.GlobalRegionManager;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.util.FatalConfigurationLoadingException;
 
 /**
  * The main class for WorldGuard as a Bukkit plugin.
- * 
+ *
  * @author sk89q
  */
 public class WorldGuardPlugin extends JavaPlugin {
-    /**
-     * Logger for messages.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
+
     /**
      * Manager for commands. This automatically handles nested commands,
      * permissions checking, and a number of other fancy command things.
@@ -66,20 +83,12 @@ public class WorldGuardPlugin extends JavaPlugin {
      * Handles the region databases for all worlds.
      */
     private final GlobalRegionManager globalRegionManager;
-    
+
     /**
      * Handles all configuration.
      */
     private final ConfigurationManager configuration;
-    
-    /**
-     * Processes queries for permissions information. The permissions manager
-     * is from WorldEdit and it automatically handles looking up permissions
-     * systems and picking the right one. WorldGuard just needs to call
-     * the permission methods.
-     */
-    private PermissionsResolverManager perms;
-    
+
     /**
      * Used for scheduling flags.
      */
@@ -92,7 +101,7 @@ public class WorldGuardPlugin extends JavaPlugin {
     public WorldGuardPlugin() {
         configuration = new ConfigurationManager(this);
         globalRegionManager = new GlobalRegionManager(this);
-        
+
         final WorldGuardPlugin plugin = this;
         commands = new CommandsManager<CommandSender>() {
             @Override
@@ -100,54 +109,58 @@ public class WorldGuardPlugin extends JavaPlugin {
                 return plugin.hasPermission(player, perm);
             }
         };
-        
-        // Register command classes
-        commands.register(ToggleCommands.class);
-        commands.register(ProtectionCommands.class);
-        commands.register(GeneralCommands.class);
     }
-    
+
     /**
      * Called on plugin enable.
      */
+    @Override
+    @SuppressWarnings("deprecation")
     public void onEnable() {
+
+        // Set the proper command injector
+        commands.setInjector(new SimpleInjector(this));
+
+        // Register command classes
+        final CommandsManagerRegistration reg = new CommandsManagerRegistration(this, commands);
+        reg.register(ToggleCommands.class);
+        reg.register(ProtectionCommands.class);
+
+        getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
+            @Override
+            public void run() {
+                if (!getGlobalStateManager().hasCommandBookGodMode()) {
+                    reg.register(GeneralCommands.class);
+                }
+            }
+        }, 0L);
+
         // Need to create the plugins/WorldGuard folder
         getDataFolder().mkdirs();
 
-        // Set up permissions
-        perms = new PermissionsResolverManager(
-                getConfiguration(), getServer(), "WorldGuard", logger);
-        perms.load();
+        PermissionsResolverManager.initialize(this);
 
-        // This must be done before configuration is laoded
+        // This must be done before configuration is loaded
         LegacyWorldGuardMigration.migrateBlacklist(this);
-        
-        // Load the configuration
-        configuration.load();
-        globalRegionManager.preload();
-        
+
+        try {
+            // Load the configuration
+            configuration.load();
+            globalRegionManager.preload();
+        } catch (FatalConfigurationLoadingException e) {
+            e.printStackTrace();
+            getServer().shutdown();
+        }
+
         // Migrate regions after the regions were loaded because
         // the migration code reuses the loaded region managers
         LegacyWorldGuardMigration.migrateRegions(this);
 
-        // Load permissions
-        (new PermissionsResolverServerListener(perms)).register(this);
-
         flagStateManager = new FlagStateManager(this);
-        
-        if (configuration.useRegionsScheduler) { 
-            getServer().getScheduler().scheduleAsyncRepeatingTask(this,
-                    flagStateManager, FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
-        }
 
-        if (configuration.suppressTickSyncWarnings) {
-            Logger.getLogger("Minecraft").setFilter(
-                    new TickSyncDelayLoggerFilter());
-        } else {
-            Filter filter = Logger.getLogger("Minecraft").getFilter();
-            if (filter != null && filter instanceof TickSyncDelayLoggerFilter) {
-                Logger.getLogger("Minecraft").setFilter(null);
-            }
+        if (configuration.useRegionsScheduler) {
+            getServer().getScheduler().scheduleSyncRepeatingTask(this, flagStateManager,
+                    FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
         }
 
         // Register events
@@ -155,21 +168,47 @@ public class WorldGuardPlugin extends JavaPlugin {
         (new WorldGuardBlockListener(this)).registerEvents();
         (new WorldGuardEntityListener(this)).registerEvents();
         (new WorldGuardWeatherListener(this)).registerEvents();
-        (new WorldGuardWorldListener(this)).registerEvents();
-        
-        logger.info("WorldGuard " + this.getDescription().getVersion() + " enabled.");
+        (new WorldGuardVehicleListener(this)).registerEvents();
+        (new WorldGuardServerListener(this)).registerEvents();
+        if (hasHangingEvent()) {
+            (new WorldGuardHangingListener(this)).registerEvents();
+        } else {
+            (new WorldGuardPaintingListener(this)).registerEvents();
+        }
+        configuration.updateCommandBookGodMode();
+
+        if (getServer().getPluginManager().isPluginEnabled("CommandBook")) {
+            getServer().getPluginManager().registerEvents(new WorldGuardCommandBookListener(this), this);
+        }
+
+        // handle worlds separately to initialize already loaded worlds
+        WorldGuardWorldListener worldListener = (new WorldGuardWorldListener(this));
+        for (World world : getServer().getWorlds()) {
+            worldListener.initWorld(world);
+        }
+        worldListener.registerEvents();
+
+        if (!configuration.hasCommandBookGodMode()) {
+            // Check god mode for existing players, if any
+            for (Player player : getServer().getOnlinePlayers()) {
+                if (inGroup(player, "wg-invincible") ||
+                        (configuration.autoGodMode && hasPermission(player, "worldguard.auto-invincible"))) {
+                    configuration.enableGodMode(player);
+                }
+            }
+        }
     }
 
     /**
      * Called on plugin disable.
      */
+    @Override
     public void onDisable() {
         globalRegionManager.unload();
         configuration.unload();
-
-        logger.info("WorldGuard " + getDescription().getVersion() + " disabled.");
+        this.getServer().getScheduler().cancelTasks(this);
     }
-    
+
     /**
      * Handle a command.
      */
@@ -177,7 +216,7 @@ public class WorldGuardPlugin extends JavaPlugin {
     public boolean onCommand(CommandSender sender, Command cmd, String label,
             String[] args) {
         try {
-            commands.execute(cmd.getName(), args, sender, this, sender);
+            commands.execute(cmd.getName(), args, sender, sender);
         } catch (CommandPermissionsException e) {
             sender.sendMessage(ChatColor.RED + "You don't have permission.");
         } catch (MissingNestedCommandException e) {
@@ -195,43 +234,43 @@ public class WorldGuardPlugin extends JavaPlugin {
         } catch (CommandException e) {
             sender.sendMessage(ChatColor.RED + e.getMessage());
         }
-        
+
         return true;
     }
 
     /**
      * Get the GlobalRegionManager.
-     * 
-     * @return
+     *
+     * @return The plugin's global region manager
      */
     public GlobalRegionManager getGlobalRegionManager() {
         return globalRegionManager;
     }
 
     /**
-     * Get the WorldGuardConfiguraton.
+     * Get the WorldGuard Configuration.
      *
-     * @return
+     * @return ConfigurationManager
      * @deprecated Use {@link #getGlobalStateManager()} instead
      */
     @Deprecated
     public ConfigurationManager getGlobalConfiguration() {
         return getGlobalStateManager();
     }
-    
+
     /**
      * Gets the flag state manager.
-     * 
-     * @return
+     *
+     * @return The flag state manager
      */
     public FlagStateManager getFlagStateManager() {
         return flagStateManager;
     }
 
     /**
-     * Get the WorldGuardConfiguraton.
-     *
-     * @return
+     * Get the global ConfigurationManager.
+     * USe this to access global configuration values and per-world configuration values.
+     * @return The global ConfigurationManager
      */
     public ConfigurationManager getGlobalStateManager() {
         return configuration;
@@ -239,14 +278,15 @@ public class WorldGuardPlugin extends JavaPlugin {
 
     /**
      * Check whether a player is in a group.
-     * 
-     * @param player
-     * @param group
-     * @return
+     * This calls the corresponding method in PermissionsResolverManager
+     *
+     * @param player The player to check
+     * @param group The group
+     * @return whether {@code player} is in {@code group}
      */
     public boolean inGroup(Player player, String group) {
         try {
-            return perms.inGroup(player.getName(), group);
+            return PermissionsResolverManager.getInstance().inGroup(player, group);
         } catch (Throwable t) {
             t.printStackTrace();
             return false;
@@ -255,54 +295,56 @@ public class WorldGuardPlugin extends JavaPlugin {
 
     /**
      * Get the groups of a player.
-     * 
-     * @param player
-     * @return
+     * This calls the corresponding method in PermissionsResolverManager.
+     * @param player The player to check
+     * @return The names of each group the playe is in.
      */
     public String[] getGroups(Player player) {
         try {
-            return perms.getGroups(player.getName());
+            return PermissionsResolverManager.getInstance().getGroups(player);
         } catch (Throwable t) {
             t.printStackTrace();
             return new String[0];
         }
     }
-    
+
     /**
      * Gets the name of a command sender. This is a unique name and this
      * method should never return a "display name".
-     * 
-     * @param sender
-     * @return
+     *
+     * @param sender The sender to get the name of
+     * @return The unique name of the sender.
      */
     public String toUniqueName(CommandSender sender) {
-        if (sender instanceof Player) {
-            return ((Player) sender).getName();
-        } else {
+        if (sender instanceof ConsoleCommandSender) {
             return "*Console*";
+        } else {
+            return sender.getName();
         }
     }
-    
+
     /**
      * Gets the name of a command sender. This play be a display name.
-     * 
-     * @param sender
-     * @return
+     *
+     * @param sender The CommandSender to get the name of.
+     * @return The name of the given sender
      */
     public String toName(CommandSender sender) {
-        if (sender instanceof Player) {
-            return ((Player) sender).getName();
-        } else {
+        if (sender instanceof ConsoleCommandSender) {
             return "*Console*";
+        } else if (sender instanceof Player) {
+            return ((Player) sender).getDisplayName();
+        } else {
+            return sender.getName();
         }
     }
-    
+
     /**
      * Checks permissions.
-     * 
-     * @param sender
-     * @param perm
-     * @return 
+     *
+     * @param sender The sender to check the permission on.
+     * @param perm The permission to check the permission on.
+     * @return whether {@code sender} has {@code perm}
      */
     public boolean hasPermission(CommandSender sender, String perm) {
         if (sender.isOp()) {
@@ -315,21 +357,22 @@ public class WorldGuardPlugin extends JavaPlugin {
                 return true;
             }
         }
-        
+
         // Invoke the permissions resolver
         if (sender instanceof Player) {
-            return perms.hasPermission(((Player) sender).getName(), perm);
+            Player player = (Player) sender;
+            return PermissionsResolverManager.getInstance().hasPermission(player.getWorld().getName(), player.getName(), perm);
         }
-        
+
         return false;
     }
-    
+
     /**
      * Checks permissions and throws an exception if permission is not met.
-     * 
-     * @param sender
-     * @param perm
-     * @throws CommandPermissionsException 
+     *
+     * @param sender The sender to check the permission on.
+     * @param perm The permission to check the permission on.
+     * @throws CommandPermissionsException if {@code sender} doesn't have {@code perm}
      */
     public void checkPermission(CommandSender sender, String perm)
             throws CommandPermissionsException {
@@ -337,13 +380,13 @@ public class WorldGuardPlugin extends JavaPlugin {
             throw new CommandPermissionsException();
         }
     }
-    
+
     /**
      * Checks to see if the sender is a player, otherwise throw an exception.
-     * 
-     * @param sender
-     * @return 
-     * @throws CommandException 
+     *
+     * @param sender The {@link CommandSender} to check
+     * @return {@code sender} casted to a player
+     * @throws CommandException if {@code sender} isn't a {@link Player}
      */
     public Player checkPlayer(CommandSender sender)
             throws CommandException {
@@ -353,22 +396,27 @@ public class WorldGuardPlugin extends JavaPlugin {
             throw new CommandException("A player is expected.");
         }
     }
-    
+
     /**
      * Match player names.
-     * 
-     * @param filter
-     * @return
+     *
+     * The filter string uses the following format:
+     * @[name] looks up all players with the exact {@code name}
+     * *[name] matches any player whose name contains {@code name}
+     * [name] matches any player whose name starts with {@code name}
+     *
+     * @param filter The filter string to check.
+     * @return A {@link List} of players who match {@code filter}
      */
     public List<Player> matchPlayerNames(String filter) {
         Player[] players = getServer().getOnlinePlayers();
 
         filter = filter.toLowerCase();
-        
+
         // Allow exact name matching
         if (filter.charAt(0) == '@' && filter.length() >= 2) {
             filter = filter.substring(1);
-            
+
             for (Player player : players) {
                 if (player.getName().equalsIgnoreCase(filter)) {
                     List<Player> list = new ArrayList<Player>();
@@ -376,43 +424,43 @@ public class WorldGuardPlugin extends JavaPlugin {
                     return list;
                 }
             }
-            
+
             return new ArrayList<Player>();
         // Allow partial name matching
         } else if (filter.charAt(0) == '*' && filter.length() >= 2) {
             filter = filter.substring(1);
-            
+
             List<Player> list = new ArrayList<Player>();
-            
+
             for (Player player : players) {
                 if (player.getName().toLowerCase().contains(filter)) {
                     list.add(player);
                 }
             }
-            
+
             return list;
-        
+
         // Start with name matching
         } else {
             List<Player> list = new ArrayList<Player>();
-            
+
             for (Player player : players) {
                 if (player.getName().toLowerCase().startsWith(filter)) {
                     list.add(player);
                 }
             }
-            
+
             return list;
         }
     }
-    
+
     /**
      * Checks if the given list of players is greater than size 0, otherwise
      * throw an exception.
-     * 
-     * @param players
-     * @return 
-     * @throws CommandException
+     *
+     * @param players The {@link List} to check
+     * @return {@code players} as an {@link Iterable}
+     * @throws CommandException If {@code players} is empty
      */
     protected Iterable<Player> checkPlayerMatch(List<Player> players)
             throws CommandException {
@@ -420,25 +468,32 @@ public class WorldGuardPlugin extends JavaPlugin {
         if (players.size() == 0) {
             throw new CommandException("No players matched query.");
         }
-        
+
         return players;
     }
-    
+
     /**
-     * Checks permissions and throws an exception if permission is not met.
-     * 
-     * @param source 
-     * @param filter
+     * Matches players based on the specified filter string
+     *
+     * The filter string format is as follows:
+     * * returns all the players currently online
+     * If {@code sender} is a {@link Player}:
+     * #world returns all players in the world that {@code sender} is in
+     * #near reaturns all players within 30 blocks of {@code sender}'s location
+     * Otherwise, the format is as specified in {@link #matchPlayerNames(String)}
+     *
+     * @param source The CommandSender who is trying to find a player
+     * @param filter The filter string for players
      * @return iterator for players
-     * @throws CommandException no matches found
+     * @throws CommandException if no matches are found
      */
     public Iterable<Player> matchPlayers(CommandSender source, String filter)
             throws CommandException {
-        
+
         if (getServer().getOnlinePlayers().length == 0) {
             throw new CommandException("No players matched query.");
         }
-        
+
         if (filter.equals("*")) {
             return checkPlayerMatch(Arrays.asList(getServer().getOnlinePlayers()));
         }
@@ -451,7 +506,7 @@ public class WorldGuardPlugin extends JavaPlugin {
                 List<Player> players = new ArrayList<Player>();
                 Player sourcePlayer = checkPlayer(source);
                 World sourceWorld = sourcePlayer.getWorld();
-                
+
                 for (Player player : getServer().getOnlinePlayers()) {
                     if (player.getWorld().equals(sourceWorld)) {
                         players.add(player);
@@ -459,7 +514,7 @@ public class WorldGuardPlugin extends JavaPlugin {
                 }
 
                 return checkPlayerMatch(players);
-            
+
             // Handle #near, which is for nearby players.
             } else if (filter.equalsIgnoreCase("#near")) {
                 List<Player> players = new ArrayList<Player>();
@@ -467,7 +522,7 @@ public class WorldGuardPlugin extends JavaPlugin {
                 World sourceWorld = sourcePlayer.getWorld();
                 org.bukkit.util.Vector sourceVector
                         = sourcePlayer.getLocation().toVector();
-                
+
                 for (Player player : getServer().getOnlinePlayers()) {
                     if (player.getWorld().equals(sourceWorld)
                             && player.getLocation().toVector().distanceSquared(
@@ -477,32 +532,33 @@ public class WorldGuardPlugin extends JavaPlugin {
                 }
 
                 return checkPlayerMatch(players);
-            
+
             } else {
                 throw new CommandException("Invalid group '" + filter + "'.");
             }
         }
-        
+
         List<Player> players = matchPlayerNames(filter);
-        
+
         return checkPlayerMatch(players);
     }
-    
+
     /**
      * Match only a single player.
-     * 
-     * @param sender
-     * @param filter
-     * @return
-     * @throws CommandException
+     *
+     * @param sender The {@link CommandSender} who is requesting a player match
+     * @param filter The filter string.
+     * @see #matchPlayers(org.bukkit.entity.Player) for filter string syntax
+     * @return The single player
+     * @throws CommandException If more than one player match was found
      */
     public Player matchSinglePlayer(CommandSender sender, String filter)
             throws CommandException {
         // This will throw an exception if there are no matches
         Iterator<Player> players = matchPlayers(sender, filter).iterator();
-        
+
         Player match = players.next();
-        
+
         // We don't want to match the wrong person, so fail if if multiple
         // players were found (we don't want to just pick off the first one,
         // as that may be the wrong player)
@@ -510,48 +566,58 @@ public class WorldGuardPlugin extends JavaPlugin {
             throw new CommandException("More than one player found! " +
                         "Use @<name> for exact matching.");
         }
-        
+
         return match;
     }
-    
+
     /**
      * Match only a single player or console.
-     * 
-     * @param sender
-     * @param filter
-     * @return
-     * @throws CommandException
+     *
+     * The filter string syntax is as follows:
+     * #console, *console, or ! return the server console
+     * All syntax from {@link #matchSinglePlayer(org.bukkit.command.CommandSender, String)}
+     * @param sender The sender trying to match a CommandSender
+     * @param filter The filter string
+     * @return The resulting CommandSender
+     * @throws CommandException if either zero or more than one player matched.
      */
     public CommandSender matchPlayerOrConsole(CommandSender sender, String filter)
             throws CommandException {
-        
+
         // Let's see if console is wanted
         if (filter.equalsIgnoreCase("#console")
                 || filter.equalsIgnoreCase("*console*")
                 || filter.equalsIgnoreCase("!")) {
-            return new ConsoleCommandSender(getServer());
+            return getServer().getConsoleSender();
         }
-        
+
         return matchSinglePlayer(sender, filter);
     }
-    
+
     /**
      * Get a single player as an iterator for players.
-     * 
-     * @param player
-     * @return iterator for players
+     *
+     * @param player The player to return in an Iterable
+     * @return iterator for player
      */
     public Iterable<Player> matchPlayers(Player player) {
-        return Arrays.asList(new Player[] {player});
+        return Arrays.asList(player);
     }
-    
+
     /**
      * Match a world.
-     * @param sender 
-     * 
-     * @param filter
-     * @return
-     * @throws CommandException 
+     *
+     * The filter string syntax is as follows:
+     * #main returns the main world
+     * #normal returns the first world with a normal environment
+     * #nether return the first world with a nether environment
+     * #player:[name] returns the world that a player named {@code name} is located in, if the player is online.
+     * [name] A world with the name {@code name}
+     *
+     * @param sender The sender requesting a match
+     * @param filter The filter string
+     * @return The resulting world
+     * @throws CommandException if no world matches
      */
     public World matchWorld(CommandSender sender, String filter) throws CommandException {
         List<World> worlds = getServer().getWorlds();
@@ -561,7 +627,7 @@ public class WorldGuardPlugin extends JavaPlugin {
             // #main for the main world
             if (filter.equalsIgnoreCase("#main")) {
                 return worlds.get(0);
-            
+
             // #normal for the first normal world
             } else if (filter.equalsIgnoreCase("#normal")) {
                 for (World world : worlds) {
@@ -571,7 +637,7 @@ public class WorldGuardPlugin extends JavaPlugin {
                 }
 
                 throw new CommandException("No normal world found.");
-            
+
             // #nether for the first nether world
             } else if (filter.equalsIgnoreCase("#nether")) {
                 for (World world : worlds) {
@@ -585,65 +651,65 @@ public class WorldGuardPlugin extends JavaPlugin {
             // Handle getting a world from a player
             } else if (filter.matches("^#player$")) {
                 String parts[] = filter.split(":", 2);
-                
+
                 // They didn't specify an argument for the player!
                 if (parts.length == 1) {
                     throw new CommandException("Argument expected for #player.");
                 }
-                
+
                 return matchPlayers(sender, parts[1]).iterator().next().getWorld();
             } else {
                 throw new CommandException("Invalid identifier '" + filter + "'.");
             }
         }
-        
+
         for (World world : worlds) {
             if (world.getName().equals(filter)) {
                 return world;
             }
         }
-        
+
         throw new CommandException("No world by that exact name found.");
     }
 
     /**
      * Gets a copy of the WorldEdit plugin.
-     * 
-     * @return
-     * @throws CommandException
+     *
+     * @return The WorldEditPlugin instance
+     * @throws CommandException If there is no WorldEditPlugin available
      */
     public WorldEditPlugin getWorldEdit() throws CommandException {
         Plugin worldEdit = getServer().getPluginManager().getPlugin("WorldEdit");
         if (worldEdit == null) {
             throw new CommandException("WorldEdit does not appear to be installed.");
         }
-        
+
         if (worldEdit instanceof WorldEditPlugin) {
             return (WorldEditPlugin) worldEdit;
         } else {
             throw new CommandException("WorldEdit detection failed (report error).");
         }
     }
-    
+
     /**
      * Wrap a player as a LocalPlayer.
-     * 
-     * @param player
-     * @return
+     *
+     * @param player The player to wrap
+     * @return The wrapped player
      */
     public LocalPlayer wrapPlayer(Player player) {
         return new BukkitPlayer(this, player);
     }
-    
+
     /**
      * Create a default configuration file from the .jar.
-     * 
-     * @param actual 
-     * @param defaultName 
+     *
+     * @param actual The destination file
+     * @param defaultName The name of the file inside the jar's defaults folder
      */
-    public static void createDefaultConfiguration(File actual,
+    public void createDefaultConfiguration(File actual,
             String defaultName) {
-        
+
         // Make parent directories
         File parent = actual.getParentFile();
         if (!parent.exists()) {
@@ -654,9 +720,17 @@ public class WorldGuardPlugin extends JavaPlugin {
             return;
         }
 
-        InputStream input = WorldGuardPlugin.class
-                .getResourceAsStream("/defaults/" + defaultName);
-        
+        InputStream input =
+                    null;
+            try {
+                JarFile file = new JarFile(getFile());
+                ZipEntry copy = file.getEntry("defaults/" + defaultName);
+                if (copy == null) throw new FileNotFoundException();
+                input = file.getInputStream(copy);
+            } catch (IOException e) {
+                getLogger().severe("Unable to read default configuration: " + defaultName);
+            }
+
         if (input != null) {
             FileOutputStream output = null;
 
@@ -668,7 +742,7 @@ public class WorldGuardPlugin extends JavaPlugin {
                     output.write(buf, 0, length);
                 }
 
-                logger.info("WorldGuard: Default configuration file written: "
+                getLogger().info("Default configuration file written: "
                         + actual.getAbsolutePath());
             } catch (IOException e) {
                 e.printStackTrace();
@@ -677,62 +751,117 @@ public class WorldGuardPlugin extends JavaPlugin {
                     if (input != null) {
                         input.close();
                     }
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                 }
 
                 try {
                     if (output != null) {
                         output.close();
                     }
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                 }
             }
         }
     }
-    
+
     /**
-     * Notifies all with the notify permission.
-     * 
-     * @param msg
+     * Notifies all with the worldguard.notify permission.
+     * This will check both superperms and WEPIF,
+     * but makes sure WEPIF checks don't result in duplicate notifications
+     *
+     * @param msg The notification to broadcast
      */
     public void broadcastNotification(String msg) {
+        getServer().broadcast(msg, "worldguard.notify");
+        Set<Permissible> subs = getServer().getPluginManager().getPermissionSubscriptions("worldguard.notify");
         for (Player player : getServer().getOnlinePlayers()) {
-            if (hasPermission(player, "worldguard.notify")) {
+            if (!(subs.contains(player) && player.hasPermission("worldguard.notify")) &&
+                    hasPermission(player, "worldguard.notify")) { // Make sure the player wasn't already broadcasted to.
                 player.sendMessage(msg);
             }
         }
+        getLogger().info(msg);
     }
-    
+
     /**
      * Forgets a player.
-     * 
-     * @param player
+     *
+     * @param player The player to remove state information for
      */
     public void forgetPlayer(Player player) {
         flagStateManager.forget(player);
     }
-    
+
     /**
      * Checks to see if a player can build at a location. This will return
      * true if region protection is disabled.
-     * 
-     * @param player
-     * @param loc
-     * @return
+     *
+     * @param player The player to check.
+     * @param loc The location to check at.
+     * @see GlobalRegionManager#canBuild(org.bukkit.entity.Player, org.bukkit.Location)
+     * @return whether {@code player} can build at {@code loc}
      */
     public boolean canBuild(Player player, Location loc) {
         return getGlobalRegionManager().canBuild(player, loc);
     }
-    
+
     /**
      * Checks to see if a player can build at a location. This will return
      * true if region protection is disabled.
-     * 
-     * @param player
-     * @param block
-     * @return
+     *
+     * @param player The player to check
+     * @param block The block to check at.
+     * @see GlobalRegionManager#canBuild(org.bukkit.entity.Player, org.bukkit.block.Block)
+     * @return whether {@code player} can build at {@code block}'s location
      */
     public boolean canBuild(Player player, Block block) {
         return getGlobalRegionManager().canBuild(player, block);
     }
+
+    /**
+     * Gets the region manager for a world.
+     *
+     * @param world world to get the region manager for
+     * @return the region manager or null if regions are not enabled
+     */
+    public RegionManager getRegionManager(World world) {
+        if (!getGlobalStateManager().get(world).useRegions) {
+            return null;
+        }
+
+        return getGlobalRegionManager().get(world);
+    }
+
+    /**
+     * Replace macros in the text.
+     *
+     * The macros replaced are as follows:
+     * %name%: The name of {@code sender}. See {@link #toName(org.bukkit.command.CommandSender)}
+     * %id%: The unique name of the sender. See {@link #toUniqueName(org.bukkit.command.CommandSender)}
+     * %online%: The number of players currently online on the server
+     * If {@code sender} is a Player:
+     * %world%: The name of the world {@code sender} is located in
+     * %health%: The health of {@code sender}. See {@link org.bukkit.entity.Player#getHealth()}
+     *
+     * @param sender The sender to check
+     * @param message The message to replace macros in
+     * @return The message with macros replaced
+     */
+    public String replaceMacros(CommandSender sender, String message) {
+        Player[] online = getServer().getOnlinePlayers();
+
+        message = message.replace("%name%", toName(sender));
+        message = message.replace("%id%", toUniqueName(sender));
+        message = message.replace("%online%", String.valueOf(online.length));
+
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            World world = player.getWorld();
+
+            message = message.replace("%world%", world.getName());
+            message = message.replace("%health%", String.valueOf(player.getHealth()));
+        }
+
+        return message;
+    }
 }

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

@@ -0,0 +1,38 @@
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.bukkit.event.server.PluginEnableEvent;
+import org.bukkit.plugin.PluginManager;
+
+/**
+ * @author zml2008
+ */
+public class WorldGuardServerListener implements Listener {
+
+    private final WorldGuardPlugin plugin;
+
+    public WorldGuardServerListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    public void registerEvents() {
+        PluginManager pm = plugin.getServer().getPluginManager();
+        pm.registerEvents(this, plugin);
+    }
+
+    @EventHandler
+    public void onPluginEnable(PluginEnableEvent event) {
+        if (event.getPlugin().getDescription().getName().equalsIgnoreCase("CommandBook")) {
+            plugin.getGlobalStateManager().updateCommandBookGodMode();
+        }
+    }
+
+    @EventHandler
+    public void onPluginDisable(PluginDisableEvent event) {
+        if (event.getPlugin().getDescription().getName().equalsIgnoreCase("CommandBook")) {
+            plugin.getGlobalStateManager().updateCommandBookGodMode();
+        }
+    }
+}

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

@@ -0,0 +1,178 @@
+// $Id$
+/*
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ * All rights reserved.
+*/
+package com.sk89q.worldguard.bukkit;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.vehicle.VehicleDestroyEvent;
+import org.bukkit.event.vehicle.VehicleMoveEvent;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.bukkit.FlagStateManager.PlayerFlagState;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+public class WorldGuardVehicleListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin
+     */
+    public WorldGuardVehicleListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler
+    public void onVehicleDestroy(VehicleDestroyEvent event) {
+        Vehicle vehicle = event.getVehicle();
+        Entity destroyer = event.getAttacker();
+
+        if (!(destroyer instanceof Player)) return; // don't care
+        Player player = (Player) destroyer;
+        World world = vehicle.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.useRegions) {
+            Vector pt = toVector(vehicle.getLocation());
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                    && !set.canBuild(localPlayer)
+                    && !set.allows(DefaultFlag.DESTROY_VEHICLE, localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission to destroy vehicles here.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler
+    public void onVehicleMove(VehicleMoveEvent event) {
+        Vehicle vehicle = event.getVehicle();
+        if (vehicle.getPassenger() == null
+                || !(vehicle.getPassenger() instanceof Player)) return;
+        Player player = (Player) vehicle.getPassenger();
+        World world = vehicle.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        // unfortunate code duplication
+        if (wcfg.useRegions) {
+            // Did we move a block?
+            if (event.getFrom().getBlockX() != event.getTo().getBlockX()
+                    || event.getFrom().getBlockY() != event.getTo().getBlockY()
+                    || event.getFrom().getBlockZ() != event.getTo().getBlockZ()) {
+                PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+                LocalPlayer localPlayer = plugin.wrapPlayer(player);
+                boolean hasBypass = plugin.getGlobalRegionManager().hasBypass(player, world);
+
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
+                ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+                boolean entryAllowed = set.allows(DefaultFlag.ENTRY, localPlayer);
+                if (!hasBypass && !entryAllowed) {
+
+                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
+                    vehicle.teleport(event.getFrom());
+                    return;
+                }
+
+                // Have to set this state
+                if (state.lastExitAllowed == null) {
+                    state.lastExitAllowed = mgr.getApplicableRegions(toVector(event.getFrom()))
+                            .allows(DefaultFlag.EXIT, localPlayer);
+                }
+
+                boolean exitAllowed = set.allows(DefaultFlag.EXIT, localPlayer);
+                if (!hasBypass && exitAllowed && !state.lastExitAllowed) {
+                    player.sendMessage(ChatColor.DARK_RED + "You are not permitted to leave this area.");
+
+                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
+                    vehicle.teleport(event.getFrom());
+                    return;
+                }
+
+                String greeting = set.getFlag(DefaultFlag.GREET_MESSAGE, localPlayer);
+                String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE, localPlayer);
+                Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER, localPlayer);
+                Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE, localPlayer);
+
+                if (state.lastFarewell != null && (farewell == null
+                        || !state.lastFarewell.equals(farewell))) {
+                    String replacedFarewell = plugin.replaceMacros(
+                            player, BukkitUtil.replaceColorMacros(state.lastFarewell));
+                    player.sendMessage(ChatColor.AQUA + " ** " + replacedFarewell);
+                }
+
+                if (greeting != null && (state.lastGreeting == null
+                        || !state.lastGreeting.equals(greeting))) {
+                    String replacedGreeting = plugin.replaceMacros(
+                            player, BukkitUtil.replaceColorMacros(greeting));
+                    player.sendMessage(ChatColor.AQUA + " ** " + replacedGreeting);
+                }
+
+                if ((notifyLeave == null || !notifyLeave)
+                        && state.notifiedForLeave != null && state.notifiedForLeave) {
+                    plugin.broadcastNotification(ChatColor.GRAY + "WG: "
+                            + ChatColor.LIGHT_PURPLE + player.getName()
+                            + ChatColor.GOLD + " left NOTIFY region");
+                }
+
+                if (notifyEnter != null && notifyEnter && (state.notifiedForEnter == null
+                        || !state.notifiedForEnter)) {
+                    StringBuilder regionList = new StringBuilder();
+
+                    for (ProtectedRegion region : set) {
+                        if (regionList.length() != 0) {
+                            regionList.append(", ");
+                        }
+                        regionList.append(region.getId());
+                    }
+
+                    plugin.broadcastNotification(ChatColor.GRAY + "WG: "
+                            + ChatColor.LIGHT_PURPLE + player.getName()
+                            + ChatColor.GOLD + " entered NOTIFY region: "
+                            + ChatColor.WHITE
+                            + regionList);
+                }
+
+                state.lastGreeting = greeting;
+                state.lastFarewell = farewell;
+                state.notifiedForEnter = notifyEnter;
+                state.notifiedForLeave = notifyLeave;
+                state.lastExitAllowed = exitAllowed;
+                state.lastWorld = event.getTo().getWorld();
+                state.lastBlockX = event.getTo().getBlockX();
+                state.lastBlockY = event.getTo().getBlockY();
+                state.lastBlockZ = event.getTo().getBlockZ();
+            }
+        }
+    }
+}

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

@@ -19,27 +19,20 @@
 package com.sk89q.worldguard.bukkit;
 
 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
 import org.bukkit.Location;
-import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.weather.LightningStrikeEvent;
 import org.bukkit.event.weather.ThunderChangeEvent;
 import org.bukkit.event.weather.WeatherChangeEvent;
-import org.bukkit.event.weather.WeatherListener;
-import org.bukkit.plugin.PluginManager;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 
-import java.util.logging.Logger;
-
-public class WorldGuardWeatherListener extends WeatherListener {
-
-    /**
-     * Logger for messages.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+public class WorldGuardWeatherListener implements Listener {
 
     /**
      * Plugin.
@@ -49,41 +42,18 @@ public class WorldGuardWeatherListener extends WeatherListener {
     /**
      * Construct the object;
      *
-     * @param plugin
+     * @param plugin The plugin instance
      */
     public WorldGuardWeatherListener(WorldGuardPlugin plugin) {
         this.plugin = plugin;
     }
 
     public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
-
-        registerEvent("LIGHTNING_STRIKE", Priority.High);
-        registerEvent("THUNDER_CHANGE", Priority.High);
-        registerEvent("WEATHER_CHANGE", Priority.High);
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
-    /**
-     * Register an event, but not failing if the event is not implemented.
-     *
-     * @param typeName
-     * @param priority
-     */
-    private void registerEvent(String typeName, Priority priority) {
-        try {
-            Event.Type type = Event.Type.valueOf(typeName);
-            PluginManager pm = plugin.getServer().getPluginManager();
-            pm.registerEvent(type, this, priority, plugin);
-        } catch (IllegalArgumentException e) {
-            logger.info("WorldGuard: Unable to register missing event type " + typeName);
-        }
-    }
-
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onWeatherChange(WeatherChangeEvent event) {
-        if (event.isCancelled()) {
-           return;
-        }
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(event.getWorld());
 
@@ -98,12 +68,8 @@ public class WorldGuardWeatherListener extends WeatherListener {
         }
     }
 
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onThunderChange(ThunderChangeEvent event) {
-        if (event.isCancelled()) {
-           return;
-        }
-
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(event.getWorld());
 
@@ -118,12 +84,8 @@ public class WorldGuardWeatherListener extends WeatherListener {
         }
     }
 
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onLightningStrike(LightningStrikeEvent event) {
-        if (event.isCancelled()) {
-           return;
-        }
-
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(event.getWorld());
 
@@ -145,5 +107,4 @@ public class WorldGuardWeatherListener extends WeatherListener {
             }
         }
     }
-
 }

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

@@ -5,27 +5,21 @@
 */
 package com.sk89q.worldguard.bukkit;
 
-import org.bukkit.entity.*;
-import org.bukkit.event.Event;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.event.world.WorldListener;
-import org.bukkit.plugin.PluginManager;
+import org.bukkit.event.world.WorldLoadEvent;
 
-import java.util.logging.Logger;
-
-public class WorldGuardWorldListener extends WorldListener {
-
-    /**
-     * Logger for messages.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+public class WorldGuardWorldListener implements Listener {
 
     private WorldGuardPlugin plugin;
 
     /**
      * Construct the object;
      *
-     * @param plugin
+     * @param plugin The plugin instance
      */
     public WorldGuardWorldListener(WorldGuardPlugin plugin) {
         this.plugin = plugin;
@@ -35,30 +29,10 @@ public class WorldGuardWorldListener extends WorldListener {
      * Register events.
      */
     public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
-
-        registerEvent("CHUNK_LOAD", Event.Priority.Normal);
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
-    /**
-     * Register an event, but not failing if the event is not implemented.
-     *
-     * @param typeName
-     * @param priority
-     */
-    private void registerEvent(String typeName, Event.Priority priority) {
-        try {
-            Event.Type type = Event.Type.valueOf(typeName);
-            PluginManager pm = plugin.getServer().getPluginManager();
-            pm.registerEvent(type, this, priority, plugin);
-        } catch (IllegalArgumentException e) {
-            logger.info("WorldGuard: Unable to register missing event type " + typeName);
-        }
-    }
-
-    /**
-     * Called when a chunk is loaded.
-     */
+    @EventHandler
     public void onChunkLoad(ChunkLoadEvent event) {
         ConfigurationManager cfg = plugin.getGlobalStateManager();
 
@@ -66,19 +40,44 @@ public class WorldGuardWorldListener extends WorldListener {
             int removed = 0;
 
             for (Entity entity : event.getChunk().getEntities()) {
-                if (entity instanceof Item
-                        || (entity instanceof LivingEntity
-                        && !(entity instanceof Tameable)
-                        && !(entity instanceof Player))) {
+                if (BukkitUtil.isIntensiveEntity(entity)) {
                     entity.remove();
                     removed++;
                 }
             }
 
             if (removed > 50) {
-                logger.info("WG Halt-Act: " + removed + " entities (>50) auto-removed from "
+                plugin.getLogger().info("Halt-Act: " + removed + " entities (>50) auto-removed from "
                         + event.getChunk().toString());
             }
         }
     }
+
+    @EventHandler
+    public void onWorldLoad(WorldLoadEvent event) {
+        initWorld(event.getWorld());
+    }
+
+    /**
+     * Initialize the settings for the specified world
+     * @see WorldConfiguration#alwaysRaining
+     * @see WorldConfiguration#disableWeather
+     * @see WorldConfiguration#alwaysThundering
+     * @see WorldConfiguration#disableThunder
+     * @param world The specified world
+     */
+    public void initWorld(World world) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+        if (wcfg.alwaysRaining && !wcfg.disableWeather) {
+            world.setStorm(true);
+        } else if (wcfg.disableWeather && !wcfg.alwaysRaining) {
+            world.setStorm(false);
+        }
+        if (wcfg.alwaysThundering && !wcfg.disableThunder) {
+            world.setThundering(true);
+        } else if (wcfg.disableThunder && !wcfg.alwaysThundering) {
+            world.setStorm(false);
+        }
+    }
 }

src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java

@@ -23,22 +23,26 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.bukkit.ConfigurationManager;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldedit.blocks.ItemType;
 
 public class GeneralCommands {
+    private final WorldGuardPlugin plugin;
+
+    public GeneralCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
     
-    @Command(aliases = {"god"},
-            usage = "[player]",
-            desc = "Enable godmode on a player",
-            flags = "s", min = 0, max = 1)
-    public static void god(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @SuppressWarnings("deprecation")
+    @Command(aliases = {"god"}, usage = "[player]",
+            desc = "Enable godmode on a player", flags = "s", max = 1)
+    public void god(CommandContext args, CommandSender sender) throws CommandException {
         ConfigurationManager config = plugin.getGlobalStateManager();
         
         Iterable<Player> targets = null;
@@ -81,12 +85,10 @@ public class GeneralCommands {
         }
     }
     
-    @Command(aliases = {"ungod"},
-            usage = "[player]",
-            desc = "Disable godmode on a player",
-            flags = "s", min = 0, max = 1)
-    public static void ungod(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @SuppressWarnings("deprecation")
+    @Command(aliases = {"ungod"}, usage = "[player]",
+            desc = "Disable godmode on a player", flags = "s", max = 1)
+    public void ungod(CommandContext args, CommandSender sender) throws CommandException {
         ConfigurationManager config = plugin.getGlobalStateManager();
         
         Iterable<Player> targets = null;
@@ -128,12 +130,8 @@ public class GeneralCommands {
         }
     }
     
-    @Command(aliases = {"heal"},
-            usage = "[player]",
-            desc = "Heal a player",
-            flags = "s", min = 0, max = 1)
-    public static void heal(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
+    public void heal(CommandContext args,CommandSender sender) throws CommandException {
         
         Iterable<Player> targets = null;
         boolean included = false;
@@ -153,6 +151,7 @@ public class GeneralCommands {
 
         for (Player player : targets) {
             player.setHealth(20);
+            player.setFoodLevel(20);
             
             // Tell the user
             if (player.equals(sender)) {
@@ -174,12 +173,8 @@ public class GeneralCommands {
         }
     }
     
-    @Command(aliases = {"slay"},
-            usage = "[player]",
-            desc = "Slay a player",
-            flags = "s", min = 0, max = 1)
-    public static void slay(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
+    public void slay(CommandContext args, CommandSender sender) throws CommandException {
         
         Iterable<Player> targets = null;
         boolean included = false;
@@ -220,13 +215,9 @@ public class GeneralCommands {
         }
     }
     
-    @Command(aliases = {"locate"},
-            usage = "[player]",
-            desc = "Locate a player",
-            flags = "", min = 0, max = 1)
+    @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
     @CommandPermissions({"worldguard.locate"})
-    public static void locate(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void locate(CommandContext args, CommandSender sender) throws CommandException {
         
         Player player = plugin.checkPlayer(sender);
         
@@ -242,15 +233,13 @@ public class GeneralCommands {
         }
     }
     
-    @Command(aliases = {"stack"},
-            usage = "",
-            desc = "Stack items",
-            flags = "", min = 0, max = 0)
+    @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0)
     @CommandPermissions({"worldguard.stack"})
-    public static void stack(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void stack(CommandContext args, CommandSender sender) throws CommandException {
         
         Player player = plugin.checkPlayer(sender);
+        boolean ignoreMax = plugin.hasPermission(player, "worldguard.stack.illegitimate");
+        boolean ignoreDamaged = plugin.hasPermission(player, "worldguard.stack.damaged");
         
         ItemStack[] items = player.getInventory().getContents();
         int len = items.length;
@@ -262,17 +251,14 @@ public class GeneralCommands {
 
             // Avoid infinite stacks and stacks with durability
             if (item == null || item.getAmount() <= 0
-                    || ItemType.shouldNotStack(item.getTypeId())) {
+                    || (!ignoreMax && item.getMaxStackSize() == 1)) {
                 continue;
             }
 
-            // Ignore buckets
-            if (item.getTypeId() >= 325 && item.getTypeId() <= 327) {
-                continue;
-            }
+            int max = ignoreMax ? 64 : item.getMaxStackSize();
 
-            if (item.getAmount() < 64) {
-                int needed = 64 - item.getAmount(); // Number of needed items until 64
+            if (item.getAmount() < max) {
+                int needed = max - item.getAmount(); // Number of needed items until max
 
                 // Find another stack of the same type
                 for (int j = i + 1; j < len; j++) {
@@ -280,25 +266,28 @@ public class GeneralCommands {
 
                     // Avoid infinite stacks and stacks with durability
                     if (item2 == null || item2.getAmount() <= 0
-                            || ItemType.shouldNotStack(item.getTypeId())) {
+                            || (!ignoreMax && item.getMaxStackSize() == 1)) {
                         continue;
                     }
 
                     // Same type?
                     // Blocks store their color in the damage value
                     if (item2.getTypeId() == item.getTypeId() &&
-                            (!ItemType.usesDamageValue(item.getTypeId())
-                                    || item.getDurability() == item2.getDurability())) {
+                            ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
+                                    || item.getDurability() == item2.getDurability()) &&
+                                    ((item.getItemMeta() == null && item2.getItemMeta() == null)
+                                            || (item.getItemMeta() != null &&
+                                                item.getItemMeta().equals(item2.getItemMeta())))) {
                         // This stack won't fit in the parent stack
                         if (item2.getAmount() > needed) {
-                            item.setAmount(64);
+                            item.setAmount(max);
                             item2.setAmount(item2.getAmount() - needed);
                             break;
                         // This stack will
                         } else {
                             items[j] = null;
                             item.setAmount(item.getAmount() + item2.getAmount());
-                            needed = 64 - item.getAmount();
+                            needed = max - item.getAmount();
                         }
 
                         affected++;

src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java

@@ -20,21 +20,25 @@
 package com.sk89q.worldguard.bukkit.commands;
 
 import org.bukkit.command.CommandSender;
-import com.sk89q.minecraft.util.commands.*;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.NestedCommand;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 public class ProtectionCommands {
-    @Command(aliases = {"region"},
-            desc = "Region management commands")
-    @NestedCommand({RegionCommands.class, RegionMemberCommands.class})
-    public static void region(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @SuppressWarnings("unused")
+    private final WorldGuardPlugin plugin;
+
+    public ProtectionCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
     }
 
-    @Command(aliases = {"worldguard"},
-            desc = "WorldGuard commands")
+    @Command(aliases = {"region", "regions", "rg"}, desc = "Region management commands")
+    @NestedCommand({RegionCommands.class, RegionMemberCommands.class})
+    public void region(CommandContext args, CommandSender sender) {}
+
+    @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands")
     @NestedCommand({WorldGuardCommands.class})
-    public static void worldGuard(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-    }
+    public void worldGuard(CommandContext args, CommandSender sender) {}
 }

src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java

@@ -19,200 +19,246 @@
 
 package com.sk89q.worldguard.bukkit.commands;
 
-import java.io.IOException;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.RegionDBUtil;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.util.RegionUtil;
 
 // @TODO: A lot of code duplication here! Need to fix.
 
 public class RegionMemberCommands {
-    
+    private final WorldGuardPlugin plugin;
+
+    public RegionMemberCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
     @Command(aliases = {"addmember", "addmember"},
             usage = "<id> <members...>",
+            flags = "w:",
             desc = "Add a member to a region",
-            flags = "", min = 2, max = -1)
-    public static void addMember(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
+            min = 2)
+    public void addMember(CommandContext args, CommandSender sender) throws CommandException {
+        final World world;
+        Player player;
+        LocalPlayer localPlayer = null;
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            player = plugin.checkPlayer(sender);
+            localPlayer = plugin.wrapPlayer(player);
+            world = player.getWorld();
         }
 
+        String id = args.getString(0);
+
         RegionManager mgr = plugin.getGlobalRegionManager().get(world);
         ProtectedRegion region = mgr.getRegion(id);
 
         if (region == null) {
             throw new CommandException("Could not find a region by that ID.");
         }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addmember.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addmember.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.addmember." + id.toLowerCase());
+
+        id = region.getId();
+
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addmember.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addmember.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.addmember." + id.toLowerCase());
+            }
         }
 
-        RegionUtil.addToDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
+        RegionDBUtil.addToDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
 
         sender.sendMessage(ChatColor.YELLOW
                 + "Region '" + id + "' updated.");
-        
+
         try {
             mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
                     + e.getMessage());
         }
     }
-    
+
     @Command(aliases = {"addowner", "addowner"},
             usage = "<id> <owners...>",
+            flags = "w:",
             desc = "Add an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void addOwner(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
+            min = 2)
+    public void addOwner(CommandContext args, CommandSender sender) throws CommandException {
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            player = plugin.checkPlayer(sender);
+            localPlayer = plugin.wrapPlayer(player);
+            world = player.getWorld();
         }
 
+        String id = args.getString(0);
+
         RegionManager mgr = plugin.getGlobalRegionManager().get(world);
         ProtectedRegion region = mgr.getRegion(id);
 
         if (region == null) {
             throw new CommandException("Could not find a region by that ID.");
         }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
+
+        id = region.getId();
+
+        Boolean flag = region.getFlag(DefaultFlag.BUYABLE);
+        DefaultDomain owners = region.getOwners();
+        if (localPlayer != null) {
+            if (flag != null && flag && owners != null && owners.size() == 0) {
+                if (!plugin.hasPermission(player, "worldguard.region.unlimited")) {
+                    int maxRegionCount = plugin.getGlobalStateManager().get(world).getMaxRegionCount(player);
+                    if (maxRegionCount >= 0 && mgr.getRegionCountOfPlayer(localPlayer)
+                            >= maxRegionCount) {
+                        throw new CommandException("You already own the maximum allowed amount of regions.");
+                    }
+                }
+                plugin.checkPermission(sender, "worldguard.region.addowner.unclaimed." + id.toLowerCase());
+            } else {
+                if (region.isOwner(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
+                } else if (region.isMember(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
+                } else {
+                    plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
+                }
+            }
         }
 
-        RegionUtil.addToDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
+        RegionDBUtil.addToDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
 
         sender.sendMessage(ChatColor.YELLOW
                 + "Region '" + id + "' updated.");
-        
+
         try {
             mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
                     + e.getMessage());
         }
     }
-    
+
     @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
             usage = "<id> <owners...>",
+            flags = "w:",
             desc = "Remove an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void removeMember(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
+            min = 2)
+    public void removeMember(CommandContext args, CommandSender sender) throws CommandException {
+        final World world;
+        Player player;
+        LocalPlayer localPlayer = null;
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            player = plugin.checkPlayer(sender);
+            localPlayer = plugin.wrapPlayer(player);
+            world = player.getWorld();
         }
 
+        String id = args.getString(0);
+
         RegionManager mgr = plugin.getGlobalRegionManager().get(world);
         ProtectedRegion region = mgr.getRegion(id);
 
         if (region == null) {
             throw new CommandException("Could not find a region by that ID.");
         }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removemember.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removemember.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.removemember." + id.toLowerCase());
+
+        id = region.getId();
+
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removemember.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removemember.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.removemember." + id.toLowerCase());
+            }
         }
 
-        RegionUtil.removeFromDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
+        RegionDBUtil.removeFromDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
 
         sender.sendMessage(ChatColor.YELLOW
                 + "Region '" + id + "' updated.");
-        
+
         try {
             mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
                     + e.getMessage());
         }
     }
-    
+
     @Command(aliases = {"removeowner", "remowner"},
             usage = "<id> <owners...>",
+            flags = "w:",
             desc = "Remove an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void removeOwner(CommandContext args, WorldGuardPlugin plugin,
+            min = 2)
+    public void removeOwner(CommandContext args,
             CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
-        String id = args.getString(0);
-        
-        if (id.equalsIgnoreCase("__global__")) {
-            throw new CommandException("The region cannot be named __global__");
+        final World world;
+        Player player;
+        LocalPlayer localPlayer = null;
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            player = plugin.checkPlayer(sender);
+            localPlayer = plugin.wrapPlayer(player);
+            world = player.getWorld();
         }
 
+        String id = args.getString(0);
+
         RegionManager mgr = plugin.getGlobalRegionManager().get(world);
         ProtectedRegion region = mgr.getRegion(id);
 
         if (region == null) {
             throw new CommandException("Could not find a region by that ID.");
         }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removeowner.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removeowner.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.removeowner." + id.toLowerCase());
+
+        id = region.getId();
+
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removeowner.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removeowner.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.removeowner." + id.toLowerCase());
+            }
         }
 
-        RegionUtil.removeFromDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
+        RegionDBUtil.removeFromDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
 
         sender.sendMessage(ChatColor.YELLOW
                 + "Region '" + id + "' updated.");
-        
+
         try {
             mgr.save();
-        } catch (IOException e) {
-            throw new CommandException("Failed to write regions file: "
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
                     + e.getMessage());
         }
     }

src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java

@@ -19,23 +19,32 @@
 
 package com.sk89q.worldguard.bukkit.commands;
 
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
-import com.sk89q.minecraft.util.commands.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldguard.bukkit.BukkitUtil;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
 import com.sk89q.worldguard.bukkit.WorldConfiguration;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import org.bukkit.entity.*;
 
 public class ToggleCommands {
+    private final WorldGuardPlugin plugin;
 
-    @Command(aliases = {"stopfire"},
-            usage = "[<world>]", desc = "Disables all fire spread temporarily",
-            flags = "", min = 0, max = 1)
+    public ToggleCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"stopfire"}, usage = "[<world>]",
+            desc = "Disables all fire spread temporarily", max = 1)
     @CommandPermissions({"worldguard.fire-toggle.stop"})
-    public static void stopFire(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void stopFire(CommandContext args, CommandSender sender) throws CommandException {
         
         World world;
         
@@ -61,12 +70,10 @@ public class ToggleCommands {
         wcfg.fireSpreadDisableToggle = true;
     }
 
-    @Command(aliases = {"allowfire"},
-            usage = "[<world>]", desc = "Allows all fire spread temporarily",
-            flags = "", min = 0, max = 1)
+    @Command(aliases = {"allowfire"}, usage = "[<world>]",
+            desc = "Allows all fire spread temporarily", max = 1)
     @CommandPermissions({"worldguard.fire-toggle.stop"})
-    public static void allowFire(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void allowFire(CommandContext args, CommandSender sender) throws CommandException {
         
         World world;
         
@@ -90,12 +97,10 @@ public class ToggleCommands {
         wcfg.fireSpreadDisableToggle = false;
     }
 
-    @Command(aliases = {"halt-activity"},
-            usage = "", desc = "Attempts to cease as much activity in order to stop lag",
-            flags = "c", min = 0, max = 0)
+    @Command(aliases = {"halt-activity", "stoplag", "haltactivity"},
+            desc = "Attempts to cease as much activity in order to stop lag", flags = "c", max = 0)
     @CommandPermissions({"worldguard.halt-activity"})
-    public static void stopLag(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void stopLag(CommandContext args, CommandSender sender) throws CommandException {
 
         ConfigurationManager configManager = plugin.getGlobalStateManager();
 
@@ -115,10 +120,7 @@ public class ToggleCommands {
                 int removed = 0;
 
                 for (Entity entity : world.getEntities()) {
-                    if (entity instanceof Item
-                            || (entity instanceof LivingEntity
-                            && !(entity instanceof Tameable)
-                            && !(entity instanceof Player))) {
+                    if (BukkitUtil.isIntensiveEntity(entity)) {
                         entity.remove();
                         removed++;
                     }

src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java

@@ -23,40 +23,40 @@ import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.worldguard.bukkit.LoggerToChatHandler;
 import com.sk89q.worldguard.bukkit.ReportWriter;
+import com.sk89q.worldguard.bukkit.WGBukkit;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.util.PastebinPoster;
 import com.sk89q.worldguard.util.PastebinPoster.PasteCallback;
 
 public class WorldGuardCommands {
+    private final WorldGuardPlugin plugin;
 
-    @Command(aliases = {"version"},
-            usage = "",
-            desc = "Get the WorldGuard version",
-            flags = "", min = 0, max = 0)
-    public static void version(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public WorldGuardCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"version"}, desc = "Get the WorldGuard version", max = 0)
+    public void version(CommandContext args, CommandSender sender) throws CommandException {
         sender.sendMessage(ChatColor.YELLOW
                 + "WorldGuard " + plugin.getDescription().getVersion());
         sender.sendMessage(ChatColor.YELLOW
                 + "http://www.sk89q.com");
     }
 
-    @Command(aliases = {"reload"},
-            usage = "",
-            desc = "Reload WorldGuard configuration",
-            flags = "", min = 0, max = 0)
+    @Command(aliases = {"reload"}, desc = "Reload WorldGuard configuration", max = 0)
     @CommandPermissions({"worldguard.reload"})
-    public static void relload(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void reload(CommandContext args, CommandSender sender) throws CommandException {
         
         LoggerToChatHandler handler = null;
         Logger minecraftLogger = null;
@@ -73,6 +73,7 @@ public class WorldGuardCommands {
             plugin.getGlobalRegionManager().unload();
             plugin.getGlobalStateManager().load();
             plugin.getGlobalRegionManager().preload();
+            WGBukkit.cleanCache();
             sender.sendMessage("WorldGuard configuration reloaded.");
         } catch (Throwable t) {
             sender.sendMessage("Error while reloading: "
@@ -84,13 +85,9 @@ public class WorldGuardCommands {
         }
     }
     
-    @Command(aliases = {"report"},
-            usage = "",
-            desc = "Writes a report on WorldGuard",
-            flags = "p", min = 0, max = 0)
+    @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0)
     @CommandPermissions({"worldguard.report"})
-    public static void report(CommandContext args, WorldGuardPlugin plugin,
-            final CommandSender sender) throws CommandException {
+    public void report(CommandContext args, final CommandSender sender) throws CommandException {
         
         File dest = new File(plugin.getDataFolder(), "report.txt");
         ReportWriter report = new ReportWriter(plugin);
@@ -122,4 +119,21 @@ public class WorldGuardCommands {
         }
 
     }
+
+    @Command(aliases = {"flushstates", "clearstates"},
+            usage = "[player]", desc = "Flush the state manager", max = 1)
+    @CommandPermissions("worldguard.flushstates")
+    public void flushStates(CommandContext args, CommandSender sender) throws CommandException {
+        if (args.argsLength() == 0) {
+            plugin.getFlagStateManager().forgetAll();
+            sender.sendMessage("Cleared all states.");
+        } else {
+            Player player = plugin.getServer().getPlayer(args.getString(0));
+            if (player != null) {
+                plugin.getFlagStateManager().forget(player);
+                sender.sendMessage("Cleared states for player \"" + player.getName() + "\".");
+            }
+        }
+    }
+
 }

src/main/java/com/sk89q/worldguard/chest/ChestProtection.java

@@ -31,9 +31,9 @@ public interface ChestProtection {
     /**
      * Returns whether a block is protected.
      * 
-     * @param block
-     * @param player
-     * @return
+     * @param block The block to check
+     * @param player The player to check
+     * @return Whether the block is protected for player
      */
     public boolean isProtected(Block block, Player player);
 
@@ -41,27 +41,37 @@ public interface ChestProtection {
      * Returns whether a location where a chest block is trying to be created 
      * is protected. 
      * 
-     * @param block
-     * @param player
-     * @return
+     * @param block The block to check
+     * @param player The player to check
+     * @return Whether {@code player} can place a block at the specified block
      */
     public boolean isProtectedPlacement(Block block, Player player);
 
     /**
      * Returns whether an adjacent chest is protected.
      * 
-     * @param searchBlock
-     * @param player
-     * @return
+     * @param searchBlock The block to check
+     * @param player The player to check
+     * @return Whether {@code searchBlock} is protected from access by {@code player}
      */
     public boolean isAdjacentChestProtected(Block searchBlock, Player player);
 
     /**
      * Returns whether a material is a chest.
-     * 
-     * @param material
-     * @return
+     *
+     * @param material The material to check
+     * @deprecated see {@link #isChest(int)}
+     * @return {@link #isChest(int)}
      */
+    @Deprecated
     public boolean isChest(Material material);
 
+    /**
+     * Returns whether a material is a chest.
+     *
+     * @param type The type to check
+     * @return Whether type is a 'chest' (block that can be protected)
+     */
+    public boolean isChest(int type);
+
 }

src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java

@@ -19,6 +19,7 @@
 
 package com.sk89q.worldguard.chest;
 
+import com.sk89q.worldedit.blocks.BlockID;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
@@ -33,10 +34,10 @@ import org.bukkit.entity.Player;
 public class SignChestProtection implements ChestProtection {
     
     public boolean isProtected(Block block, Player player) {
-        if (isChest(block.getType())) {
+        if (isChest(block.getTypeId())) {
             Block below = block.getRelative(0, -1, 0);
             return isProtectedSignAround(below, player);
-        } else if (block.getType() == Material.SIGN_POST) {
+        } else if (block.getTypeId() == BlockID.SIGN_POST) {
             return isProtectedSignAndChestBinary(block, player);
         } else {
             Block above = block.getRelative(0, 1, 0);
@@ -56,23 +57,23 @@ public class SignChestProtection implements ChestProtection {
         
         side = searchBlock;
         res = isProtectedSign(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(-1, 0, 0);
         res = isProtectedSignAndChest(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(1, 0, 0);
         res = isProtectedSignAndChest(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(0, 0, -1);
         res = isProtectedSignAndChest(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(0, 0, 1);
         res = isProtectedSignAndChest(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         return false;
     }
@@ -106,7 +107,7 @@ public class SignChestProtection implements ChestProtection {
     }
     
     private Boolean isProtectedSignAndChest(Block block, Player player) {
-        if (!isChest(block.getRelative(0, 1, 0).getType())) {
+        if (!isChest(block.getRelative(0, 1, 0).getTypeId())) {
             return null;
         }
         return isProtectedSign(block, player);
@@ -114,10 +115,7 @@ public class SignChestProtection implements ChestProtection {
     
     private boolean isProtectedSignAndChestBinary(Block block, Player player) {
         Boolean res = isProtectedSignAndChest(block, player);
-        if (res == null || res == false) {
-            return false;
-        }
-        return true;
+        return !(res == null || !res);
     }
 
     public boolean isAdjacentChestProtected(Block searchBlock, Player player) {
@@ -126,31 +124,36 @@ public class SignChestProtection implements ChestProtection {
         
         side = searchBlock;
         res = isProtected(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(-1, 0, 0);
         res = isProtected(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(1, 0, 0);
         res = isProtected(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(0, 0, -1);
         res = isProtected(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         side = searchBlock.getRelative(0, 0, 1);
         res = isProtected(side, player);
-        if (res != null && res == true) return res;
+        if (res != null && res) return res;
         
         return false;
     }
-    
+
+    @Deprecated
     public boolean isChest(Material material) {
-        return material == Material.CHEST
-                || material == Material.DISPENSER
-                || material == Material.FURNACE
-                || material == Material.BURNING_FURNACE;
+        return isChest(material.getId());
+    }
+
+    public boolean isChest(int type) {
+        return type == BlockID.CHEST
+                || type == BlockID.DISPENSER
+                || type == BlockID.FURNACE
+                || type == BlockID.BURNING_FURNACE;
     }
 }

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

@@ -19,10 +19,14 @@
 
 package com.sk89q.worldguard.domains;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
+
 import com.sk89q.worldguard.LocalPlayer;
 
 public class DefaultDomain implements Domain {
@@ -66,27 +70,35 @@ public class DefaultDomain implements Domain {
         return players;
     }
 
+    @Override
     public boolean contains(LocalPlayer player) {
-        if (players.contains(player.getName().toLowerCase())) {
+        if (contains(player.getName())) {
             return true;
         }
-        
+
         for (String group : groups) {
             if (player.hasGroup(group)) {
                 return true;
             }
         }
-        
+
         return false;
     }
-    
+
+    @Override
+    public boolean contains(String playerName) {
+        return players.contains(playerName.toLowerCase());
+    }
+
     public int size() {
-        return groups.size();
+        return groups.size() + players.size();
     }
     
     public String toPlayersString() {
         StringBuilder str = new StringBuilder();
-        for (Iterator<String> it = players.iterator(); it.hasNext(); ) {
+        List<String> output = new ArrayList<String>(players);
+        Collections.sort(output, String.CASE_INSENSITIVE_ORDER);
+        for (Iterator<String> it = output.iterator(); it.hasNext();) {
             str.append(it.next());
             if (it.hasNext()) {
                 str.append(", ");

src/main/java/com/sk89q/worldguard/domains/Domain.java

@@ -5,9 +5,18 @@ import com.sk89q.worldguard.LocalPlayer;
 public interface Domain {
     /**
      * Returns true if a domain contains a player.
-     * 
-     * @param player
-     * @return
+     *
+     * @param player The player to check
+     * @return whether this domain contains {@code player}
      */
-    public boolean contains(LocalPlayer player);
+    boolean contains(LocalPlayer player);
+
+    /**
+     * Returns true if a domain contains a player.<br />
+     * This method doesn't check for groups!
+     *
+     * @param playerName The name of the player to check
+     * @return whether this domain contains a player by that name
+     */
+    boolean contains(String playerName);
 }

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

@@ -19,37 +19,49 @@
 
 package com.sk89q.worldguard.domains;
 
-import java.util.Set;
 import java.util.LinkedHashSet;
+import java.util.Set;
+
 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();
     }
 
+    @Override
     public boolean contains(LocalPlayer player) {
         for (Domain domain : domains) {
             if (domain.contains(player)) {
                 return true;
             }
         }
-        
+
         return false;
     }
 
+    @Override
+    public boolean contains(String playerName) {
+        for (Domain domain : domains) {
+            if (domain.contains(playerName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

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

@@ -20,21 +20,22 @@
 package com.sk89q.worldguard.domains;
 
 import java.util.Arrays;
-import java.util.Set;
 import java.util.LinkedHashSet;
+import java.util.Set;
+
 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);
     }
@@ -45,12 +46,16 @@ public class GroupDomain implements Domain {
                 return true;
             }
         }
-        
+
         return false;
     }
-    
+
+    @Override
+    public boolean contains(String playerName) {
+        return false; // GroupDomains can't contain player names.
+    }
+
     public int size() {
         return groups.size();
     }
-
 }

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

@@ -19,35 +19,40 @@
 
 package com.sk89q.worldguard.domains;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
+
 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());
+        return contains(player.getName());
     }
-    
+
+    @Override
+    public boolean contains(String playerName) {
+        return players.contains(playerName.toLowerCase());
+    }
+
     public int size() {
         return players.size();
     }
-
 }

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

@@ -18,21 +18,20 @@
  */
 package com.sk89q.worldguard.protection;
 
+import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.flags.*;
 import com.sk89q.worldguard.protection.flags.StateFlag.State;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import com.sk89q.worldguard.LocalPlayer;
+
+import java.util.*;
 
 /**
- * Represents a setFlag of regions and their rules as applied to one point or
- * region.
+ * Represents a set of regions for a particular point or area and the rules
+ * that are represented by that set. An instance of this can be used to
+ * query the value of a flag or check if a player can build in the respective
+ * region or point. This object contains the list of applicable regions and so
+ * the expensive search of regions that are in the desired area has already
+ * been completed.
  * 
  * @author sk89q
  */
@@ -44,8 +43,8 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     /**
      * Construct the object.
      * 
-     * @param applicable
-     * @param globalRegion 
+     * @param applicable The regions contained in this set
+     * @param globalRegion The global region, set aside for special handling.
      */
     public ApplicableRegionSet(Collection<ProtectedRegion> applicable,
             ProtectedRegion globalRegion) {
@@ -56,38 +55,65 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     /**
      * Checks if a player can build in an area.
      * 
-     * @param player
-     * @return
+     * @param player The player to chec
+     * @return build ability
      */
     public boolean canBuild(LocalPlayer player) {
-        return internalGetState(DefaultFlag.BUILD, player);
+        return internalGetState(DefaultFlag.BUILD, player, null);
     }
-    
+
+    public boolean canConstruct(LocalPlayer player) {
+        final RegionGroup flag = getFlag(DefaultFlag.CONSTRUCT, player);
+        return RegionGroupFlag.isMember(this, flag, player);
+    }
+
     /**
-     * Checks if a player can build in an area.
+     * Checks if a player can use buttons and such in an area.
      * 
-     * @param player
-     * @return
+     * @param player The player to check
+     * @return able to use items
+     * @deprecated This method seems to be the opposite of its name
      */
+    @Deprecated
     public boolean canUse(LocalPlayer player) {
-        return internalGetState(DefaultFlag.USE, player);
+        return !allows(DefaultFlag.USE, player)
+                && !canBuild(player);
+    }
+
+    /**
+     * Gets the state of a state flag. This cannot be used for the build flag.
+     *
+     * @param flag flag to check
+     * @return whether it is allowed
+     * @throws IllegalArgumentException if the build flag is given
+     */
+    public boolean allows(StateFlag flag) {
+        if (flag == DefaultFlag.BUILD) {
+            throw new IllegalArgumentException("Can't use build flag with allows()");
+        }
+        return internalGetState(flag, null, null);
     }
     
     /**
      * Gets the state of a state flag. This cannot be used for the build flag.
      * 
-     * @param flag
-     * @return
+     * @param flag flag to check
+     * @param player player (used by some flags)
+     * @return whether the state is allows for it
+     * @throws IllegalArgumentException if the build flag is given
      */
-    public boolean allows(StateFlag flag) {
-        return internalGetState(flag, null);
+    public boolean allows(StateFlag flag, LocalPlayer player) {
+        if (flag == DefaultFlag.BUILD) {
+            throw new IllegalArgumentException("Can't use build flag with allows()");
+        }
+        return internalGetState(flag, null, player);
     }
     
     /**
      * Indicates whether a player is an owner of all regions in this set.
      * 
-     * @param player
-     * @return
+     * @param player player
+     * @return whether the player is an owner of all regions
      */
     public boolean isOwnerOfAll(LocalPlayer player) {
         for (ProtectedRegion region : applicable) {
@@ -103,8 +129,8 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
      * Indicates whether a player is an owner or member of all regions in
      * this set.
      * 
-     * @param player
-     * @return
+     * @param player player
+     * @return whether the player is a member of all regions
      */
     public boolean isMemberOfAll(LocalPlayer player) {
         for (ProtectedRegion region : applicable) {
@@ -119,24 +145,35 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     /**
      * 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
+     * @param flag flag to check
+     * @param player null to not check owners and members
+     * @param groupPlayer player to use for the group flag check
+     * @return the allow/deny state for the flag
      */
-    private boolean internalGetState(StateFlag flag, LocalPlayer player) {
+    private boolean internalGetState(StateFlag flag, LocalPlayer player,
+                                     LocalPlayer groupPlayer) {
         boolean found = false;
+        boolean hasFlagDefined = false;
         boolean allowed = false; // Used for ALLOW override
         boolean def = flag.getDefault();
         
         // Handle defaults
         if (globalRegion != null) {
             State globalState = globalRegion.getFlag(flag);
-            
+
             // The global region has this flag set
             if (globalState != null) {
-                def = (globalState == State.ALLOW);
+                // Build flag is very special
+                if (player != null && globalRegion.hasMembersOrOwners()) {
+                    def = globalRegion.isMember(player) && (globalState == State.ALLOW);
+                } else {
+                    def = (globalState == State.ALLOW);
+                }
+            } else {
+                // Build flag is very special
+                if (player != null && globalRegion.hasMembersOrOwners()) {
+                    def = globalRegion.isMember(player);
+                }
             }
         }
         
@@ -169,16 +206,12 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
         Set<ProtectedRegion> needsClear = new HashSet<ProtectedRegion>();
         Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
 
-        Iterator<ProtectedRegion> it = applicable.iterator();
-        
-        while (it.hasNext()) {
-            ProtectedRegion region = it.next();
-
+        for (ProtectedRegion region : applicable) {
             // Ignore lower priority regions
-            if (found && region.getPriority() < lastPriority) {
+            if (hasFlagDefined && region.getPriority() < lastPriority) {
                 break;
             }
-            
+
             lastPriority = region.getPriority();
 
             // Ignore non-build regions
@@ -186,7 +219,18 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
                     && region.getFlag(DefaultFlag.PASSTHROUGH) == State.ALLOW) {
                 continue;
             }
-            
+
+            // Check group permissions
+            if (groupPlayer != null && flag.getRegionGroupFlag() != null) {
+                RegionGroup group = region.getFlag(flag.getRegionGroupFlag());
+                if (group == null) {
+                    group = flag.getRegionGroupFlag().getDefault();
+                }
+                if (!RegionGroupFlag.isMember(region, group, groupPlayer)) {
+                    continue;
+                }
+            }
+
             State v = region.getFlag(flag);
 
             // Allow DENY to override everything
@@ -199,6 +243,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
             if (v == State.ALLOW) {
                 allowed = true;
                 found = true;
+                hasFlagDefined = true;
                 continue;
             }
 
@@ -206,6 +251,8 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
             // on membership, so we have to check for parent-child
             // relationships
             if (player != null) {
+                hasFlagDefined = true;
+
                 if (hasCleared.contains(region)) {
                     // Already cleared, so do nothing
                 } else {
@@ -221,16 +268,16 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
             found = true;
         }
 
-        return found == false ? def :
+        return !found ? def :
                 (allowed || (player != null && needsClear.size() == 0));
     }
 
     /**
      * Clear a region's parents for isFlagAllowed().
      * 
-     * @param needsClear
-     * @param hasCleared
-     * @param region
+     * @param needsClear The regions that should be cleared
+     * @param hasCleared The regions already cleared
+     * @param region The region to start from
      */
     private void clearParents(Set<ProtectedRegion> needsClear,
             Set<ProtectedRegion> hasCleared, ProtectedRegion region) {
@@ -246,45 +293,73 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     }
 
     /**
-     * Gets the value of a flag. Do not use this for state flags.
-     * 
-     * @param flag 
-     * @param <T> 
-     * @param <V> 
-     * @return
+     * @see #getFlag(com.sk89q.worldguard.protection.flags.Flag, com.sk89q.worldguard.LocalPlayer)
+     * @param flag flag to check
+     * @return value of the flag
      */
     public <T extends Flag<V>, V> V getFlag(T flag) {
+        return getFlag(flag, null);
+    }
+
+    /**
+     * Gets the value of a flag. Do not use this for state flags
+     * (use {@link #allows(StateFlag, LocalPlayer)} for that).
+     * 
+     * @param flag flag to check
+     * @param groupPlayer player to check {@link RegionGroup}s against
+     * @return value of the flag
+     * @throws IllegalArgumentException if a StateFlag is given
+     */
+    public <T extends Flag<V>, V> V getFlag(T flag, LocalPlayer groupPlayer) {
+        /*
+        if (flag instanceof StateFlag) {
+            throw new IllegalArgumentException("Cannot use StateFlag with getFlag()");
+        }
+        */
+
         int lastPriority = 0;
         boolean found = false;
 
         Map<ProtectedRegion, V> needsClear = new HashMap<ProtectedRegion, V>();
         Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
 
-        Iterator<ProtectedRegion> it = applicable.iterator();
-
-        while (it.hasNext()) {
-            ProtectedRegion region = it.next();
-
+        for (ProtectedRegion region : applicable) {
             // Ignore lower priority regions
             if (found && region.getPriority() < lastPriority) {
                 break;
             }
 
+            // Check group permissions
+            if (groupPlayer != null && flag.getRegionGroupFlag() != null) {
+                RegionGroup group = region.getFlag(flag.getRegionGroupFlag());
+                if (group == null) {
+                    group = flag.getRegionGroupFlag().getDefault();
+                }
+                if (!RegionGroupFlag.isMember(region, group, groupPlayer)) {
+                    continue;
+                }
+            }
+
             if (hasCleared.contains(region)) {
                 // Already cleared, so do nothing
-            } else if (region.getFlag(flag) != null){
+            } else if (region.getFlag(flag) != null) {
                 clearParents(needsClear, hasCleared, region);
-                
+
                 needsClear.put(region, region.getFlag(flag));
+
+                found = true;
             }
-            
-            found = true;
+
             lastPriority = region.getPriority();
         }
         
         try {
             return needsClear.values().iterator().next();
         } catch (NoSuchElementException e) {
+            if (globalRegion != null) {
+                V gFlag = globalRegion.getFlag(flag);
+                if (gFlag != null) return gFlag;
+            }
             return null;
         }
     }
@@ -292,9 +367,9 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     /**
      * Clear a region's parents for getFlag().
      * 
-     * @param needsClear
-     * @param hasCleared
-     * @param region
+     * @param needsClear The regions that should be cleared
+     * @param hasCleared The regions already cleared
+     * @param region The region to start from
      */
     private void clearParents(Map<ProtectedRegion, ?> needsClear,
             Set<ProtectedRegion> hasCleared, ProtectedRegion region) {
@@ -312,7 +387,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     /**
      * Get the number of regions that are included.
      * 
-     * @return
+     * @return the size of this ApplicbleRegionSet
      */
     public int size() {
         return applicable.size();
@@ -320,8 +395,6 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     
     /**
      * Get an iterator of affected regions.
-     * 
-     * @return
      */
     public Iterator<ProtectedRegion> iterator() {
         return applicable.iterator();

src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java

@@ -19,51 +19,55 @@
 package com.sk89q.worldguard.protection;
 
 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.BukkitUtil;
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.databases.YAMLDatabase;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.FlatRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
+
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.HashMap;
-import java.util.logging.Logger;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.bukkit.BukkitUtil;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldConfiguration;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.databases.MySQLDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.YAMLDatabase;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
 /**
  * This class keeps track of region information for every world. It loads
  * world region information as needed.
- * 
+ *
  * @author sk89q
  * @author Redecouverte
  */
 public class GlobalRegionManager {
 
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
     /**
      * Reference to the plugin.
      */
     private WorldGuardPlugin plugin;
-    
+
     /**
      * Reference to the global configuration.
      */
     private ConfigurationManager config;
-    
+
     /**
      * Map of managers per-world.
      */
-    private HashMap<String, RegionManager> managers;
-    
+    private ConcurrentHashMap<String, RegionManager> managers;
+
     /**
      * Stores the list of modification dates for the world files. This allows
      * WorldGuard to reload files as needed.
@@ -72,13 +76,13 @@ public class GlobalRegionManager {
 
     /**
      * Construct the object.
-     * 
-     * @param plugin 
+     *
+     * @param plugin The plugin instance
      */
     public GlobalRegionManager(WorldGuardPlugin plugin) {
         this.plugin = plugin;
         config = plugin.getGlobalStateManager();
-        managers = new HashMap<String, RegionManager>();
+        managers = new ConcurrentHashMap<String, RegionManager>();
         lastModified = new HashMap<String, Long>();
     }
 
@@ -89,12 +93,12 @@ public class GlobalRegionManager {
         managers.clear();
         lastModified.clear();
     }
-    
+
     /**
      * Get the path for a world's regions file.
-     * 
-     * @param name
-     * @return
+     *
+     * @param name The name of the world
+     * @return The region file path for a world's region file
      */
     protected File getPath(String name) {
         return new File(plugin.getDataFolder(),
@@ -103,14 +107,13 @@ public class GlobalRegionManager {
 
     /**
      * Unload region information for a world.
-     * 
-     * @param name
+     *
+     * @param name The name of the world to unload
      */
     public void unload(String name) {
-        RegionManager manager = managers.get(name);
+        RegionManager manager = managers.remove(name);
 
         if (manager != null) {
-            managers.remove(name);
             lastModified.remove(name);
         }
     }
@@ -123,39 +126,65 @@ public class GlobalRegionManager {
         lastModified.clear();
     }
 
+    public RegionManager load(World world) {
+        RegionManager manager = create(world);
+        managers.put(world.getName(), manager);
+        return manager;
+    }
+
     /**
      * Load region information for a world.
-     * 
-     * @param world
-     * @return 
+     *
+     * @param world The world to load a RegionManager for
+     * @return the loaded RegionManager
      */
-    public RegionManager load(World world) {
+    public RegionManager create(World world) {
         String name = world.getName();
-        File file = getPath(name);
-        
+        boolean sql = config.useSqlDatabase;
+        ProtectionDatabase database;
+        File file = null;
+
         try {
+            if (!sql) {
+                file = getPath(name);
+                database = new YAMLDatabase(file, plugin.getLogger());
+
+                // Store the last modification date so we can track changes
+                lastModified.put(name, file.lastModified());
+            } else {
+                database = new MySQLDatabase(config, name, plugin.getLogger());
+            }
+
             // Create a manager
-            RegionManager manager = new FlatRegionManager(new YAMLDatabase(file));
-            managers.put(name, manager);
+            RegionManager manager = new PRTreeRegionManager(database);
             manager.load();
 
-            logger.info("WorldGuard: " + manager.getRegions().size()
-                    + " regions loaded for '" + name + "'");
+            if (plugin.getGlobalStateManager().get(world).summaryOnStart) {
+                plugin.getLogger().info(manager.getRegions().size()
+                        + " regions loaded for '" + name + "'");
+            }
 
-            // Store the last modification date so we can track changes
-            lastModified.put(name, file.lastModified());
-            
             return manager;
+        } catch (ProtectionDatabaseException e) {
+            String logStr = "Failed to load regions from ";
+            if (sql) {
+                logStr += "SQL Database <" + config.sqlDsn + "> ";
+            } else {
+                logStr += "file \"" + file + "\" ";
+            }
+
+            plugin.getLogger().log(Level.SEVERE, logStr + " : " + e.getMessage());
+            e.printStackTrace();
         } catch (FileNotFoundException e) {
-        } catch (IOException e) {
-            logger.warning("WorldGuard: Failed to load regions from file "
-                    + file.getAbsolutePath() + " : " + e.getMessage());
+            plugin.getLogger().log(Level.SEVERE, "Error loading regions for world \""
+                    + name + "\": " + e.toString() + "\n\t" + e.getMessage());
+            e.printStackTrace();
         }
-        
-        // @TODO: THIS CREATES PROBLEMS!!
+
+        // @TODO: THIS CREATES PROBLEMS!!one!!1!!eleven!!1!!!
         return null;
     }
-    
+
     /**
      * Preloads region managers for all worlds.
      */
@@ -171,11 +200,13 @@ public class GlobalRegionManager {
      * have changed.
      */
     public void reloadChanged() {
+        if (config.useSqlDatabase) return;
+
         for (String name : managers.keySet()) {
             File file = getPath(name);
 
             Long oldDate = lastModified.get(name);
-            
+
             if (oldDate == null) {
                 oldDate = 0L;
             }
@@ -183,70 +214,87 @@ public class GlobalRegionManager {
             try {
                 if (file.lastModified() > oldDate) {
                     World world = plugin.getServer().getWorld(name);
-                    
+
                     if (world != null) {
                         load(world);
                     }
                 }
-            } catch (Exception e) {
+            } catch (Exception ignore) {
             }
         }
     }
 
     /**
      * Get the region manager for a particular world.
-     * 
-     * @param world
-     * @return
+     *
+     * @param world The world to get a RegionManager for
+     * @return The region manager.
      */
     public RegionManager get(World world) {
         RegionManager manager = managers.get(world.getName());
+        RegionManager newManager = null;
 
-        if (manager == null) {
-            manager = load(world);
+        while (manager == null) {
+            if (newManager == null) {
+                newManager = create(world);
+            }
+            managers.putIfAbsent(world.getName(), newManager);
+            manager = managers.get(world.getName());
         }
 
         return manager;
     }
-    
+
     /**
      * Returns whether the player can bypass.
-     * 
-     * @param player
-     * @param world
-     * @return
+     *
+     * @param player The player to check
+     * @param world The world to check for
+     * @return Whether {@code player} has bypass permission for {@code world}
+     */
+    public boolean hasBypass(LocalPlayer player, World world) {
+        return player.hasPermission("worldguard.region.bypass."
+                        + world.getName());
+    }
+
+    /**
+     * Returns whether the player can bypass.
+     *
+     * @param player The player to check
+     * @param world The world to check
+     * @return Whether {@code player} has bypass permission for {@code world}
      */
     public boolean hasBypass(Player player, World world) {
         return plugin.hasPermission(player, "worldguard.region.bypass."
-                        + world.getName());
+                + world.getName());
     }
-    
+
     /**
      * Check if a player has permission to build at a block.
-     * 
-     * @param player
-     * @param block 
-     * @return
+     *
+     * @param player The player to check
+     * @param block The block to check at
+     * @return Whether {@code player} can build at {@code block}'s location
      */
     public boolean canBuild(Player player, Block block) {
         return canBuild(player, block.getLocation());
     }
-    
+
     /**
      * Check if a player has permission to build at a location.
-     * 
-     * @param player
-     * @param loc 
-     * @return
+     *
+     * @param player The player to check
+     * @param loc The location to check
+     * @return Whether {@code player} can build at {@code loc}
      */
     public boolean canBuild(Player player, Location loc) {
         World world = loc.getWorld();
         WorldConfiguration worldConfig = config.get(world);
-        
+
         if (!worldConfig.useRegions) {
             return true;
         }
-    
+
         LocalPlayer localPlayer = plugin.wrapPlayer(player);
 
         if (!hasBypass(player, world)) {
@@ -260,23 +308,65 @@ public class GlobalRegionManager {
 
         return true;
     }
-    
-    /**
-     * Checks to see whether a flag is allowed.
-     * 
-     * @param flag
-     * @param loc
-     * @return
-     */
-    public boolean allows(StateFlag flag, Location loc) {
+
+    public boolean canConstruct(Player player, Block block) {
+        return canConstruct(player, block.getLocation());
+    }
+
+    public boolean canConstruct(Player player, Location loc) {
         World world = loc.getWorld();
         WorldConfiguration worldConfig = config.get(world);
-        
+
         if (!worldConfig.useRegions) {
             return true;
         }
-        
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        return mgr.getApplicableRegions(toVector(loc)).allows(flag);
+
+        LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+        if (!hasBypass(player, world)) {
+            RegionManager mgr = get(world);
+
+            final ApplicableRegionSet applicableRegions = mgr.getApplicableRegions(BukkitUtil.toVector(loc));
+            if (!applicableRegions.canBuild(localPlayer)) {
+                return false;
+            }
+            if (!applicableRegions.canConstruct(localPlayer)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks to see whether a flag is allowed.
+     *
+     * @see #allows(com.sk89q.worldguard.protection.flags.StateFlag, org.bukkit.Location, com.sk89q.worldguard.LocalPlayer)
+     * @param flag The flag to check
+     * @param loc The location to check the flag at
+     * @return Whether the flag is allowed
+     */
+    public boolean allows(StateFlag flag, Location loc) {
+        return allows(flag, loc, null);
+    }
+
+    /**
+     * Checks to see whether a flag is allowed.
+     *
+     * @param flag The flag to check
+     * @param loc The location to check the flag at
+     * @param player The player to check for the flag's {@link com.sk89q.worldguard.protection.flags.RegionGroup}
+     * @return Whether the flag is allowed
+     */
+    public boolean allows(StateFlag flag, Location loc, LocalPlayer player) {
+        World world = loc.getWorld();
+        WorldConfiguration worldConfig = config.get(world);
+
+        if (!worldConfig.useRegions) {
+            return true;
+        }
+
+        RegionManager mgr = get(world);
+        return mgr.getApplicableRegions(toVector(loc)).allows(flag, player);
     }
 }

src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldguard.protection.databases;
 
-import java.io.IOException;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 
 public abstract class AbstractProtectionDatabase implements ProtectionDatabase {
@@ -27,9 +26,9 @@ public abstract class AbstractProtectionDatabase implements ProtectionDatabase {
     /**
      * Load the list of regions into a region manager.
      * 
-     * @throws IOException
+     * @throws ProtectionDatabaseException
      */
-    public void load(RegionManager manager) throws IOException {
+    public void load(RegionManager manager) throws ProtectionDatabaseException {
         load();
         manager.setRegions(getRegions());
     }
@@ -37,9 +36,9 @@ public abstract class AbstractProtectionDatabase implements ProtectionDatabase {
     /**
      * Save the list of regions from a region manager.
      * 
-     * @throws IOException
+     * @throws ProtectionDatabaseException
      */
-    public void save(RegionManager manager) throws IOException {
+    public void save(RegionManager manager) throws ProtectionDatabaseException {
         setRegions(manager.getRegions());
         save();
     }

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

@@ -19,89 +19,108 @@
 
 package com.sk89q.worldguard.protection.databases;
 
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.flags.StateFlag.State;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 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 com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag.State;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
 import com.sk89q.worldguard.util.ArrayReader;
 
 /**
  * Represents a protected area database that uses CSV files.
- * 
+ *
  * @author sk89q
  */
 public class CSVDatabase extends AbstractProtectionDatabase {
-    private static Logger logger = Logger.getLogger("Minecraft.WorldGuard");
     
+    private static final Map<String, StateFlag> legacyFlagCodes = new HashMap<String, StateFlag>();
+    static {
+        legacyFlagCodes.put("z", DefaultFlag.PASSTHROUGH);
+        legacyFlagCodes.put("b", DefaultFlag.BUILD);
+        legacyFlagCodes.put("p", DefaultFlag.PVP);
+        legacyFlagCodes.put("m", DefaultFlag.MOB_DAMAGE);
+        legacyFlagCodes.put("c", DefaultFlag.CREEPER_EXPLOSION);
+        legacyFlagCodes.put("t", DefaultFlag.TNT);
+        legacyFlagCodes.put("l", DefaultFlag.LIGHTER);
+        legacyFlagCodes.put("f", DefaultFlag.FIRE_SPREAD);
+        legacyFlagCodes.put("F", DefaultFlag.LAVA_FIRE);
+        legacyFlagCodes.put("C", DefaultFlag.CHEST_ACCESS);
+    }
+
+    private final Logger logger;
+
     /**
      * References the CSV file.
      */
-    private File file;
+    private final 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
+     *
+     * @param file The file in CSV format containing the region database
+     * @param logger The logger to log errors to
      */
-    public CSVDatabase(File file) {
+    public CSVDatabase(File file, Logger logger) {
         this.file = file;
+        this.logger = logger;
     }
 
     /**
      * Saves the database.
      */
-    public void save() throws IOException {
+    public void save() throws ProtectionDatabaseException {
         throw new UnsupportedOperationException("CSV format is no longer implemented");
     }
 
-    /**
-     * Load the database from file.
-     */
-    public void load() throws IOException {
+    public void load() throws ProtectionDatabaseException {
         Map<String,ProtectedRegion> regions =
                 new HashMap<String,ProtectedRegion>();
         Map<ProtectedRegion,String> parentSets =
                 new LinkedHashMap<ProtectedRegion, String>();
-        
-        CSVReader reader = new CSVReader(new FileReader(file));
-        
+
+        CSVReader reader = null;
         try {
+            reader = new CSVReader(new FileReader(file));
+
             String[] line;
-            
+
             while ((line = reader.readNext()) != null) {
                 if (line.length < 2) {
                     logger.warning("Invalid region definition: " + line);
                     continue;
                 }
-                
+
                 String id = line[0].toLowerCase().replace(".", "");
                 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]),
@@ -113,12 +132,12 @@ public class CSVDatabase extends AbstractProtectionDatabase {
 
                     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);
                     parseFlags(region, flagsData);
@@ -136,7 +155,7 @@ public class CSVDatabase extends AbstractProtectionDatabase {
 
                     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);
@@ -144,27 +163,29 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                     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);
                     parseFlags(region, flagsData);
                     region.setOwners(this.parseDomains(ownersData));
                     region.setMembers(this.parseDomains(membersData));
                     regions.put(id, region);
-                    
+
                     // Link children to parents later
                     if (parentId.length() > 0) {
                         parentSets.put(region, parentId);
                     }
                 }
             }
+        } catch (IOException e) {
+            throw new ProtectionDatabaseException(e);
         } finally {
             try {
                 reader.close();
-            } catch (IOException e) {
+            } catch (IOException ignored) {
             }
         }
-        
+
         for (Map.Entry<ProtectedRegion, String> entry : parentSets.entrySet()) {
             ProtectedRegion parent = regions.get(entry.getValue());
             if (parent != null) {
@@ -178,33 +199,33 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                 logger.warning("Unknown region parent: " + entry.getValue());
             }
         }
-        
+
         this.regions = regions;
     }
-    
+
     /**
      * Used to parse the specified domain in the CSV file.
-     * 
-     * @param data
-     * @return
+     *
+     * @param data The domain data as a string
+     * @return The domain data as a DefaultDomain
      */
     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;
@@ -221,22 +242,22 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                 logger.warning("Unknown owner specification: " + type);
             }
         }
-        
+
         return domain;
     }
-    
+
     /**
      * Used to parse the list of flags.
-     * 
-     * @param data
+     *
+     * @param data The flag data in string format
      */
     private void parseFlags(ProtectedRegion region, String data) {
         if (data == null) {
             return;
         }
-        
+
         State curState = State.ALLOW;
-        
+
         for (int i = 0; i < data.length(); i++) {
             char k = data.charAt(i);
             if (k == '+') {
@@ -258,8 +279,8 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                 } else {
                     flagStr = String.valueOf(k);
                 }
-                
-                StateFlag flag = DefaultFlag.getLegacyFlag(flagStr);
+
+                StateFlag flag = legacyFlagCodes.get(flagStr);
                 if (flag != null) {
                     region.setFlag(flag, curState);
                 } else {
@@ -271,29 +292,29 @@ public class CSVDatabase extends AbstractProtectionDatabase {
 
     /**
      * 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
@@ -305,16 +326,16 @@ public class CSVDatabase extends AbstractProtectionDatabase {
         } else if (state == State.DENY) {
             return "-" + flag;
         }
-        
+
         return "";
     }
 */
 
     /**
      * Returns a null if a string is null or empty.
-     * 
-     * @param str
-     * @return
+     *
+     * @param str The string to format
+     * @return null if the string is empty or null, otherwise the provided string
      */
     protected String nullEmptyString(String str) {
         if (str == null) {
@@ -326,18 +347,10 @@ public class CSVDatabase extends AbstractProtectionDatabase {
         }
     }
 
-    /**
-     * Get a list of protected regions.
-     *
-     * @return
-     */
     public Map<String,ProtectedRegion> getRegions() {
         return regions;
     }
 
-    /**
-     * Get a list of protected regions.
-     */
     public void setRegions(Map<String,ProtectedRegion> regions) {
         this.regions = regions;
     }

src/main/java/com/sk89q/worldguard/protection/databases/InvalidTableFormatException.java

@@ -0,0 +1,20 @@
+package com.sk89q.worldguard.protection.databases;
+
+import com.sk89q.worldguard.util.FatalConfigurationLoadingException;
+
+public class InvalidTableFormatException extends FatalConfigurationLoadingException {
+	private static final long serialVersionUID = 1L;
+
+	protected String updateFile;
+
+    public InvalidTableFormatException(String updateFile) {
+        super();
+        
+        this.updateFile = updateFile;
+    }
+    
+    public String toString() {
+    	return "You need to update your database to the latest version.\n" +
+    			"\t\tPlease see " + this.updateFile;
+    }
+}

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

@@ -19,54 +19,54 @@
 
 package com.sk89q.worldguard.protection.databases;
 
+import java.util.Map;
+
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-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
+     *
+     * @throws ProtectionDatabaseException when an error occurs
      */
-    public void load() throws IOException;
+    public void load() throws ProtectionDatabaseException;
     /**
      * Save the list of regions.
-     * 
-     * @throws IOException
+     *
+     * @throws ProtectionDatabaseException when an error occurs
      */
-    public void save() throws IOException;
+    public void save() throws ProtectionDatabaseException;
     /**
      * Load the list of regions into a region manager.
-     * 
-     * @param manager 
-     * @throws IOException
+     *
+     * @param manager The manager to load regions into
+     * @throws ProtectionDatabaseException when an error occurs
      */
-    public void load(RegionManager manager) throws IOException;
+    public void load(RegionManager manager) throws ProtectionDatabaseException;
     /**
      * Save the list of regions from a region manager.
-     * 
-     * @param manager 
-     * @throws IOException
+     *
+     * @param manager The manager to load regions into
+     * @throws ProtectionDatabaseException when an error occurs
      */
-    public void save(RegionManager manager) throws IOException;
+    public void save(RegionManager manager) throws ProtectionDatabaseException;
     /**
      * Get a list of regions.
-     * 
-     * @return
+     *
+     * @return the regions loaded by this ProtectionDatabase
      */
     public Map<String,ProtectedRegion> getRegions();
     /**
      * Set the list of regions.
-     * 
-     * @param regions
+     *
+     * @param regions The regions to be applied to this ProtectionDatabase
      */
     public void setRegions(Map<String,ProtectedRegion> regions);
 }

src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabaseException.java

@@ -0,0 +1,42 @@
+// $Id$
+/*
+ * WorldGuard ProtectionDatabaseException
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases;
+
+import java.lang.Exception;
+
+public class ProtectionDatabaseException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public ProtectionDatabaseException() {
+        super();
+    }
+
+    public ProtectionDatabaseException(String message) {
+        super(message);
+    }
+
+    public ProtectionDatabaseException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ProtectionDatabaseException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/RegionDBUtil.java

@@ -19,8 +19,11 @@
 
 package com.sk89q.worldguard.protection.databases;
 
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import com.sk89q.worldguard.domains.DefaultDomain;
 
 /**
@@ -29,18 +32,18 @@ import com.sk89q.worldguard.domains.DefaultDomain;
  * @author sk89q
  */
 public class RegionDBUtil {
-    private static Pattern groupPattern = Pattern.compile("^[gG]:(.+)$");
+    private static Pattern groupPattern = Pattern.compile("(?i)^[G]:(.+)$");
     
     private RegionDBUtil() {
         
     }
 
     /**
-     * Parse a group/player DefaultDomain specification for areas.
+     * Add the given names to {@code domain}
      * 
-     * @param domain
-     * @param split
-     * @param startIndex
+     * @param domain The domain to add to
+     * @param split The {@link String[]} containing names to add to {@code domain}
+     * @param startIndex The beginning index in the array
      */
     public static void addToDomain(DefaultDomain domain, String[] split,
             int startIndex) {
@@ -56,11 +59,11 @@ public class RegionDBUtil {
     }
 
     /**
-     * Parse a group/player DefaultDomain specification for areas.
-     * 
-     * @param domain
-     * @param split
-     * @param startIndex
+     * Remove the given names from {@code domain}
+     *
+     * @param domain The domain to remove from
+     * @param split The {@link String[]} containing names to remove from {@code domain}
+     * @param startIndex The beginning index in the array
      */
     public static void removeFromDomain(DefaultDomain domain, String[] split,
             int startIndex) {
@@ -78,9 +81,9 @@ public class RegionDBUtil {
     /**
      * Parse a group/player DefaultDomain specification for areas.
      * 
-     * @param split
-     * @param startIndex
-     * @return
+     * @param split The array of names to add
+     * @param startIndex The beginning index in the array
+     * @return The resulting DefaultDomain
      */
     public static DefaultDomain parseDomainString(String[] split, int startIndex) {
         DefaultDomain domain = new DefaultDomain();
@@ -97,4 +100,34 @@ public class RegionDBUtil {
 
         return domain;
     }
+    
+    /**
+     * Creates a comma separated list of PreparedStatement place holders
+     * 
+     * @param length The number of wildcards to create
+     * @return A string with {@code length} wildcards for usage in a PreparedStatement
+     */
+    public static String preparePlaceHolders(int length) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < length;) {
+            builder.append("?");
+            if (++i < length) {
+                builder.append(",");
+            }
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Adds all of the parsed values to the PreparedStatement
+     * 
+     * @param preparedStatement The preparedStanement to add to
+     * @param values The values to set
+     * @throws SQLException see {@link PreparedStatement#setString(int, String)}
+     */
+    public static void setValues(PreparedStatement preparedStatement, String... values) throws SQLException {
+        for (int i = 0; i < values.length; i++) {
+            preparedStatement.setString(i + 1, values[i]);
+        }
+    }
 }

src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java

@@ -21,6 +21,7 @@ package com.sk89q.worldguard.protection.databases;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -28,6 +29,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
+
+import com.sk89q.util.yaml.YAMLFormat;
+import com.sk89q.util.yaml.YAMLNode;
+import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
@@ -39,24 +44,33 @@ import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
-import com.sk89q.worldguard.util.yaml.Configuration;
-import com.sk89q.worldguard.util.yaml.ConfigurationNode;
 
 public class YAMLDatabase extends AbstractProtectionDatabase {
     
-    private static Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
-    private Configuration config;
+    private YAMLProcessor config;
     private Map<String, ProtectedRegion> regions;
+    private final Logger logger;
     
-    public YAMLDatabase(File file) {
-        config = new Configuration(file);
+    public YAMLDatabase(File file, Logger logger) throws ProtectionDatabaseException, FileNotFoundException {
+        this.logger = logger;
+        if (!file.exists()) { // shouldn't be necessary, but check anyways
+            try {
+                file.createNewFile();
+            } catch (IOException e) {
+                throw new FileNotFoundException(file.getAbsolutePath());
+            }
+        }
+        config = new YAMLProcessor(file, false, YAMLFormat.COMPACT);
     }
 
-    public void load() throws IOException {
-        config.load();
+    public void load() throws ProtectionDatabaseException {
+        try {
+            config.load();
+        } catch (IOException e) {
+            throw new ProtectionDatabaseException(e);
+        }
         
-        Map<String, ConfigurationNode> regionData = config.getNodes("regions");
+        Map<String, YAMLNode> regionData = config.getNodes("regions");
         
         // No regions are even configured
         if (regionData == null) {
@@ -69,9 +83,9 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
         Map<ProtectedRegion,String> parentSets =
             new LinkedHashMap<ProtectedRegion, String>();
         
-        for (Map.Entry<String, ConfigurationNode> entry : regionData.entrySet()) {
+        for (Map.Entry<String, YAMLNode> entry : regionData.entrySet()) {
             String id = entry.getKey().toLowerCase().replace(".", "");
-            ConfigurationNode node = entry.getValue();
+            YAMLNode node = entry.getValue();
             
             String type = node.getString("type");
             ProtectedRegion region;
@@ -140,7 +154,7 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
         return val;
     }
     
-    private void setFlags(ProtectedRegion region, ConfigurationNode flagsData) {
+    private void setFlags(ProtectedRegion region, YAMLNode flagsData) {
         if (flagsData == null) {
             return;
         }
@@ -151,6 +165,13 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
             if (o != null) {
                 setFlag(region, flag, o);
             }
+            
+            if (flag.getRegionGroupFlag() != null) {
+            Object o2 = flagsData.getProperty(flag.getRegionGroupFlag().getName());
+                if (o2 != null) {
+                    setFlag(region, flag.getRegionGroupFlag(), o2);
+                }
+            }
         }
     }
     
@@ -164,7 +185,7 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
         region.setFlag(flag, val);
     }
     
-    private DefaultDomain parseDomain(ConfigurationNode node) {
+    private DefaultDomain parseDomain(YAMLNode node) {
         if (node == null) {
             return new DefaultDomain();
         }
@@ -182,12 +203,12 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
         return domain;
     }
 
-    public void save() throws IOException {
+    public void save() throws ProtectionDatabaseException {
         config.clear();
         
         for (Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
             ProtectedRegion region = entry.getValue();
-            ConfigurationNode node = config.addNode("regions." + entry.getKey());
+            YAMLNode node = config.addNode("regions." + entry.getKey());
             
             if (region instanceof ProtectedCuboidRegion) {
                 ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region;
@@ -225,6 +246,17 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
             }
         }
         
+        config.setHeader("#\r\n" +
+                "# WorldGuard regions file\r\n" +
+                "#\r\n" +
+                "# WARNING: THIS FILE IS AUTOMATICALLY GENERATED. If you modify this file by\r\n" +
+                "# hand, be aware that A SINGLE MISTYPED CHARACTER CAN CORRUPT THE FILE. If\r\n" +
+                "# WorldGuard is unable to parse the file, your regions will FAIL TO LOAD and\r\n" +
+                "# the contents of this file will reset. Please use a YAML validator such as\r\n" +
+                "# http://yaml-online-parser.appspot.com (for smaller files).\r\n" +
+                "#\r\n" +
+                "# REMEMBER TO KEEP PERIODICAL BACKUPS.\r\n" +
+                "#");
         config.save();
     }
     

src/main/java/com/sk89q/worldguard/protection/databases/migrators/AbstractDatabaseMigrator.java

@@ -0,0 +1,62 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+public abstract class AbstractDatabaseMigrator implements DatabaseMigrator {
+
+    private static HashMap<MigratorKey, Class<? extends AbstractDatabaseMigrator>> migrators =
+            new HashMap<MigratorKey, Class<? extends AbstractDatabaseMigrator>>();
+
+    public static Map<MigratorKey, Class<? extends AbstractDatabaseMigrator>> getMigrators() {
+        if (!migrators.isEmpty()) return migrators;
+
+        AbstractDatabaseMigrator.migrators.put(new MigratorKey("mysql", "yaml"), MySQLToYAMLMigrator.class);
+        AbstractDatabaseMigrator.migrators.put(new MigratorKey("yaml", "mysql"), YAMLToMySQLMigrator.class);
+
+        return migrators;
+    }
+
+    protected abstract Set<String> getWorldsFromOld() throws MigrationException;
+
+    protected abstract Map<String, ProtectedRegion> getRegionsForWorldFromOld(String world) throws MigrationException;
+
+    protected abstract ProtectionDatabase getNewWorldStorage(String world) throws MigrationException;
+
+    public void migrate() throws MigrationException {
+        for (String world : this.getWorldsFromOld()) {
+            ProtectionDatabase database = this.getNewWorldStorage(world);
+            database.setRegions(this.getRegionsForWorldFromOld(world));
+
+            try {
+                database.save();
+            } catch (ProtectionDatabaseException e) {
+                throw new MigrationException(e);
+            }
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/DatabaseMigrator.java

@@ -0,0 +1,31 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+/**
+ * Represents a method of converting from one database to another.
+ *
+ * @author Nicholas Steicke
+ */
+public interface DatabaseMigrator {
+
+    public void migrate() throws MigrationException;
+}
+

src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigrationException.java

@@ -0,0 +1,40 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+public class MigrationException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public MigrationException() {
+        super();
+    }
+
+    public MigrationException(String message) {
+        super(message);
+    }
+
+    public MigrationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public MigrationException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/MigratorKey.java

@@ -0,0 +1,43 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+public class MigratorKey {
+    public final String from;
+    public final String to;
+
+    public MigratorKey(String from, String to) {
+        this.from = from;
+        this.to = to;
+    }
+
+    public boolean equals(Object o) {
+        MigratorKey other = (MigratorKey) o;
+
+        return other.from.equals(this.from) && other.to.equals(this.to);
+    }
+
+    public int hashCode() {
+        int hash = 17;
+        hash = hash * 31 + this.from.hashCode();
+        hash = hash * 31 + this.to.hashCode();
+        return hash;
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/MySQLToYAMLMigrator.java

@@ -0,0 +1,97 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.databases.MySQLDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.YAMLDatabase;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class MySQLToYAMLMigrator extends AbstractDatabaseMigrator {
+
+    private WorldGuardPlugin plugin;
+    private Set<String> worlds;
+
+    public MySQLToYAMLMigrator(WorldGuardPlugin plugin) throws MigrationException {
+        this.plugin = plugin;
+        this.worlds = new HashSet<String>();
+
+        ConfigurationManager config = plugin.getGlobalStateManager();
+
+        try {
+            Connection conn = DriverManager.getConnection(config.sqlDsn, config.sqlUsername, config.sqlPassword);
+
+            ResultSet worlds = conn.prepareStatement("SELECT `name` FROM `world`;").executeQuery();
+
+            while(worlds.next()) {
+                this.worlds.add(worlds.getString(1));
+            }
+
+            conn.close();
+        } catch (SQLException e) {
+            throw new MigrationException(e);
+        }
+    }
+
+    @Override
+    protected Set<String> getWorldsFromOld() {
+        return this.worlds;
+    }
+
+    @Override
+    protected Map<String, ProtectedRegion> getRegionsForWorldFromOld(String world) throws MigrationException {
+        ProtectionDatabase oldDatabase;
+        try {
+            oldDatabase = new MySQLDatabase(plugin.getGlobalStateManager(), world, plugin.getLogger());
+            oldDatabase.load();
+        } catch (ProtectionDatabaseException e) {
+            throw new MigrationException(e);
+        }
+
+        return oldDatabase.getRegions();
+    }
+
+    @Override
+    protected ProtectionDatabase getNewWorldStorage(String world) throws MigrationException {
+        try {
+            File file = new File(plugin.getDataFolder(),
+                    "worlds" + File.separator + world + File.separator + "regions.yml");
+
+            return new YAMLDatabase(file, plugin.getLogger());
+        } catch (FileNotFoundException e) {
+            throw new MigrationException(e);
+        } catch (ProtectionDatabaseException e) {
+            throw new MigrationException(e);
+        }
+    }
+}

src/main/java/com/sk89q/worldguard/protection/databases/migrators/YAMLToMySQLMigrator.java

@@ -0,0 +1,86 @@
+// $Id$
+/*
+ * MySQL WordGuard Region Database
+ * Copyright (C) 2011 Nicholas Steicke <http://narthollis.net>
+ *
+ * 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.databases.migrators;
+
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.databases.MySQLDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.YAMLDatabase;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class YAMLToMySQLMigrator extends AbstractDatabaseMigrator {
+
+    private WorldGuardPlugin plugin;
+    private HashMap<String,File> regionYamlFiles;
+
+    public YAMLToMySQLMigrator(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+
+        this.regionYamlFiles = new HashMap<String,File>();
+
+        File files[] = new File(plugin.getDataFolder(), "worlds" + File.separator).listFiles();
+        for (File item : files) {
+            if (item.isDirectory()) {
+                for (File subItem : item.listFiles()) { 
+                    if (subItem.getName().equals("regions.yml")) {
+                        this.regionYamlFiles.put(item.getName(), subItem);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    protected Set<String> getWorldsFromOld() {
+        return this.regionYamlFiles.keySet();
+    }
+
+    @Override
+    protected Map<String, ProtectedRegion> getRegionsForWorldFromOld(String world) throws MigrationException {
+        ProtectionDatabase oldDatabase;
+        try {
+            oldDatabase = new YAMLDatabase(this.regionYamlFiles.get(world), plugin.getLogger());
+            oldDatabase.load();
+        } catch (FileNotFoundException e) {
+            throw new MigrationException(e);
+        } catch (ProtectionDatabaseException e) {
+            throw new MigrationException(e);
+        }
+
+        return oldDatabase.getRegions();
+    }
+
+    @Override
+    protected ProtectionDatabase getNewWorldStorage(String world) throws MigrationException {
+        try {
+            return new MySQLDatabase(plugin.getGlobalStateManager(), world, plugin.getLogger());
+        } catch (ProtectionDatabaseException e) {
+            throw new MigrationException(e);
+        }
+    }
+
+}

src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java

@@ -0,0 +1,82 @@
+// $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.events;
+
+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/protection/flags/BooleanFlag.java

@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;
 
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 /**
@@ -26,9 +27,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  * @author sk89q
  */
 public class BooleanFlag extends Flag<Boolean> {
-    
-    public BooleanFlag(String name, char legacyCode) {
-        super(name, legacyCode);
+
+    public BooleanFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
     }
 
     public BooleanFlag(String name) {

src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java

@@ -0,0 +1,63 @@
+// $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.flags;
+
+import org.bukkit.command.CommandSender;
+
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
+/**
+ *
+ * @author sk89q
+ */
+public class CommandStringFlag extends Flag<String> {
+
+    public CommandStringFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
+    }
+
+    public CommandStringFlag(String name) {
+        super(name);
+    }
+
+    @Override
+    public String parseInput(WorldGuardPlugin plugin, CommandSender sender,
+            String input) throws InvalidFlagFormat {
+        input = input.trim();
+        if (!input.startsWith("/")) {
+            input = "/" + input;
+        }
+        return input.toLowerCase();
+    }
+
+    @Override
+    public String unmarshal(Object o) {
+        if (o instanceof String) {
+            return (String) o;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Object marshal(String o) {
+        return o;
+    }
+    
+}

src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java

@@ -19,79 +19,104 @@
 
 package com.sk89q.worldguard.protection.flags;
 
-import org.bukkit.entity.CreatureType;
-
-import java.util.Set;
+import org.bukkit.GameMode;
+import org.bukkit.entity.EntityType;
 
 /**
  *
  * @author sk89q
  */
 public final class DefaultFlag {
-    
-    public static final StateFlag PASSTHROUGH = new StateFlag("passthrough", 'z', false);
-    public static final StateFlag BUILD = new StateFlag("build", 'b', true);
-    public static final StateFlag PVP = new StateFlag("pvp", 'p', true);
-    public static final StateFlag MOB_DAMAGE = new StateFlag("mob-damage", 'm', true);
-    public static final StateFlag MOB_SPAWNING = new StateFlag("mob-spawning", true);
-    public static final StateFlag CREEPER_EXPLOSION = new StateFlag("creeper-explosion", 'c', true);
-    public static final StateFlag GHAST_FIREBALL = new StateFlag("ghast-fireball", true);
+
+    public static final StateFlag PASSTHROUGH = new StateFlag("passthrough", false, RegionGroup.ALL);
+    public static final StateFlag BUILD = new StateFlag("build", true, RegionGroup.NON_MEMBERS);
+    public static final RegionGroupFlag CONSTRUCT = new RegionGroupFlag("construct", RegionGroup.MEMBERS);
+    public static final StateFlag PVP = new StateFlag("pvp", true, RegionGroup.ALL);
+    public static final StateFlag MOB_DAMAGE = new StateFlag("mob-damage", true, RegionGroup.ALL);
+    public static final StateFlag MOB_SPAWNING = new StateFlag("mob-spawning", true, RegionGroup.ALL);
+    public static final StateFlag CREEPER_EXPLOSION = new StateFlag("creeper-explosion", true, RegionGroup.ALL);
+    public static final StateFlag ENDERDRAGON_BLOCK_DAMAGE = new StateFlag("enderdragon-block-damage", true);
+    public static final StateFlag GHAST_FIREBALL = new StateFlag("ghast-fireball", true, RegionGroup.ALL);
+    public static final StateFlag OTHER_EXPLOSION = new StateFlag("other-explosion", true);
     public static final StateFlag SLEEP = new StateFlag("sleep", true);
-    public static final StateFlag TNT = new StateFlag("tnt", 't', true);
-    public static final StateFlag LIGHTER = new StateFlag("lighter", 'l', true);
-    public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", 'f', true);
-    public static final StateFlag LAVA_FIRE = new StateFlag("lava-fire", 'F', true);
+    public static final StateFlag TNT = new StateFlag("tnt", true, RegionGroup.ALL);
+    public static final StateFlag LIGHTER = new StateFlag("lighter", true, RegionGroup.ALL);
+    public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", true);
+    public static final StateFlag LAVA_FIRE = new StateFlag("lava-fire", true);
     public static final StateFlag LIGHTNING = new StateFlag("lightning", true);
-    public static final StateFlag CHEST_ACCESS = new StateFlag("chest-access", 'C', false);
+    public static final StateFlag CHEST_ACCESS = new StateFlag("chest-access", false);
     public static final StateFlag WATER_FLOW = new StateFlag("water-flow", true);
     public static final StateFlag LAVA_FLOW = new StateFlag("lava-flow", true);
     public static final StateFlag USE = new StateFlag("use", true);
     public static final StateFlag PLACE_VEHICLE = new StateFlag("vehicle-place", false);
+    public static final StateFlag DESTROY_VEHICLE = new StateFlag("vehicle-destroy", false);
+    public static final StateFlag PISTONS = new StateFlag("pistons", true);
     public static final StateFlag SNOW_FALL = new StateFlag("snow-fall", true);
+    public static final StateFlag SNOW_MELT = new StateFlag("snow-melt", true);
+    public static final StateFlag ICE_FORM = new StateFlag("ice-form", true);
+    public static final StateFlag ICE_MELT = new StateFlag("ice-melt", true);
+    public static final StateFlag MUSHROOMS = new StateFlag("mushroom-growth", true);
     public static final StateFlag LEAF_DECAY = new StateFlag("leaf-decay", true);
-    public static final StringFlag GREET_MESSAGE = new StringFlag("greeting");
-    public static final StringFlag FAREWELL_MESSAGE = new StringFlag("farewell");
-    public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter");
-    public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave");
-    public static final SetFlag<CreatureType> DENY_SPAWN = new SetFlag<CreatureType>("deny-spawn", new CreatureTypeFlag(null));
-    public static final IntegerFlag HEAL_DELAY = new IntegerFlag("heal-delay");
-    public static final IntegerFlag HEAL_AMOUNT = new IntegerFlag("heal-amount");
-    public static final VectorFlag TELE_LOC = new VectorFlag("teleport");
-    public static final RegionGroupFlag TELE_PERM = new RegionGroupFlag("teleport-group");
-    public static final VectorFlag SPAWN_LOC = new VectorFlag("spawn");
-    public static final RegionGroupFlag SPAWN_PERM = new RegionGroupFlag("spawn-group");
+    public static final StateFlag GRASS_SPREAD = new StateFlag("grass-growth", true);
+    public static final StateFlag MYCELIUM_SPREAD = new StateFlag("mycelium-spread", true);
+    public static final StateFlag VINE_GROWTH = new StateFlag("vine-growth", true);
+    public static final StateFlag ENDER_BUILD = new StateFlag("enderman-grief", true);
+    public static final StateFlag INVINCIBILITY = new StateFlag("invincible", false, RegionGroup.ALL);
+    public static final StateFlag EXP_DROPS = new StateFlag("exp-drops", true, RegionGroup.ALL);
+    public static final StateFlag SEND_CHAT = new StateFlag("send-chat", true);
+    public static final StateFlag RECEIVE_CHAT = new StateFlag("receive-chat", true);
+    public static final StateFlag ENTRY = new StateFlag("entry", true);
+    public static final StateFlag EXIT = new StateFlag("exit", true);
+    public static final StateFlag ITEM_DROP = new StateFlag("item-drop", true);
+    public static final StateFlag ENDERPEARL = new StateFlag("enderpearl", true);
+    public static final StateFlag ENTITY_PAINTING_DESTROY = new StateFlag("entity-painting-destroy", true);
+    public static final StateFlag ENTITY_ITEM_FRAME_DESTROY = new StateFlag("entity-item-frame-destroy", true);
+    public static final StateFlag POTION_SPLASH = new StateFlag("potion-splash", true);
+    public static final StringFlag GREET_MESSAGE = new StringFlag("greeting", RegionGroup.ALL);
+    public static final StringFlag FAREWELL_MESSAGE = new StringFlag("farewell", RegionGroup.ALL);
+    public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter", RegionGroup.ALL);
+    public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave", RegionGroup.ALL);
+    public static final SetFlag<EntityType> DENY_SPAWN = new SetFlag<EntityType>("deny-spawn", RegionGroup.ALL, new EntityTypeFlag(null));
+    public static final EnumFlag<GameMode> GAME_MODE = new EnumFlag<GameMode>("game-mode", GameMode.class, RegionGroup.ALL);
+    public static final IntegerFlag HEAL_DELAY = new IntegerFlag("heal-delay", RegionGroup.ALL);
+    public static final IntegerFlag HEAL_AMOUNT = new IntegerFlag("heal-amount", RegionGroup.ALL);
+    public static final IntegerFlag MIN_HEAL = new IntegerFlag("heal-min-health", RegionGroup.ALL);
+    public static final IntegerFlag MAX_HEAL = new IntegerFlag("heal-max-health", RegionGroup.ALL);
+    public static final IntegerFlag FEED_DELAY = new IntegerFlag("feed-delay", RegionGroup.ALL);
+    public static final IntegerFlag FEED_AMOUNT = new IntegerFlag("feed-amount", RegionGroup.ALL);
+    public static final IntegerFlag MIN_FOOD = new IntegerFlag("feed-min-hunger", RegionGroup.ALL);
+    public static final IntegerFlag MAX_FOOD = new IntegerFlag("feed-max-hunger", RegionGroup.ALL);
+    // public static final IntegerFlag MAX_PLAYERS = new IntegerFlag("max-players-allowed", RegionGroup.ALL);
+    // public static final StringFlag MAX_PLAYERS_MESSAGE = new StringFlag("max-players-reject-message", RegionGroup.ALL);
+    public static final LocationFlag TELE_LOC = new LocationFlag("teleport", RegionGroup.MEMBERS);
+    public static final LocationFlag SPAWN_LOC = new LocationFlag("spawn", RegionGroup.MEMBERS);
+    public static final StateFlag ENABLE_SHOP = new StateFlag("allow-shop", false);
     public static final BooleanFlag BUYABLE = new BooleanFlag("buyable");
     public static final DoubleFlag PRICE = new DoubleFlag("price");
+    public static final SetFlag<String> BLOCKED_CMDS = new SetFlag<String>("blocked-cmds", RegionGroup.ALL, new CommandStringFlag(null));
+    public static final SetFlag<String> ALLOWED_CMDS = new SetFlag<String>("allowed-cmds", RegionGroup.ALL, new CommandStringFlag(null));
 
     public static final Flag<?>[] flagsList = new Flag<?>[] {
-        PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION, SLEEP,
-        TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW, LAVA_FLOW,
-        USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER,
-        NOTIFY_LEAVE, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,
-        TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE, SNOW_FALL, LEAF_DECAY,
-        GHAST_FIREBALL
+        PASSTHROUGH, BUILD, CONSTRUCT, PVP, CHEST_ACCESS, PISTONS,
+        TNT, LIGHTER, USE, PLACE_VEHICLE, DESTROY_VEHICLE, SLEEP,
+        MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY, EXP_DROPS,
+        CREEPER_EXPLOSION, OTHER_EXPLOSION, ENDERDRAGON_BLOCK_DAMAGE, GHAST_FIREBALL, ENDER_BUILD,
+        GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
+        EXIT, ENTRY, LIGHTNING, ENTITY_PAINTING_DESTROY, ENDERPEARL,
+        ENTITY_ITEM_FRAME_DESTROY, ITEM_DROP, /*MAX_PLAYERS, MAX_PLAYERS_MESSAGE,*/
+        HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
+        FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
+        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT, GAME_MODE,
+        MUSHROOMS, LEAF_DECAY, GRASS_SPREAD, MYCELIUM_SPREAD, VINE_GROWTH,
+        SEND_CHAT, RECEIVE_CHAT, FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
+        TELE_LOC, SPAWN_LOC, POTION_SPLASH,
+        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE, ENABLE_SHOP
     };
-    
+
     private DefaultFlag() {
     }
-    
+
     public static Flag<?>[] getFlags() {
         return flagsList;
     }
-    
-    /**
-     * Get the legacy flag.
-     * 
-     * @param flagString
-     * @return null if not found
-     */
-    public static StateFlag getLegacyFlag(String flagString) {
-        for (Flag<?> flag : flagsList) {
-            if (flag instanceof StateFlag && flagString.equals(String.valueOf(flag.getLegacyCode()))) {
-                return (StateFlag) flag;
-            }
-        }
-        
-        return null;
-    }
 }

src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java

@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;
 
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 /**
@@ -26,9 +27,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  * @author sk89q
  */
 public class DoubleFlag extends Flag<Double> {
-    
-    public DoubleFlag(String name, char legacyCode) {
-        super(name, legacyCode);
+
+    public DoubleFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
     }
 
     public DoubleFlag(String name) {
@@ -39,7 +40,7 @@ public class DoubleFlag extends Flag<Double> {
     public Double parseInput(WorldGuardPlugin plugin, CommandSender sender,
             String input) throws InvalidFlagFormat {
         input = input.trim();
-        
+
         try {
             return Double.parseDouble(input);
         } catch (NumberFormatException e) {

src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java

@@ -18,30 +18,28 @@
  */
 package com.sk89q.worldguard.protection.flags;
 
-import org.bukkit.command.CommandSender;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.EntityType;
 
 /**
- * Represents a creature type.
+ * Represents an entity type.
  *
  * @author sk89q
  */
-public class CreatureTypeFlag extends EnumFlag<CreatureType> {
+public class EntityTypeFlag extends EnumFlag<EntityType> {
 
-    public CreatureTypeFlag(String name, char legacyCode) {
-        super(name, legacyCode, CreatureType.class);
+    public EntityTypeFlag(String name, RegionGroup defaultGroup) {
+        super(name, EntityType.class, defaultGroup);
     }
 
-    public CreatureTypeFlag(String name) {
-        super(name, CreatureType.class);
+    public EntityTypeFlag(String name) {
+        super(name, EntityType.class);
     }
 
     @Override
-    public CreatureType detectValue(String input) {
-        CreatureType lowMatch = null;
+    public EntityType detectValue(String input) {
+        EntityType lowMatch = null;
 
-        for (CreatureType type : CreatureType.values()) {
+        for (EntityType type : EntityType.values()) {
             if (type.name().equalsIgnoreCase(input.trim())) {
                 return type;
             }

src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java

@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;
 
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 /**
@@ -28,9 +29,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 public class EnumFlag<T extends Enum<T>> extends Flag<T> {
 
     private Class<T> enumClass;
-    
-    public EnumFlag(String name, char legacyCode, Class<T> enumClass) {
-        super(name, legacyCode);
+
+    public EnumFlag(String name, Class<T> enumClass, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
         this.enumClass = enumClass;
     }
 
@@ -40,6 +41,10 @@ public class EnumFlag<T extends Enum<T>> extends Flag<T> {
     }
 
     private T findValue(String input) throws IllegalArgumentException {
+        if (input != null) {
+            input = input.toUpperCase();
+        }
+
         try {
             return Enum.valueOf(enumClass, input);
         } catch (IllegalArgumentException e) {
@@ -87,5 +92,5 @@ public class EnumFlag<T extends Enum<T>> extends Flag<T> {
     public Object marshal(T o) {
         return o.name();
     }
-    
+
 }

src/main/java/com/sk89q/worldguard/protection/flags/Flag.java

@@ -19,40 +19,43 @@
 package com.sk89q.worldguard.protection.flags;
 
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 /**
  *
  * @author sk89q
- * @param <T> 
+ * @param <T>
  */
 public abstract class Flag<T> {
-    
+
     private String name;
-    private Character legacyCode;
+    private RegionGroupFlag regionGroup;
     
-    public Flag(String name, char legacyCode) {
+    public Flag(String name, RegionGroup defaultGroup) {
         this.name = name;
-        this.legacyCode = legacyCode;
+
+        if (defaultGroup != null) {
+            this.regionGroup = new RegionGroupFlag(name + "-group", defaultGroup);
+        }
     }
-    
+
     public Flag(String name) {
-        this.name = name;
-        this.legacyCode = null;
+        this(name, RegionGroup.NON_MEMBERS);
     }
-    
+
     public String getName() {
         return name;
     }
     
-    public Character getLegacyCode() {
-        return legacyCode;
+    public RegionGroupFlag getRegionGroupFlag() {
+        return regionGroup;
     }
-    
+
     public abstract T parseInput(WorldGuardPlugin plugin, CommandSender sender,
             String input) throws InvalidFlagFormat;
-    
+
     public abstract T unmarshal(Object o);
-    
+
     public abstract Object marshal(T o);
 }

src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java

@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;
 
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 /**
@@ -26,9 +27,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  * @author sk89q
  */
 public class IntegerFlag extends Flag<Integer> {
-    
-    public IntegerFlag(String name, char legacyCode) {
-        super(name, legacyCode);
+
+    public IntegerFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
     }
 
     public IntegerFlag(String name) {
@@ -39,7 +40,7 @@ public class IntegerFlag extends Flag<Integer> {
     public Integer parseInput(WorldGuardPlugin plugin, CommandSender sender,
             String input) throws InvalidFlagFormat {
         input = input.trim();
-        
+
         try {
             return Integer.parseInt(input);
         } catch (NumberFormatException e) {

src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java

@@ -0,0 +1,149 @@
+// $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.flags;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.worldedit.LocalWorld;
+import com.sk89q.worldedit.Location;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.bukkit.BukkitUtil;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
+/**
+ *
+ * @author sk89q
+ */
+public class LocationFlag extends Flag<Location> {
+
+    public LocationFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
+    }
+
+    public LocationFlag(String name) {
+        super(name);
+    }
+
+    @Override
+    public Location parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat {
+        input = input.trim();
+
+        final Player player;
+        try {
+            player = plugin.checkPlayer(sender);
+        } catch (CommandException e) {
+            throw new InvalidFlagFormat(e.getMessage());
+        }
+
+        if ("here".equalsIgnoreCase(input)) {
+            return BukkitUtil.toLocation(player.getLocation());
+        } else if ("none".equalsIgnoreCase(input)) {
+            return null;
+        } else {
+            String[] split = input.split(",");
+            if (split.length >= 3) {
+                try {
+                    final World world = player.getWorld();
+                    final double x = Double.parseDouble(split[0]);
+                    final double y = Double.parseDouble(split[1]);
+                    final double z = Double.parseDouble(split[2]);
+                    final float yaw = split.length < 4 ? 0 : Float.parseFloat(split[3]);
+                    final float pitch = split.length < 5 ? 0 : Float.parseFloat(split[4]);
+
+                    return new Location(
+                            BukkitUtil.getLocalWorld(world),
+                            new Vector(
+                                    x,
+                                    y,
+                                    z
+                            ),
+                            yaw, pitch
+                    );
+                } catch (NumberFormatException ignored) {
+                }
+            }
+
+            throw new InvalidFlagFormat("Expected 'here' or x,y,z.");
+        }
+    }
+
+    @Override
+    public Location unmarshal(Object o) {
+        if (o instanceof Map<?, ?>) {
+            Map<?, ?> map  = (Map<?, ?>) o;
+
+            Object rawWorld = map.get("world");
+            if (rawWorld == null) return null;
+
+            Object rawX = map.get("x");
+            if (rawX == null) return null;
+
+            Object rawY = map.get("y");
+            if (rawY == null) return null;
+
+            Object rawZ = map.get("z");
+            if (rawZ == null) return null;
+
+            Object rawYaw = map.get("yaw");
+            if (rawYaw == null) return null;
+
+            Object rawPitch = map.get("pitch");
+            if (rawPitch == null) return null;
+
+            World bukkitWorld = Bukkit.getServer().getWorld((String) rawWorld);
+            LocalWorld world = BukkitUtil.getLocalWorld(bukkitWorld);
+            Vector position = new Vector(toNumber(rawX), toNumber(rawY), toNumber(rawZ));
+            float yaw = (float) toNumber(rawYaw);
+            float pitch = (float) toNumber(rawPitch);
+
+            return new Location(world, position, yaw, pitch);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Object marshal(Location o) {
+        Vector position = o.getPosition();
+        Map<String, Object> vec = new HashMap<String, Object>();
+        vec.put("world", o.getWorld().getName());
+        vec.put("x", position.getX());
+        vec.put("y", position.getY());
+        vec.put("z", position.getZ());
+        vec.put("yaw", o.getYaw());
+        vec.put("pitch", o.getPitch());
+        return vec;
+    }
+
+    private double toNumber(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).doubleValue();
+        } else {
+            return 0;
+        }
+
+    }
+}

src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java

@@ -0,0 +1,31 @@
+/*
+ * WorldGuard
+ * Copyright (C) 2012 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.flags;
+
+/**
+ * A grouping of region membership types
+ */
+public enum RegionGroup {
+    MEMBERS,
+    OWNERS,
+    NON_MEMBERS,
+    NON_OWNERS,
+    ALL,
+    NONE
+}

src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java

@@ -18,65 +18,95 @@
  */
 package com.sk89q.worldguard.protection.flags;
 
-import org.bukkit.command.CommandSender;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 
 /**
  *
  * @author sk89q
  */
-public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {
-    
-    public static enum RegionGroup {
-        MEMBERS,
-        OWNERS
-    }
-    
-    public RegionGroupFlag(String name, char legacyCode) {
-        super(name, legacyCode);
+public class RegionGroupFlag extends EnumFlag<RegionGroup> {
+
+    private RegionGroup def;
+
+    public RegionGroupFlag(String name, RegionGroup def) {
+        super(name, RegionGroup.class, null);
+        this.def = def;
     }
 
-    public RegionGroupFlag(String name) {
-        super(name);
+    public RegionGroup getDefault() {
+        return def;
     }
 
     @Override
-    public RegionGroup parseInput(WorldGuardPlugin plugin, CommandSender sender,
-            String input) throws InvalidFlagFormat {
+    public RegionGroup detectValue(String input) {
         input = input.trim();
-        
+
         if (input.equalsIgnoreCase("members") || input.equalsIgnoreCase("member")) {
             return RegionGroup.MEMBERS;
         } else if (input.equalsIgnoreCase("owners") || input.equalsIgnoreCase("owner")) {
             return RegionGroup.OWNERS;
-        } else if (input.equalsIgnoreCase("everyone") || input.equalsIgnoreCase("anyone")) {
-            return null;
-        } else {
-            throw new InvalidFlagFormat("Not none/allow/deny: " + input);
-        }
-    }
-
-    @Override
-    public RegionGroup unmarshal(Object o) {
-        String str = o.toString();
-        if (str.equalsIgnoreCase("members")) {
-            return RegionGroup.MEMBERS;
-        } else if (str.equalsIgnoreCase("owners")) {
-            return RegionGroup.OWNERS;
+        } else if (input.equalsIgnoreCase("nonowners") || input.equalsIgnoreCase("nonowner")) {
+            return RegionGroup.NON_OWNERS;
+        } else if (input.equalsIgnoreCase("nonmembers") || input.equalsIgnoreCase("nonmember")) {
+            return RegionGroup.NON_MEMBERS;
+        } else if (input.equalsIgnoreCase("everyone") || input.equalsIgnoreCase("anyone") || input.equalsIgnoreCase("all")) {
+            return RegionGroup.ALL;
+        } else if (input.equalsIgnoreCase("none") || input.equalsIgnoreCase("noone") || input.equalsIgnoreCase("deny")) {
+            return RegionGroup.NONE;
         } else {
             return null;
         }
     }
 
-    @Override
-    public Object marshal(RegionGroup o) {
-        if (o == RegionGroup.MEMBERS) {
-            return "members";
-        } else if (o == RegionGroup.OWNERS) {
-            return "owners";
-        } else {
-            return null;
+    public static boolean isMember(ProtectedRegion region, RegionGroup group, LocalPlayer player) {
+        if (group == null || group == RegionGroup.ALL) {
+            return true;
+        } else if (group == RegionGroup.OWNERS) {
+            if (region.isOwner(player)) {
+                return true;
+            }
+        } else if (group == RegionGroup.MEMBERS) {
+            if (region.isMember(player)) {
+                return true;
+            }
+        } else if (group == RegionGroup.NON_OWNERS) {
+            if (!region.isOwner(player)) {
+                return true;
+            }
+        } else if (group == RegionGroup.NON_MEMBERS) {
+            if (!region.isMember(player)) {
+                return true;
+            }
         }
+
+        return false;
     }
-    
+
+    public static boolean isMember(ApplicableRegionSet set,
+                                   RegionGroup group, LocalPlayer player) {
+        if (group == null || group == RegionGroup.ALL) {
+            return true;
+        } else if (group == RegionGroup.OWNERS) {
+            if (set.isOwnerOfAll(player)) {
+                return true;
+            }
+        } else if (group == RegionGroup.MEMBERS) {
+            if (set.isMemberOfAll(player)) {
+                return true;
+            }
+        } else if (group == RegionGroup.NON_OWNERS) {
+            if (!set.isOwnerOfAll(player)) {
+                return true;
+            }
+        } else if (group == RegionGroup.NON_MEMBERS) {
+            if (!set.isMemberOfAll(player)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
 }

src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java

@@ -18,10 +18,15 @@
  */
 package com.sk89q.worldguard.protection.flags;
 
-import org.bukkit.command.CommandSender;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import java.util.*;
+import org.bukkit.command.CommandSender;
+
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 /**
  * Represents a flag that consists of a set.
@@ -31,9 +36,9 @@ import java.util.*;
 public class SetFlag<T> extends Flag<Set<T>> {
 
     private Flag<T> subFlag;
-    
-    public SetFlag(String name, char legacyCode, Flag<T> subFlag) {
-        super(name, legacyCode);
+
+    public SetFlag(String name, RegionGroup defaultGroup, Flag<T> subFlag) {
+        super(name, defaultGroup);
         this.subFlag = subFlag;
     }
 
@@ -56,8 +61,8 @@ public class SetFlag<T> extends Flag<Set<T>> {
 
     @Override
     public Set<T> unmarshal(Object o) {
-        if (o instanceof Collection) {
-            Collection collection = (Collection) o;
+        if (o instanceof Collection<?>) {
+            Collection<?> collection = (Collection<?>) o;
             Set<T> items = new HashSet<T>();
 
             for (Object sub : collection) {

src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java

@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;
 
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 /**
@@ -26,16 +27,16 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  * @author sk89q
  */
 public class StateFlag extends Flag<StateFlag.State> {
-    
+
     public enum State {
         ALLOW,
         DENY
     }
-    
+
     private boolean def;
-    
-    public StateFlag(String name, char legacyCode, boolean def) {
-        super(name, legacyCode);
+
+    public StateFlag(String name, boolean def, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
         this.def = def;
     }
 
@@ -52,7 +53,7 @@ public class StateFlag extends Flag<StateFlag.State> {
     public State parseInput(WorldGuardPlugin plugin, CommandSender sender,
             String input) throws InvalidFlagFormat {
         input = input.trim();
-        
+
         if (input.equalsIgnoreCase("allow")) {
             return State.ALLOW;
         } else if (input.equalsIgnoreCase("deny")) {
@@ -60,7 +61,7 @@ public class StateFlag extends Flag<StateFlag.State> {
         } else if (input.equalsIgnoreCase("none")) {
             return null;
         } else {
-            throw new InvalidFlagFormat("Not none/allow/deny: " + input);
+            throw new InvalidFlagFormat("Expected none/allow/deny but got '" + input + "'");
         }
     }
 
@@ -86,5 +87,5 @@ public class StateFlag extends Flag<StateFlag.State> {
             return null;
         }
     }
-    
+
 }

src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java

@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;
 
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 
 /**
@@ -26,9 +27,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  * @author sk89q
  */
 public class StringFlag extends Flag<String> {
-    
-    public StringFlag(String name, char legacyCode) {
-        super(name, legacyCode);
+
+    public StringFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
     }
 
     public StringFlag(String name) {
@@ -38,7 +39,7 @@ public class StringFlag extends Flag<String> {
     @Override
     public String parseInput(WorldGuardPlugin plugin, CommandSender sender,
             String input) throws InvalidFlagFormat {
-        return input;
+        return input.replaceAll("(?!\\\\)\\\\n", "\n").replaceAll("\\\\\\\\n", "\\n");
     }
 
     @Override
@@ -54,5 +55,5 @@ public class StringFlag extends Flag<String> {
     public Object marshal(String o) {
         return o;
     }
-    
+
 }

src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java

@@ -20,7 +20,9 @@ package com.sk89q.worldguard.protection.flags;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.bukkit.BukkitUtil;
@@ -32,8 +34,8 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  */
 public class VectorFlag extends Flag<Vector> {
     
-    public VectorFlag(String name, char legacyCode) {
-        super(name, legacyCode);
+    public VectorFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
     }
 
     public VectorFlag(String name) {
@@ -41,33 +43,48 @@ public class VectorFlag extends Flag<Vector> {
     }
 
     @Override
-    public Vector parseInput(WorldGuardPlugin plugin, CommandSender sender,
-            String input) throws InvalidFlagFormat {
+    public Vector parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat {
         input = input.trim();
-        
-        try {
-            return BukkitUtil.toVector(plugin.checkPlayer(sender).getLocation());
-        } catch (CommandException e) {
-            throw new InvalidFlagFormat(e.getMessage());
+
+        if ("here".equalsIgnoreCase(input)) {
+            try {
+                return BukkitUtil.toVector(plugin.checkPlayer(sender).getLocation());
+            } catch (CommandException e) {
+                throw new InvalidFlagFormat(e.getMessage());
+            }
+        } else {
+            String[] split = input.split(",");
+            if (split.length == 3) {
+                try {
+                    return new Vector(
+                            Double.parseDouble(split[0]),
+                            Double.parseDouble(split[1]),
+                            Double.parseDouble(split[2])
+                    );
+                } catch (NumberFormatException ignored) {
+                }
+            }
+
+            throw new InvalidFlagFormat("Expected 'here' or x,y,z.");
         }
     }
 
     @Override
     public Vector unmarshal(Object o) {
-        if (o instanceof Map) {
+        if (o instanceof Map<?, ?>) {
             Map<?, ?> map  = (Map<?, ?>) o;
 
             Object rawX = map.get("x");
             Object rawY = map.get("y");
             Object rawZ = map.get("z");
-            
+
             if (rawX == null || rawY == null || rawZ == null) {
                 return null;
             }
-            
+
             return new Vector(toNumber(rawX), toNumber(rawY), toNumber(rawZ));
         }
-        
+
         return null;
     }
 
@@ -79,7 +96,7 @@ public class VectorFlag extends Flag<Vector> {
         vec.put("z", o.getZ());
         return vec;
     }
-    
+
     private double toNumber(Object o) {
         if (o instanceof Integer) {
             return (Integer) o;

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

@@ -18,24 +18,20 @@
  */
 package com.sk89q.worldguard.protection.managers;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.TreeSet;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
-import java.util.Iterator;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+import java.util.*;
 
 /**
  * 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 extends RegionManager {
@@ -47,47 +43,29 @@ public class FlatRegionManager extends RegionManager {
 
     /**
      * Construct the manager.
-     * 
-     * @param regionloader 
+     *
+     * @param regionLoader The loader for regions
      */
-    public FlatRegionManager(ProtectionDatabase regionloader) {
-        super(regionloader);
+    public FlatRegionManager(ProtectionDatabase regionLoader) {
+        super(regionLoader);
         regions = new TreeMap<String, ProtectedRegion>();
     }
 
-    /**
-     * Get a list of protected regions.
-     *
-     * @return
-     */
     @Override
     public Map<String, ProtectedRegion> getRegions() {
         return regions;
     }
 
-    /**
-     * Set a list of protected regions.
-     */
     @Override
     public void setRegions(Map<String, ProtectedRegion> regions) {
         this.regions = new TreeMap<String, ProtectedRegion>(regions);
     }
 
-    /**
-     * Adds a region.
-     * 
-     * @param region
-     */
     @Override
     public void addRegion(ProtectedRegion region) {
         regions.put(region.getId().toLowerCase(), region);
     }
 
-    /**
-     * Removes a region and its children.
-     * 
-     * @param id
-     */
     @Override
     public void removeRegion(String id) {
         ProtectedRegion region = regions.get(id.toLowerCase());
@@ -95,9 +73,7 @@ public class FlatRegionManager extends RegionManager {
 
         if (region != null) {
             List<String> removeRegions = new ArrayList<String>();
-            Iterator<ProtectedRegion> iter = regions.values().iterator();
-            while (iter.hasNext()) {
-                ProtectedRegion curRegion = iter.next();
+            for (ProtectedRegion curRegion : regions.values()) {
                 if (curRegion.getParent() == region) {
                     removeRegions.add(curRegion.getId().toLowerCase());
                 }
@@ -109,33 +85,11 @@ public class FlatRegionManager extends RegionManager {
         }
     }
 
-    /**
-     * Return whether a region exists by an ID.
-     * 
-     * @param id
-     * @return
-     */
     @Override
     public boolean hasRegion(String id) {
         return regions.containsKey(id.toLowerCase());
     }
 
-    /**
-     * Get a region by its ID.
-     * 
-     * @param id
-     */
-    @Override
-    public ProtectedRegion getRegion(String id) {
-        return regions.get(id.toLowerCase());
-    }
-
-    /**
-     * Get an object for a point for rules to be applied with.
-     * 
-     * @param pt
-     * @return
-     */
     @Override
     public ApplicableRegionSet getApplicableRegions(Vector pt) {
         TreeSet<ProtectedRegion> appRegions =
@@ -144,16 +98,16 @@ public class FlatRegionManager extends RegionManager {
         for (ProtectedRegion region : regions.values()) {
             if (region.contains(pt)) {
                 appRegions.add(region);
-                
+
                 ProtectedRegion parent = region.getParent();
-                
+
                 while (parent != null) {
                     if (!appRegions.contains(parent)) {
-                        appRegions.add(region);
+                        appRegions.add(parent);
                     }
-                    
+
                     parent = parent.getParent();
-                }       
+                }
             }
         }
 
@@ -181,12 +135,6 @@ public class FlatRegionManager extends RegionManager {
         return new ApplicableRegionSet(intersectRegions, regions.get("__global__"));
     }*/
 
-    /**
-     * Get a list of region IDs that contain a point.
-     * 
-     * @param pt
-     * @return
-     */
     @Override
     public List<String> getApplicableRegionsIDs(Vector pt) {
         List<String> applicable = new ArrayList<String>();
@@ -200,11 +148,6 @@ public class FlatRegionManager extends RegionManager {
         return applicable;
     }
 
-    /**
-     * Get an object for a region for rules to be applied with.
-     * 
-     * @return
-     */
     @Override
     public ApplicableRegionSet getApplicableRegions(ProtectedRegion checkRegion) {
 
@@ -212,7 +155,7 @@ public class FlatRegionManager extends RegionManager {
         appRegions.addAll(regions.values());
 
         List<ProtectedRegion> intersectRegions;
-        
+
         try {
             intersectRegions = checkRegion.getIntersectingRegions(appRegions);
         } catch (Exception e) {
@@ -222,13 +165,6 @@ public class FlatRegionManager extends RegionManager {
         return new ApplicableRegionSet(intersectRegions, regions.get("__global__"));
     }
 
-    /**
-     * Returns true if the provided region overlaps with any other region that
-     * is not owned by the player.
-     * 
-     * @param player
-     * @return
-     */
     @Override
     public boolean overlapsUnownedRegion(ProtectedRegion checkRegion, LocalPlayer player) {
         List<ProtectedRegion> appRegions = new ArrayList<ProtectedRegion>();
@@ -251,11 +187,6 @@ public class FlatRegionManager extends RegionManager {
         return intersectRegions.size() > 0;
     }
 
-    /**
-     * Get the number of regions.
-     * 
-     * @return
-     */
     @Override
     public int size() {
         return regions.size();

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

@@ -18,21 +18,18 @@
  */
 package com.sk89q.worldguard.protection.managers;
 
-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;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegionMBRConverter;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
-import java.io.IOException;
-import java.util.Iterator;
+import org.khelekore.prtree.MBR;
+import org.khelekore.prtree.MBRConverter;
+import org.khelekore.prtree.PRTree;
+import org.khelekore.prtree.SimpleMBR;
+
+import java.util.*;
 
 public class PRTreeRegionManager extends RegionManager {
 
@@ -52,30 +49,20 @@ public class PRTreeRegionManager extends RegionManager {
 
     /**
      * Construct the manager.
-     * 
-     * @param regionloader 
-     * @throws IOException 
+     *
+     * @param regionLoader The region loader to use
      */
-    public PRTreeRegionManager(ProtectionDatabase regionloader) throws IOException {
-        super(regionloader);
+    public PRTreeRegionManager(ProtectionDatabase regionLoader) {
+        super(regionLoader);
         regions = new TreeMap<String, ProtectedRegion>();
         tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
-        this.load();
     }
 
-    /**
-     * Get a list of protected regions.
-     *
-     * @return
-     */
     @Override
     public Map<String, ProtectedRegion> getRegions() {
         return regions;
     }
 
-    /**
-     * Set a list of protected regions.
-     */
     @Override
     public void setRegions(Map<String, ProtectedRegion> regions) {
         this.regions = new TreeMap<String, ProtectedRegion>(regions);
@@ -83,11 +70,6 @@ public class PRTreeRegionManager extends RegionManager {
         tree.load(regions.values());
     }
 
-    /**
-     * Adds a region.
-     * 
-     * @param region
-     */
     @Override
     public void addRegion(ProtectedRegion region) {
         regions.put(region.getId().toLowerCase(), region);
@@ -95,32 +77,11 @@ public class PRTreeRegionManager extends RegionManager {
         tree.load(regions.values());
     }
 
-    /**
-     * Return whether a region exists by an ID.
-     * 
-     * @param id
-     * @return
-     */
     @Override
     public boolean hasRegion(String id) {
         return regions.containsKey(id.toLowerCase());
     }
 
-    /**
-     * Get a region by its ID.
-     * 
-     * @param id
-     */
-    @Override
-    public ProtectedRegion getRegion(String id) {
-        return regions.get(id.toLowerCase());
-    }
-
-    /**
-     * Removes a region and its children.
-     * 
-     * @param id
-     */
     @Override
     public void removeRegion(String id) {
         ProtectedRegion region = regions.get(id.toLowerCase());
@@ -129,9 +90,7 @@ public class PRTreeRegionManager extends RegionManager {
 
         if (region != null) {
             List<String> removeRegions = new ArrayList<String>();
-            Iterator<ProtectedRegion> iter = regions.values().iterator();
-            while (iter.hasNext()) {
-                ProtectedRegion curRegion = iter.next();
+            for (ProtectedRegion curRegion : regions.values()) {
                 if (curRegion.getParent() == region) {
                     removeRegions.add(curRegion.getId().toLowerCase());
                 }
@@ -142,30 +101,35 @@ public class PRTreeRegionManager extends RegionManager {
             }
         }
 
-    tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        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
-     */
     @Override
     public ApplicableRegionSet getApplicableRegions(Vector pt) {
-        List<ProtectedRegion> appRegions =
-                new ArrayList<ProtectedRegion>();
 
-        int x = pt.getBlockX();
-        int z = pt.getBlockZ();
+        // Floor the vector to ensure we get accurate points
+        pt = pt.floor();
 
-        for (ProtectedRegion region : tree.find(x, z, x, z)) {
-            if (region.contains(pt)) {
+        List<ProtectedRegion> appRegions = new ArrayList<ProtectedRegion>();
+        MBR pointMBR = new SimpleMBR(pt.getX(), pt.getX(), pt.getY(), pt.getY(), pt.getZ(), pt.getZ());
+
+        for (ProtectedRegion region : tree.find(pointMBR)) {
+            if (region.contains(pt) && !appRegions.contains(region)) {
                 appRegions.add(region);
+
+                ProtectedRegion parent = region.getParent();
+
+                while (parent != null) {
+                    if (!appRegions.contains(parent)) {
+                        appRegions.add(parent);
+                    }
+
+                    parent = parent.getParent();
+                }
             }
         }
-        
+
         Collections.sort(appRegions);
 
         return new ApplicableRegionSet(appRegions, regions.get("__global__"));
@@ -186,35 +150,34 @@ public class PRTreeRegionManager extends RegionManager {
         return new ApplicableRegionSet(intersectRegions, regions.get("__global__"));
     }
 
-    /**
-     * Get a list of region IDs that contain a point.
-     * 
-     * @param pt
-     * @return
-     */
     @Override
     public List<String> getApplicableRegionsIDs(Vector pt) {
+
+        // Floor the vector to ensure we get accurate points
+        pt = pt.floor();
+
         List<String> applicable = new ArrayList<String>();
+        MBR pointMBR = new SimpleMBR(pt.getX(), pt.getX(), pt.getY(), pt.getY(), pt.getZ(), pt.getZ());
 
-        int x = pt.getBlockX();
-        int z = pt.getBlockZ();
-
-        for (ProtectedRegion region : tree.find(x, z, x, z)) {
-            if (region.contains(pt)) {
+        for (ProtectedRegion region : tree.find(pointMBR)) {
+            if (region.contains(pt) && !applicable.contains(region.getId())) {
                 applicable.add(region.getId());
+
+                ProtectedRegion parent = region.getParent();
+
+                while (parent != null) {
+                    if (!applicable.contains(parent.getId())) {
+                        applicable.add(parent.getId());
+                    }
+
+                    parent = parent.getParent();
+                }
             }
         }
 
         return applicable;
     }
 
-    /**
-     * Returns true if the provided region overlaps with any other region that
-     * is not owned by the player.
-     * 
-     * @param player
-     * @return
-     */
     @Override
     public boolean overlapsUnownedRegion(ProtectedRegion checkRegion, LocalPlayer player) {
         List<ProtectedRegion> appRegions = new ArrayList<ProtectedRegion>();
@@ -237,11 +200,6 @@ public class PRTreeRegionManager extends RegionManager {
         return intersectRegions.size() > 0;
     }
 
-    /**
-     * Get the number of regions.
-     * 
-     * @return
-     */
     @Override
     public int size() {
         return regions.size();
@@ -259,4 +217,4 @@ public class PRTreeRegionManager extends RegionManager {
 
         return count;
     }
-}
+}