Reduced some code duplication in the ProtectedRegion hierarchy and made a public intersectsRegion method.

Fixed a compilation error due to a sort-of-but-not-really-breaking bukkit change.
[maven-release-plugin] prepare for next development iteration
2014-03-01 20:05:41 +01:00 · 2014-02-28 21:21:00 -05:00 · 2014-02-28 20:03:38 -05:00 · 2014-02-28 20:03:35 -05:00 · 2014-02-28 20:01:37 -05:00 · 2014-02-28 16:45:09 -08:00
126 changed files with 8886 additions and 4806 deletions
@@ -0,0 +1,2 @@
+*.java   diff=java
+
@@ -4,3 +4,10 @@
 target

 .DS_Store
+*.iml
+.idea
+
+/bin
+/dependency-reduced-pom.xml
+*-private.sh
+
@@ -0,0 +1,7 @@
+language: java
+jdk:
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
+notifications:
+  email: false
@@ -1,3 +1,284 @@
+5.9
+- Added a config option to allow explosion flags to only prevent block damage
+- Added allow-tamed-spawns setting, on by default. This will stop WorldGuard
+    from culling tamed animals.
+- Added config option and flag to prevent soil from drying naturally.
+- Added formatting codes, &k/l/m/n/o and &x (reset).
+- Added snow-fall-blocks option to config to restrict snow fall to certain blocks
+- Allow players to add newlines (\n) via command, not just manually in yml.
+- Allow the console to load/save all region managers with one command.
+- Changed entity report format slightly.
+- Check bypass perms for item-drop flag.
+- Check for entities and projectiles removing items from frames too.
+- Fix being able to use bonemeal to turn tall grass into double plants.
+- Fix number of arguments for migratedb command.
+- Fixed addowner/addmember commands adding command artifacts. Specifically, 
+    "-w <world>" will no longer be added when using it.
+- Fixed milking cows in protected areas due to changes in Bukkit.
+- Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order.
+- Fixed snowman trails being treated as snow fall.
+- Make /rg list default to own regions if the player doesn't have permission otherwise.
+- Protected items in item frames in protected regions.
+- Resolved an issue where explosions of type OTHER_EXPLOSION were ignoring the world 
+    configuration settings.
+- Send item-use blacklist event when right-clicking entities.
+- Transformed the BlockFadeEvent handler into a switch.
+
+5.8:
+- BREAKING CHANGE: This version has been built for versions of Bukkit for MC 1.6.1 and
+  newer. Do not try to use this version of WG on an older Bukkit version.
+- Added support for Minecraft 1.6+. Actual support of new 1.6 additions is dependant on
+    Bukkit. Please use a newer build of Bukkit if, for example, you seem to be unable to
+    add "Horses" to your lists of entities.
+- Added mobs.disable-snowman-trails to disable the trails left by walking snowmen.
+- Added -a flag to /region removeowner and /region removemember to remove all objects.
+- Teleporting is now handled by entry/exit flags. If this is causing people to get
+    entirely stuck inside entry/exit deny regions, set the new setting
+    'use-player-teleports' to 'false' in your configuration.
+- Updated formatting for region commands, especially /region info.
+- Changed permissions checking for /region commands to be more consistent, checking for
+    region IDs as a sub-node. This means that if some permissions for some region
+    commands no longer work, add '.*' to the end of permission lines for WG in your
+    permission plugin.
+
+5.7.5:
+- Refixed a few issues from 5.7.4.
+
+5.7.4:
+- BREAKING CHANGE: Removed the cyan "**" in front of greeting
+  and farewell messages to allow more customizability. You can
+  re-add them by adding "&c**" to the flag.
+- Fixed an issue enderpearling inside exit/entry deny regions.
+- Added checks to players teleporting in and out of exit/entry regions. 
+- Fix bad matching in blocked and allowed command flags.
+- Fixed heal flag bugs when player max health was increased. 
+- Add fishing to xp blocker.
+- Applied other-explosion flag to entity damage as well.
+- Fixed an issue with interaction that should allow blacklisting item use actions with no block involved (eg fishing rods, potions) 
+- Fix witherskull/fireball settings not being differentiated in one case 
+- Allow cow milking in no-build areas
+- Fix infinite durability breaking items instantly.
+
+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
@@ -330,4 +611,4 @@ EduardBaer, TomyLobo, and halvors
 - Added block lag fix.

 1.0
- Initial release.
+- Initial release.
@@ -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
+    }
@@ -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>Getting Started</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> <a href="http://www.sk89q.com/projects/worldedit/">WorldEdit</a> must be installed, but if you do not want it,  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>Idle with us in IRC at <a href="http://skq.me/irc/irc.esper.net/worldguard">irc.esper.net in #worldguard</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>
-  <li>Submit bug reports and suggestions to the <a href="http://redmine.sk89q.com/projects/worldguard/issues">issue tracker</a></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>
@@ -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://builds.enginehub.org) [![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)
@@ -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 
@@ -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;
@@ -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;
@@ -1,78 +1,160 @@
-<!--
-  Maven build file for WorldGuard
-  Copyright (c) 2011 sk89q <http://www.sk89q.com> 
-  WorldGuard 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.4</version>
+  <version>5.9.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  
+  <!-- Project information -->
  <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers</description>
-
+  <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>
-    <url>https://github.com/sk89q/worldguard</url>
    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
+    <url>https://github.com/sk89q/worldguard</url>
+    <tag>master</tag>
  </scm>
-
-  <repositories>
-    <!-- Repository for other dependencies of SK's -->
+  
+  <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>
    <repository>
-      <id>sk89q-mvn2</id>
-      <url>http://mvn2.sk89q.com/repo</url>
+      <id>maven.sk89q.com</id>
+      <url>http://maven.sk89q.com/artifactory/libs-release-local</url>
+    </repository>
+    <snapshotRepository>
+      <id>maven.sk89q.com-snapshot</id>
+      <url>http://maven.sk89q.com/artifactory/libs-snapshot-local</url>
+    </snapshotRepository>
+  </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 for Bukkit -->
    <repository>
      <id>bukkit-repo</id>
-      <url>http://repo.bukkit.org/artifactory/repo</url>
+      <url>http://repo.bukkit.org/content/groups/public</url>
    </repository>
  </repositories>
-
+  
  <dependencies>
-    <!-- Required component -->
    <dependency>
      <groupId>com.sk89q</groupId>
      <artifactId>worldedit</artifactId>
-      <version>4.7</version>
+      <version>5.5.8</version>
+      <scope>compile</scope>
+      <type>jar</type>
    </dependency>
    
-    <!-- Bukkit -->
    <dependency>
      <groupId>org.bukkit</groupId>
      <artifactId>bukkit</artifactId>
-      <version>1.0.0-R1-SNAPSHOT</version>
+      <version>1.7.2-R0.3</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>commandbook</artifactId>
+      <version>2.3</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>
    
-    <!-- Additional libraries -->
    <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.4</version>
+      <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 -->
    <resources>
      <resource>
        <targetPath>.</targetPath>
@@ -95,14 +177,16 @@
    </resources>

    <plugins>
-      <!-- Compile plugin -->
      <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>
-
-      <!-- JAR creation plugin -->
+      
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
@@ -115,14 +199,12 @@
              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
            </manifest>
            <manifestEntries>
-              <Class-Path>WorldEdit.jar WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
+              <Class-Path>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>
@@ -135,20 +217,19 @@
            </goals>
            <configuration>
              <artifactSet>
-                <!-- We want to bundle in the modified CSV library -->
                <includes>
                  <include>net.sf.opencsv:opencsv</include>
+                  <include>org.khelekore:prtree</include>
                </includes>
              </artifactSet>
            </configuration>
          </execution>
        </executions>
      </plugin>
-
-      <!-- Assembly -->
+      
      <plugin>
        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
+        <version>2.2-beta-2</version>
        <configuration>
          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
        </configuration>
@@ -162,31 +243,85 @@
          </execution>
        </executions>
      </plugin>
-
-      <!-- Release -->
+      
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-release-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.4.1</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>
  
-  <reporting>
-    <plugins>
-      <!-- Javadocs -->
-      <!-- TODO: Get Doclava working -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
-        <configuration>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+  <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>
@@ -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>
@@ -29,7 +28,9 @@
        <include>LICENSE.txt</include>
        <include>NOTICE.txt</include>
        <include>CHANGELOG.txt</include>
-        <include>blacklist_table.sql</include>
+        <include>contrib/blacklist_table.sql</include>
+        <include>contrib/region_storage.sql</include>
+        <include>contrib/region_storage_update_20110325.sql</include>
      </includes>
    </fileSet>
  </fileSets>
@@ -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
@@ -41,10 +41,6 @@ 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.
@@ -67,14 +63,17 @@ public abstract class Blacklist {

    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();
@@ -83,8 +82,8 @@ 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);
@@ -93,7 +92,7 @@ public abstract class Blacklist {
    /**
     * 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();
@@ -102,7 +101,7 @@ public abstract class Blacklist {
    /**
     * 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;
@@ -111,7 +110,7 @@ public abstract class Blacklist {
    /**
     * Get the logger.
     *
-     * @return
+     * @return The logger used in this blacklist
     */
    public BlacklistLogger getLogger() {
        return blacklistLogger;
@@ -120,10 +119,10 @@ 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());
@@ -142,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;
@@ -171,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;
                            }
@@ -249,7 +248,7 @@ public abstract class Blacklist {
                if (input != null) {
                    input.close();
                }
-            } catch (IOException e2) {
+            } catch (IOException ignore) {
            }
        }
    }
@@ -257,7 +256,7 @@ public abstract class Blacklist {
    /**
     * Get the last event.
     *
-     * @return
+     * @return The last event
     */
    public BlacklistEvent getLastEvent() {
        return lastEvent;
@@ -266,8 +265,8 @@ public abstract class Blacklist {
    /**
     * 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;
@@ -283,14 +282,14 @@ public abstract class Blacklist {
    /**
     * 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());
@@ -306,7 +305,8 @@ 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);
@@ -320,7 +320,8 @@ 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);
@@ -19,6 +19,7 @@

 package com.sk89q.worldguard.blacklist;

+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;

@@ -69,7 +70,7 @@ public class BlacklistEntry {
    /**
     * Construct the object.
     *
-     * @param blacklist
+     * @param blacklist The blacklist that contains this entry
     */
    public BlacklistEntry(Blacklist blacklist) {
        this.blacklist = blacklist;
@@ -105,105 +106,103 @@ public class BlacklistEntry {
     */
    public void setIgnorePermissions(String[] ignorePermissions) {
        Set<String> ignorePermissionsSet = new HashSet<String>();
-        for (String perm : ignorePermissions) {
-            ignorePermissionsSet.add(perm);
-        }
+        Collections.addAll(ignorePermissionsSet, ignorePermissions);
        this.ignorePermissions = ignorePermissionsSet;
    }

    /**
-     * @return
+     * @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;
@@ -240,8 +239,8 @@ 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) {
@@ -266,8 +265,8 @@ public class BlacklistEntry {
    /**
     * 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) {
@@ -299,11 +298,11 @@ 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();
@@ -329,11 +328,11 @@ 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) {
@@ -412,7 +411,7 @@ 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);
@@ -39,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);
@@ -64,7 +64,7 @@ public class BlacklistLogger implements BlacklistLoggerHandler {
    /**
     * Log an event.
     *
-     * @param event
+     * @param event The event to log
     */
    public void logEvent(BlacklistEvent event, String comment) {
        for (BlacklistLoggerHandler handler : handlers) {
@@ -32,8 +32,8 @@ 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;
@@ -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();
 }
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -37,77 +37,70 @@ 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;
+	
+    private final Logger logger;

-    public ConsoleLoggerHandler(String worldName)
-    {
-       this.worldName = worldName;
+    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());
        }
    }
@@ -115,14 +108,15 @@ public class ConsoleLoggerHandler implements BlacklistLoggerHandler {
    /**
     * 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;
        }
    }

@@ -42,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()) {
@@ -105,13 +105,11 @@ 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) {
@@ -140,7 +138,7 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
    /**
     * Log an event.
     *
-     * @param event
+     * @param event The event to log
     */
    public void logEvent(BlacklistEvent event, String comment) {
        // Block break
@@ -200,7 +198,7 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
            if (conn != null && !conn.isClosed()) {
                conn.close();
            }
-        } catch (SQLException e) {
+        } catch (SQLException ignore) {

        }
    }
@@ -39,23 +39,12 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.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 FileLoggerHandler implements BlacklistLoggerHandler {
-    /**
-     * Logger.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
    /**
     * Regex for patterns in the path.
     */
@@ -83,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();
@@ -171,8 +167,9 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
    /**
     * 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());
@@ -220,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();

@@ -240,8 +237,8 @@ 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();
@@ -255,55 +252,17 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
    /**
     * 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);
@@ -321,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) {
            }
        }

@@ -42,8 +42,8 @@ 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;
@@ -54,14 +54,14 @@ 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;
@@ -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;
@@ -0,0 +1,46 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.command.CommandSender;
+import org.enginehub.util.PermissionModel;
+
+abstract class AbstractPermissionModel implements PermissionModel {
+    
+    private final WorldGuardPlugin plugin;
+    private final CommandSender sender;
+
+    public AbstractPermissionModel(WorldGuardPlugin plugin, CommandSender sender) {
+        this.plugin = plugin;
+        this.sender = sender;
+    }
+    
+    protected WorldGuardPlugin getPlugin() {
+        return plugin;
+    }
+
+    public CommandSender getSender() {
+        return sender;
+    }
+
+    protected boolean hasPluginPermission(String permission) {
+        return plugin.hasPermission(getSender(), "worldguard." + permission);
+    }
+
+}
@@ -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;
    }
    
@@ -57,6 +57,7 @@ public class BukkitPlayer extends LocalPlayer {

    @Override
    public void ban(String msg) {
+        player.setBanned(true);
        player.kickPlayer(msg);
    }

@@ -19,58 +19,58 @@

 package com.sk89q.worldguard.bukkit;

-import java.util.List;
-
+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.Material;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
+import org.bukkit.entity.ExperienceOrb;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockType;
+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());
@@ -78,22 +78,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) {
@@ -101,22 +103,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, 1));
+                new ItemStack(ItemID.SIGN, 1));
    }

    /**
     * Sets the given block to fluid water.
     * Used by addSpongeWater()
-     * 
+     *
     * @param world
     * @param ox
     * @param oy
@@ -132,21 +136,38 @@ 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;
    }

    /**
@@ -167,7 +188,7 @@ public class BukkitUtil {

        byte free = 0;

-        while (y <= 129) {
+        while (y <= world.getMaxHeight() + 1) {
            if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) {
                free++;
            } else {
@@ -179,7 +200,7 @@ public class BukkitUtil {
                    loc.setX(x + 0.5);
                    loc.setY(y);
                    loc.setZ(z + 0.5);
-                    if (y <= 2 && world.getBlockAt(x,0,z).getType() == Material.AIR) {
+                    if (y <= 2 && world.getBlockAt(x,0,z).getTypeId() == BlockID.AIR) {
                        world.getBlockAt(x,0,z).setTypeId(20);
                        loc.setY(2);
                    }
@@ -228,6 +249,14 @@ public class BukkitUtil {
        str = str.replace("&2", ChatColor.GRAY.toString());
        str = str.replace("&w", ChatColor.WHITE.toString());

+        str = str.replace("&k", ChatColor.MAGIC.toString());
+        str = str.replace("&l", ChatColor.BOLD.toString());
+        str = str.replace("&m", ChatColor.STRIKETHROUGH.toString());
+        str = str.replace("&n", ChatColor.UNDERLINE.toString());
+        str = str.replace("&o", ChatColor.ITALIC.toString());
+
+        str = str.replace("&x", ChatColor.RESET.toString());
+
        return str;
    }

@@ -235,14 +264,34 @@ public class BukkitUtil {
     * Returns whether an entity should be removed for the halt activity mode.
     *
     * @param entity
-     * @return
+     * @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 FallingBlock
                || (entity instanceof LivingEntity
-                && !(entity instanceof Tameable)
-                && !(entity instanceof Player));
+                    && !(entity instanceof Tameable)
+                    && !(entity instanceof Player));
+    }
+
+    /**
+     * 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;
    }
 }
@@ -18,18 +18,23 @@
 */
 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 com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.Blacklist;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;

 /**
 * Represents the global configuration and also delegates configuration
@@ -69,11 +74,17 @@ public class ConfigurationManager {
    /**
     * 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>();

    /**
@@ -81,53 +92,93 @@ public class ConfigurationManager {
     */
    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 usePlayerTeleports;
+    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
        plugin.createDefaultConfiguration(
                new File(plugin.getDataFolder(), "config.yml"), "config.yml");

-        Configuration config = plugin.getConfiguration();
-        config.load();
+        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();
+        }

-        suppressTickSyncWarnings = config.getBoolean(
-                "suppress-tick-sync-warnings", false);
-        useRegionsScheduler = config.getBoolean(
-                "regions.use-scheduler", true);
-        autoGodMode = config.getBoolean(
-                "auto-invincible-permission", false);
-        usePlayerMove = config.getBoolean(
-                "use-player-move-event", true);
+        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);
+        usePlayerTeleports = config.getBoolean("use-player-teleports", 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()) {
            get(world);
        }

-        try {
-            config.setHeader(CONFIG_HEADER);
-        } catch (Throwable t) {
-        }
+        config.setHeader(CONFIG_HEADER);

-        config.save();
+        if (!config.save()) {
+            plugin.getLogger().severe("Error saving configuration!");
+        }
    }

    /**
@@ -140,16 +191,20 @@ 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);
+        WorldConfiguration newConfig = null;

-        if (config == null) {
-            config = new WorldConfiguration(plugin, worldName);
-            worlds.put(worldName, config);
+        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;
@@ -158,7 +213,7 @@ 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
@@ -178,17 +233,20 @@ public class ConfigurationManager {
    /**
     * 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());
    }
@@ -196,17 +254,23 @@ public class ConfigurationManager {
    /**
     * 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());
@@ -215,19 +279,34 @@ public class ConfigurationManager {
    /**
     * 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.
+     * Check to see if amphibious mode is enabled for a player.
     *
-     * @param player
-     * @return
+     * @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;
+    }
 }
@@ -36,46 +36,47 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
 /**
 * 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>();
    }

    /**
     * Run the task.
     */
-    public void run() {
+    @Override
+	public void run() {
        Player[] players = plugin.getServer().getOnlinePlayers();
        ConfigurationManager config = plugin.getGlobalStateManager();

        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);
@@ -83,11 +84,9 @@ public class FlagStateManager implements Runnable {
            }

            Vector playerLocation = toVector(player.getLocation());
-            RegionManager regionManager = plugin.getGlobalRegionManager()
-                    .get(player.getWorld());
-            ApplicableRegionSet applicable = regionManager
-                    .getApplicableRegions(playerLocation);
-            
+            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)) {
@@ -96,38 +95,46 @@ public class FlagStateManager implements Runnable {
            }
        }
    }
-    
+
    /**
     * 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() <= 0) {
            return;
        }
-        
+
        long now = System.currentTimeMillis();

        Integer healAmount = applicable.getFlag(DefaultFlag.HEAL_AMOUNT);
        Integer healDelay = applicable.getFlag(DefaultFlag.HEAL_DELAY);
-        Integer minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
-        Integer maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);
-        
+        Double minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
+        Double 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;
+        if (minHealth == null) {
+			minHealth = 0.0;
+		}
+        if (maxHealth == null) {
+			maxHealth = player.getMaxHealth();
+		}
+
+        // 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(healAmount > 0 ? maxHealth : minHealth); // this will insta-kill if the flag is unset
            state.lastHeal = now;
@@ -137,13 +144,13 @@ public class FlagStateManager implements Runnable {
            state.lastHeal = now;
        }
    }
-    
+
    /**
     * Process restoring hunger for a player.
-     * 
-     * @param applicable
-     * @param player
-     * @param state
+     *
+     * @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) {
@@ -154,12 +161,20 @@ public class FlagStateManager implements Runnable {
        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;
+        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;
@@ -177,8 +192,8 @@ public class FlagStateManager implements Runnable {

    /**
     * Forget a player.
-     * 
-     * @param player
+     *
+     * @param player The player to forget
     */
    public synchronized void forget(Player player) {
        states.remove(player.getName());
@@ -192,22 +207,23 @@ public class FlagStateManager implements Runnable {
    }

    /**
-     * Get a player's flag state.
-     * 
-     * @param player
-     * @return
+     * 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.
     */
@@ -219,6 +235,7 @@ public class FlagStateManager implements Runnable {
        public Boolean lastExitAllowed = null;
        public Boolean notifiedForLeave = false;
        public Boolean notifiedForEnter = false;
+        public GameMode lastGameMode;
        public World lastWorld;
        public int lastBlockX;
        public int lastBlockY;
@@ -26,10 +26,9 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.logging.Logger;
-
 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;

@@ -39,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);
@@ -58,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
@@ -68,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!");
            }
            
@@ -80,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
@@ -104,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());
        }
    }
@@ -115,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) {
@@ -137,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) {
                }
            }
        }
@@ -0,0 +1,145 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+/**
+ * Used for querying region-related permissions.
+ */
+public class RegionPermissionModel extends AbstractPermissionModel {
+    
+    public RegionPermissionModel(WorldGuardPlugin plugin, CommandSender sender) {
+        super(plugin, sender);
+    }
+    
+    public boolean mayForceLoadRegions() {
+        return hasPluginPermission("region.load");
+    }
+    
+    public boolean mayForceSaveRegions() {
+        return hasPluginPermission("region.save");
+    }
+    
+    public boolean mayMigrateRegionStore() {
+        return hasPluginPermission("region.migratedb");
+    }
+    
+    public boolean mayDefine() {
+        return hasPluginPermission("region.define");
+    }
+    
+    public boolean mayRedefine(ProtectedRegion region) {
+        return hasPatternPermission("redefine", region);
+    }
+    
+    public boolean mayClaim() {
+        return hasPluginPermission("region.claim");
+    }
+    
+    public boolean mayClaimRegionsUnbounded() {
+        return hasPluginPermission("region.unlimited");
+    }
+    
+    public boolean mayDelete(ProtectedRegion region) {
+        return hasPatternPermission("remove", region);
+    }
+    
+    public boolean maySetPriority(ProtectedRegion region) {
+        return hasPatternPermission("setpriority", region);
+    }
+    
+    public boolean maySetParent(ProtectedRegion child, ProtectedRegion parent) {
+        return hasPatternPermission("setparent", child) &&
+                (parent == null ||
+                hasPatternPermission("setparent", parent));
+    }
+    
+    public boolean maySelect(ProtectedRegion region) {
+        return hasPatternPermission("select", region);
+    }
+    
+    public boolean mayLookup(ProtectedRegion region) {
+        return hasPatternPermission("info", region);
+    }
+    
+    public boolean mayTeleportTo(ProtectedRegion region) {
+        return hasPatternPermission("teleport", region);
+    }
+    
+    public boolean mayList() {
+        return hasPluginPermission("region.list");
+    }
+    
+    public boolean mayList(String targetPlayer) {
+        if (targetPlayer == null) {
+            return mayList();
+        }
+        
+        if (targetPlayer.equalsIgnoreCase(getSender().getName())) {
+            return hasPluginPermission("region.list.own");
+        } else {
+            return mayList();
+        }
+    }
+    
+    public boolean maySetFlag(ProtectedRegion region) {
+        return hasPatternPermission("flag.regions", region);
+    }
+    
+    public boolean maySetFlag(ProtectedRegion region, Flag<?> flag) {
+        // This is a WTF permission
+        return hasPatternPermission(
+                "flag.flags." + flag.getName().toLowerCase(), region);
+    }
+    
+    /**
+     * Checks to see if the given sender has permission to modify the given region
+     * using the region permission pattern.
+     * 
+     * @param perm the name of the node
+     * @param region the region
+     */
+    private boolean hasPatternPermission(String perm, ProtectedRegion region) {
+        if (!(getSender() instanceof Player)) {
+            return true; // Non-players (i.e. console, command blocks, etc.) have full power
+        }
+        
+        LocalPlayer localPlayer = getPlugin().wrapPlayer((Player) getSender());
+        String idLower = region.getId().toLowerCase();
+        String effectivePerm;
+        
+        if (region.isOwner(localPlayer)) {
+            return hasPluginPermission("region." + perm + ".own." + idLower) ||
+                    hasPluginPermission("region." + perm + ".member." + idLower);
+        } else if (region.isMember(localPlayer)) {
+            return hasPluginPermission("region." + perm + ".member." + idLower);
+        } else {
+            effectivePerm = "region." + perm + "." + idLower;
+        }
+
+        return hasPluginPermission(effectivePerm);
+    }
+
+}
@@ -59,7 +59,7 @@ public class RegionQueryUtil {
                set = mgr.getApplicableRegions(vec);
            }

-            state.wasInvincible = set.allows(DefaultFlag.INVINCIBILITY);
+            state.wasInvincible = set.allows(DefaultFlag.INVINCIBILITY, plugin.wrapPlayer(player));
        }

        return state.wasInvincible;
@@ -71,11 +71,11 @@ public class RegionQueryUtil {
        Vector vec = new Vector(state.lastInvincibleX, state.lastInvincibleY, state.lastInvincibleZ);

        StateFlag.State regionState = plugin.getGlobalRegionManager().get(world).
-                getApplicableRegions(vec).getFlag(DefaultFlag.INVINCIBILITY);
+                getApplicableRegions(vec).getFlag(DefaultFlag.INVINCIBILITY, plugin.wrapPlayer(player));
        if (regionState == StateFlag.State.ALLOW) {
-            return true;
+            return Boolean.TRUE;
        } else if (regionState == StateFlag.State.DENY) {
-            return false;
+            return Boolean.FALSE;
        } else {
            return null;
        }
@@ -127,7 +127,7 @@ public class ReportWriter {
                configLog.put(field.getName(), val);
            } catch (IllegalArgumentException e) {
                e.printStackTrace();
-            } catch (IllegalAccessException e) {
+            } catch (IllegalAccessException ignore) {
            }
        }
        
@@ -166,7 +166,7 @@ public class ReportWriter {
    }
    
    private void appendPluginInformation(Plugin[] plugins) {
-        appendHeader("Plugins");
+        appendHeader("Plugins (" + plugins.length + ")");
        
        LogListBlock log = new LogListBlock();
        
@@ -231,7 +231,7 @@ public class ReportWriter {
            for (Map.Entry<Class<? extends Entity>, Integer> entry
                    : entityCounts.entrySet()) {
                entitiesLog.put(entry.getKey().getSimpleName(),
-                        "%d [%f]",
+                        "%d [%f/chunk]",
                        entry.getValue(),
                        (float) (entry.getValue() / (double) loadedChunkCount));
            }
@@ -274,7 +274,7 @@ public class ReportWriter {
                    configLog.put(field.getName(), String.valueOf(val));
                } catch (IllegalArgumentException e) {
                    e.printStackTrace();
-                } catch (IllegalAccessException e) {
+                } catch (IllegalAccessException ignore) {
                }
            }
            
@@ -324,7 +324,7 @@ public class ReportWriter {
            if (writer != null) {
                try {
                    writer.close();
-                } catch (IOException e) {
+                } catch (IOException ignore) {
                }
            }
        }
@@ -28,12 +28,12 @@ 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();
@@ -53,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();
@@ -0,0 +1,70 @@
+// $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.World;
+
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+/**
+ * Helper class to get a reference to WorldGuard and its components.
+ */
+public class WGBukkit {
+
+    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() {
+        return WorldGuardPlugin.inst();
+    }
+
+    /**
+     * Set cache to null for reload WorldGuardPlugin
+     * @deprecated instance is now stored directly in {@link WorldGuardPlugin}
+     */
+    @Deprecated
+    public static void cleanCache() {
+        // do nothing - plugin instance is stored in plugin class now
+    }
+
+    /**
+     * 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 WorldGuardPlugin.inst().getRegionManager(world);
+    }
+
+}
@@ -29,13 +29,14 @@ import java.util.List;
 import java.util.Map;
 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.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.util.config.Configuration;
+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;
@@ -63,33 +64,31 @@ public class WorldConfiguration {
            "# 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 blockLighter;
@@ -101,13 +100,20 @@ public class WorldConfiguration {
    public boolean blockTNTBlockDamage;
    public boolean blockCreeperExplosions;
    public boolean blockCreeperBlockDamage;
+    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 int loginProtection;
-    // public int spawnProtection;
-    // public boolean kickOnDeath;
-    // public boolean exactRespawn;
-    // public boolean teleportToHome;
+    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,8 +128,9 @@ public class WorldConfiguration {
    public boolean disableMobDamage;
    public boolean useRegions;
    public boolean highFreqFlags;
-    public int regionWand = 287;
-    public Set<CreatureType> blockCreatureSpawn;
+    public int regionWand;
+    public Set<EntityType> blockCreatureSpawn;
+    public boolean allowTamedSpawns;
    // public boolean useiConomy;
    // public boolean buyOnClaim;
    // public double buyOnClaimPrice;
@@ -132,6 +139,7 @@ public class WorldConfiguration {
    public int maxRegionCountPerPlayer;
    public boolean antiWolfDumbness;
    public boolean signChestProtection;
+    public boolean disableSignChestProtectionCheck;
    public boolean removeInfiniteStacks;
    public boolean disableCreatureCropTrampling;
    public boolean disablePlayerCropTrampling;
@@ -151,37 +159,47 @@ public class WorldConfiguration {
    public boolean disableIceFormation;
    public boolean disableLeafDecay;
    public boolean disableGrassGrowth;
+    public boolean disableMyceliumSpread;
+    public boolean disableVineGrowth;
    public boolean disableEndermanGriefing;
+    public boolean disableSnowmanTrails;
+    public boolean disableSoilDehydration;
+    public Set<Integer> allowedSnowFallOver;
    public boolean regionInvinciblityRemovesMobs;
+    public boolean explosionFlagCancellation;
    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;

        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) {
@@ -280,17 +298,33 @@ public class WorldConfiguration {
     * 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);

-        // classicWater = getBoolean("simulation.classic-water", 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);
+
        simulateSponge = getBoolean("simulation.sponge.enable", true);
        spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
        redstoneSponges = getBoolean("simulation.sponge.redstone", false);
@@ -300,6 +334,7 @@ public class WorldConfiguration {

        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));

@@ -314,16 +349,24 @@ 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);
+        allowTamedSpawns = getBoolean("mobs.allow-tamed-spawns", true);
        disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", 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);
+        disableSnowmanTrails = getBoolean("mobs.disable-snowman-trails", 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);
@@ -340,6 +383,7 @@ public class WorldConfiguration {
        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);
@@ -360,18 +404,23 @@ public class WorldConfiguration {
        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);
+        disableSoilDehydration = getBoolean("dynamics.disable-soil-dehydration", false);
+        allowedSnowFallOver = new HashSet<Integer>(getIntList("dynamics.snow-fall-blocks", null));

        useRegions = getBoolean("regions.enable", true);
        regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
+        explosionFlagCancellation = getBoolean("regions.explosion-flags-block-entity-damage", true);
        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.default", 7);
        maxRegionCounts = new HashMap<String, Integer>();
        maxRegionCounts.put(null, maxRegionCountPerPlayer);
-        
+
        for (String key : getKeys("regions.max-region-count-per-player")) {
            if (!key.equalsIgnoreCase("default")) {
                Object val = getProperty("regions.max-region-count-per-player." + key);
@@ -380,17 +429,19 @@ public class WorldConfiguration {
                }
            }
        }
-        
+
        // useiConomy = getBoolean("iconomy.enable", false);
        // buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
        // buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);

-        blockCreatureSpawn = new HashSet<CreatureType>();
+        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);
            }
@@ -430,64 +481,60 @@ 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, blockTNTExplosions
-                    ? "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.");
                }
            }
        }

-        try {
-            config.setHeader(CONFIG_HEADER);
-        } catch (Throwable t) {
-        }
+        config.setHeader(CONFIG_HEADER);

        config.save();
    }
@@ -512,10 +559,8 @@ public class WorldConfiguration {
    }

    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) {
@@ -543,13 +588,15 @@ 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 < groupMax) {
+                    max = groupMax;
+                }
            }
        }
        if (max <= -1) {
@@ -18,39 +18,43 @@
 */
 package com.sk89q.worldguard.bukkit;

-import static com.sk89q.worldguard.bukkit.BukkitUtil.dropSign;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-
-import java.util.logging.Logger;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.*;

 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
+import org.bukkit.entity.Snowman;
+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.BlockListener;
+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.EntityBlockFormEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
 import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.PluginManager;
+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;
@@ -63,21 +67,17 @@ 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;
@@ -87,74 +87,40 @@ public class WorldGuardBlockListener extends BlockListener {
     * Register events.
     */
    public void registerEvents() {
-        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("LEAVES_DECAY", Priority.High);
-        registerEvent("BLOCK_FORM", Priority.High);
-        registerEvent("BLOCK_SPREAD", Priority.High);
-        registerEvent("BLOCK_FADE", Priority.High);
-        registerEvent("BLOCK_PISTON_EXTEND", Priority.High);
-        registerEvent("BLOCK_PISTON_RETRACT", 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);
@@ -162,16 +128,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);

@@ -180,12 +142,13 @@ public class WorldGuardBlockListener extends BlockListener {
            if (held.getTypeId() > 0
                    && !(ItemType.usesDamageValue(held.getTypeId())
                    || BlockType.usesData(held.getTypeId()))) {
-                held.setDurability((short) -1);
+                held.setDurability((short) 0);
                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;
@@ -208,7 +171,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);
@@ -216,15 +179,11 @@ 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();
@@ -275,7 +234,7 @@ 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 ((isAir || isWater) &&
                    wcfg.preventWaterDamage.contains(targetId)) {
                event.setCancelled(true);
@@ -285,7 +244,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;
@@ -313,15 +272,11 @@ public class WorldGuardBlockListener extends BlockListener {
        }
    }

-    /**
+    /*
     * Called when a block gets ignited.
     */
-    @Override
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onBlockIgnite(BlockIgniteEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
        IgniteCause cause = event.getCause();
        Block block = event.getBlock();
        World world = block.getWorld();
@@ -333,7 +288,6 @@ public class WorldGuardBlockListener extends BlockListener {
            event.setCancelled(true);
            return;
        }
-
        boolean isFireSpread = cause == IgniteCause.SPREAD;

        if (wcfg.preventLightningFire && cause == IgniteCause.LIGHTNING) {
@@ -351,7 +305,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);
@@ -387,12 +341,11 @@ 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 (!set.canBuild(localPlayer)) {
-                        event.setCancelled(true);
-                        return;
-                    }
+                // this is preliminarily handled in the player listener under handleBlockRightClick
+                // why it's handled here too, no one knows
+                if (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL) {
                    if (!set.allows(DefaultFlag.LIGHTER)
+                            && !set.canBuild(localPlayer)
                            && !plugin.hasPermission(player, "worldguard.override.lighter")) {
                        event.setCancelled(true);
                        return;
@@ -411,20 +364,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());

@@ -439,7 +399,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;
        }

@@ -448,6 +410,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;
            }
        }
@@ -456,14 +419,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;
            }
@@ -471,16 +438,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());

@@ -505,18 +482,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();
@@ -525,7 +504,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;
@@ -540,8 +521,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);
@@ -562,12 +543,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();

@@ -598,29 +578,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;
                }
@@ -629,33 +608,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;
            }
@@ -668,12 +647,8 @@ public class WorldGuardBlockListener extends BlockListener {
        }
    }

-    @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());

@@ -695,14 +670,11 @@ public class WorldGuardBlockListener extends BlockListener {
        }
    }

-    /**
+    /*
     * Called when a block is formed based on world conditions.
     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onBlockForm(BlockFormEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());

@@ -711,9 +683,19 @@ public class WorldGuardBlockListener extends BlockListener {
            return;
        }

-        Material type = event.getNewState().getType();
+        int type = event.getNewState().getTypeId();

-        if (type == Material.ICE) {
+        if (event instanceof EntityBlockFormEvent) {
+            if (((EntityBlockFormEvent) event).getEntity() instanceof Snowman) {
+                if (wcfg.disableSnowmanTrails) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            return;
+        }
+
+        if (type == BlockID.ICE) {
            if (wcfg.disableIceFormation) {
                event.setCancelled(true);
                return;
@@ -725,11 +707,19 @@ public class WorldGuardBlockListener extends BlockListener {
            }
        }

-        if (type == Material.SNOW) {
+        if (type == BlockID.SNOW) {
            if (wcfg.disableSnowFormation) {
                event.setCancelled(true);
                return;
            }
+            if (wcfg.allowedSnowFallOver.size() > 0) {
+                int targetId = event.getBlock().getRelative(0, -1, 0).getTypeId();
+
+                if (!wcfg.allowedSnowFallOver.contains(targetId)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
                    DefaultFlag.SNOW_FALL, event.getBlock().getLocation())) {
                event.setCancelled(true);
@@ -738,14 +728,11 @@ public class WorldGuardBlockListener extends BlockListener {
        }
    }

-    /**
+    /*
     * Called when a block spreads based on world conditions.
     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onBlockSpread(BlockSpreadEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());

@@ -754,9 +741,9 @@ public class WorldGuardBlockListener extends BlockListener {
            return;
        }

-        Material fromType = event.getSource().getType();
+        int fromType = event.getSource().getTypeId();

-        if (fromType == Material.RED_MUSHROOM || fromType == Material.BROWN_MUSHROOM) {
+        if (fromType == BlockID.RED_MUSHROOM || fromType == BlockID.BROWN_MUSHROOM) {
            if (wcfg.disableMushroomSpread) {
                event.setCancelled(true);
                return;
@@ -768,7 +755,7 @@ public class WorldGuardBlockListener extends BlockListener {
            }
        }

-        if (fromType == Material.GRASS) {
+        if (fromType == BlockID.GRASS) {
            if (wcfg.disableGrassGrowth) {
                event.setCancelled(true);
                return;
@@ -779,54 +766,92 @@ public class WorldGuardBlockListener extends BlockListener {
                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) {
-        if (event.isCancelled()) {
-            return;
-        }

        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());

-        Material type = event.getBlock().getType();
-
-        if (type == Material.ICE) {
+        switch (event.getBlock().getTypeId()) {
+        case 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;
            }
-        }
+            break;

-        if (type == Material.SNOW) {
+        case 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;
            }
+            break;
+
+        case BlockID.SOIL:
+            if (wcfg.disableSoilDehydration) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.SOIL_DRY, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+            break;
        }
+
    }

-    /**
+    /*
     * Called when a piston extends
     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());

@@ -844,14 +869,11 @@ public class WorldGuardBlockListener extends BlockListener {
        }
    }

-    /**
+    /*
     * Called when a piston retracts
     */
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());

@@ -859,7 +881,44 @@ public class WorldGuardBlockListener extends BlockListener {
            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);
+        }
+    }
+
 }
@@ -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));
+            }
+        }
+    }
+}
@@ -0,0 +1,216 @@
+// $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.LivingEntity;
+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 org.bukkit.projectiles.ProjectileSource;
+
+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;
+                ProjectileSource remover = projectile.getShooter(); 
+                removerEntity = (remover instanceof LivingEntity ? (LivingEntity) remover : null);
+            }
+
+            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;
+                    }
+                }
+
+                // this now covers dispensers as well, if removerEntity is null above,
+                // due to a non-LivingEntity ProjectileSource
+                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);
+//            }
+        }
+    }
+}
@@ -24,14 +24,12 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
 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.logging.Filter;
-import java.util.logging.Logger;
 import java.util.zip.ZipEntry;

 import org.bukkit.ChatColor;
@@ -41,38 +39,42 @@ import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 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.PermissionsResolverManager;
+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.minecraft.util.commands.Injector;
+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.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.
+     * Current instance of this plugin.
     */
-    static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
+    private static WorldGuardPlugin inst;
+
    /**
     * Manager for commands. This automatically handles nested commands,
     * permissions checking, and a number of other fancy command things.
@@ -84,20 +86,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.
     */
@@ -110,49 +104,65 @@ public class WorldGuardPlugin extends JavaPlugin {
    public WorldGuardPlugin() {
        configuration = new ConfigurationManager(this);
        globalRegionManager = new GlobalRegionManager(this);
-        
-        final WorldGuardPlugin plugin = this;
+
+        final WorldGuardPlugin plugin = inst = this;
        commands = new CommandsManager<CommandSender>() {
            @Override
            public boolean hasPermission(CommandSender player, String perm) {
                return plugin.hasPermission(player, perm);
            }
        };
-        commands.setInjector(new Injector() {
-            public Object getInstance(Class<?> cls) throws InvocationTargetException, IllegalAccessException, InstantiationException {
-                try {
-                    return cls.getConstructor(WorldGuardPlugin.class).newInstance(plugin);
-                } catch (NoSuchMethodException e) {
-                    e.printStackTrace();
-                    return null;
-                }
-            }
-        });
-        
-        // Register command classes
-        commands.register(ToggleCommands.class);
-        commands.register(ProtectionCommands.class);
-        commands.register(GeneralCommands.class);
    }
-    
+
+    /**
+     * Get the current instance of WorldGuard
+     * @return WorldGuardPlugin instance
+     */
+    public static WorldGuardPlugin inst() {
+        return inst;
+    }
+
    /**
     * 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(this, getDescription().getName(), 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);
@@ -160,17 +170,8 @@ public class WorldGuardPlugin extends JavaPlugin {
        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);
-            }
+            getServer().getScheduler().scheduleSyncRepeatingTask(this, flagStateManager,
+                    FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
        }

        // Register events
@@ -179,6 +180,13 @@ public class WorldGuardPlugin extends JavaPlugin {
        (new WorldGuardEntityListener(this)).registerEvents();
        (new WorldGuardWeatherListener(this)).registerEvents();
        (new WorldGuardVehicleListener(this)).registerEvents();
+        (new WorldGuardServerListener(this)).registerEvents();
+        (new WorldGuardHangingListener(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));
@@ -187,28 +195,27 @@ public class WorldGuardPlugin extends JavaPlugin {
        }
        worldListener.registerEvents();

-        // 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);
+        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);
+                }
            }
        }
-
-        logger.info("WorldGuard " + this.getDescription().getVersion() + " enabled.");
    }

    /**
     * Called on plugin disable.
     */
+    @Override
    public void onDisable() {
        globalRegionManager.unload();
        configuration.unload();
        this.getServer().getScheduler().cancelTasks(this);
-
-        logger.info("WorldGuard " + getDescription().getVersion() + " disabled.");
    }
-    
+
    /**
     * Handle a command.
     */
@@ -234,43 +241,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;
@@ -278,14 +285,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;
@@ -294,54 +302,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()) {
@@ -354,22 +364,22 @@ public class WorldGuardPlugin extends JavaPlugin {
                return true;
            }
        }
-        
+
        // Invoke the permissions resolver
        if (sender instanceof Player) {
            Player player = (Player) sender;
-            return perms.hasPermission(player.getWorld().getName(), player.getName(), perm);
+            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 {
@@ -377,13 +387,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 {
@@ -393,22 +403,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>();
@@ -416,43 +431,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 {
@@ -460,25 +475,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()));
        }
@@ -491,7 +513,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);
@@ -499,7 +521,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>();
@@ -507,7 +529,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(
@@ -517,32 +539,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)
@@ -550,48 +573,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 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();
@@ -601,7 +634,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) {
@@ -611,7 +644,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) {
@@ -625,65 +658,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 void createDefaultConfiguration(File actual,
            String defaultName) {
-        
+
        // Make parent directories
        File parent = actual.getParentFile();
        if (!parent.exists()) {
@@ -702,9 +735,9 @@ public class WorldGuardPlugin extends JavaPlugin {
                if (copy == null) throw new FileNotFoundException();
                input = file.getInputStream(copy);
            } catch (IOException e) {
-                logger.severe(getDescription().getName() + ": Unable to read default configuration: " + defaultName);
+                getLogger().severe("Unable to read default configuration: " + defaultName);
            }
-        
+
        if (input != null) {
            FileOutputStream output = null;

@@ -716,7 +749,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();
@@ -725,60 +758,68 @@ 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);
@@ -801,9 +842,17 @@ public class WorldGuardPlugin extends JavaPlugin {
    /**
     * Replace macros in the text.
     *
-     * @param sender
-     * @param message
-     * @return
+     * 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();
@@ -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();
+        }
+    }
+}
@@ -7,33 +7,22 @@ package com.sk89q.worldguard.bukkit;

 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;

-import java.util.logging.Logger;
-
 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.Event;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
-import org.bukkit.event.vehicle.VehicleListener;
 import org.bukkit.event.vehicle.VehicleMoveEvent;
-import org.bukkit.plugin.PluginManager;
-
 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 extends VehicleListener {
-
-    /**
-     * Logger for messages.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+public class WorldGuardVehicleListener implements Listener {

    private WorldGuardPlugin plugin;

@@ -50,30 +39,10 @@ public class WorldGuardVehicleListener extends VehicleListener {
     * Register events.
     */
    public void registerEvents() {
-        registerEvent("VEHICLE_MOVE", Event.Priority.Normal);
-        registerEvent("VEHICLE_DESTROY", 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 vehicle is destroyed.
-     */
-    @Override
+    @EventHandler
    public void onVehicleDestroy(VehicleDestroyEvent event) {
        Vehicle vehicle = event.getVehicle();
        Entity destroyer = event.getAttacker();
@@ -93,7 +62,7 @@ public class WorldGuardVehicleListener extends VehicleListener {

            if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                    && !set.canBuild(localPlayer)
-                    && !set.allows(DefaultFlag.DESTROY_VEHICLE)) {
+                    && !set.allows(DefaultFlag.DESTROY_VEHICLE, localPlayer)) {
                player.sendMessage(ChatColor.DARK_RED + "You don't have permission to destroy vehicles here.");
                event.setCancelled(true);
                return;
@@ -101,10 +70,7 @@ public class WorldGuardVehicleListener extends VehicleListener {
        }
    }

-    /**
-     * Called when a vehicle moves.
-     */
-    @Override
+    @EventHandler
    public void onVehicleMove(VehicleMoveEvent event) {
        Vehicle vehicle = event.getVehicle();
        if (vehicle.getPassenger() == null
@@ -114,96 +80,16 @@ public class WorldGuardVehicleListener extends VehicleListener {
        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) {
-
+                boolean result = WorldGuardPlayerListener.checkMove(plugin, player, event.getFrom(), event.getTo());
+                if (result) {
                    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);
-                String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE);
-                Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER);
-                Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE);
-                
-                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();
            }
        }
    }
@@ -20,28 +20,19 @@ package com.sk89q.worldguard.bukkit;

 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;

-import java.util.logging.Logger;
-
 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;

-public class WorldGuardWeatherListener extends WeatherListener {
-
-    /**
-     * Logger for messages.
-     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+public class WorldGuardWeatherListener implements Listener {

    /**
     * Plugin.
@@ -51,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());

@@ -100,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());

@@ -120,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());

@@ -5,29 +5,21 @@
 */
 package com.sk89q.worldguard.bukkit;

-import java.util.logging.Logger;
-
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
+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.event.world.WorldLoadEvent;
-import org.bukkit.plugin.PluginManager;

-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;
@@ -37,31 +29,10 @@ public class WorldGuardWorldListener extends WorldListener {
     * Register events.
     */
    public void registerEvents() {
-//        PluginManager pm = plugin.getServer().getPluginManager();
-
-        registerEvent("CHUNK_LOAD", Event.Priority.Normal);
-        registerEvent("WORLD_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();

@@ -76,19 +47,25 @@ public class WorldGuardWorldListener extends WorldListener {
            }

            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());
            }
        }
    }

-    /**
-     * Called when a world is loaded.
-     */
+    @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);
@@ -39,6 +39,7 @@ public class GeneralCommands {
        this.plugin = plugin;
    }
    
+    @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 {
@@ -84,6 +85,7 @@ public class GeneralCommands {
        }
    }
    
+    @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 {
@@ -273,17 +275,19 @@ public class GeneralCommands {
                    if (item2.getTypeId() == item.getTypeId() &&
                            ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
                                    || item.getDurability() == item2.getDurability()) &&
-                            item.getEnchantments().equals(item2.getEnchantments())) {
+                                    ((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++;
@@ -34,11 +34,11 @@ public class ProtectionCommands {
        this.plugin = plugin;
    }

-    @Command(aliases = {"region"}, desc = "Region management 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"}, desc = "WorldGuard commands")
+    @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands")
    @NestedCommand({WorldGuardCommands.class})
    public void worldGuard(CommandContext args, CommandSender sender) {}
 }
@@ -0,0 +1,58 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit.commands;
+
+/**
+ * Used for /rg list.
+ */
+class RegionListEntry implements Comparable<RegionListEntry> {
+    
+    private final String id;
+    private final int index;
+    boolean isOwner;
+    boolean isMember;
+
+    public RegionListEntry(String id, int index) {
+        this.id = id;
+        this.index = index;
+    }
+
+    @Override
+    public int compareTo(RegionListEntry o) {
+        if (isOwner != o.isOwner) {
+            return isOwner ? 1 : -1;
+        }
+        if (isMember != o.isMember) {
+            return isMember ? 1 : -1;
+        }
+        return id.compareTo(o.id);
+    }
+
+    @Override
+    public String toString() {
+        if (isOwner) {
+            return (index + 1) + ". +" + id;
+        } else if (isMember) {
+            return (index + 1) + ". -" + id;
+        } else {
+            return (index + 1) + ". " + id;
+        }
+    }
+    
+}
@@ -19,8 +19,6 @@

 package com.sk89q.worldguard.bukkit.commands;

-import java.io.IOException;
-
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
@@ -32,10 +30,11 @@ 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.

@@ -45,15 +44,30 @@ public class RegionMemberCommands {
    public RegionMemberCommands(WorldGuardPlugin plugin) {
        this.plugin = plugin;
    }
-    
-    @Command(aliases = {"addmember", "addmember"}, usage = "<id> <members...>",
-            desc = "Add a member to a region", min = 2)
+
+    @Command(aliases = {"addmember", "addmember"},
+            usage = "<id> <members...>",
+            flags = "w:",
+            desc = "Add a member to a region",
+            min = 2)
    public void addMember(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
        String id = args.getString(0);

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
@@ -62,36 +76,55 @@ public class RegionMemberCommands {
        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.getParsedPaddedSlice(1, 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...>",
-            desc = "Add an owner to a region", min = 2)
+
+    @Command(aliases = {"addowner", "addowner"},
+            usage = "<id> <owners...>",
+            flags = "w:",
+            desc = "Add an owner to a region",
+            min = 2)
    public void addOwner(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
        String id = args.getString(0);

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
@@ -101,48 +134,67 @@ public class RegionMemberCommands {
            throw new CommandException("Could not find a region by that ID.");
        }

+        id = region.getId();
+
        Boolean flag = region.getFlag(DefaultFlag.BUYABLE);
        DefaultDomain owners = region.getOwners();
-        if (flag != null && flag == true && 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.");
+        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());
                }
            }
-            plugin.checkPermission(sender, "worldguard.region.addowner.unclaimed." + id.toLowerCase());
+        }
+
+        RegionDBUtil.addToDomain(region.getOwners(), args.getParsedPaddedSlice(1, 0), 0);
+
+        sender.sendMessage(ChatColor.YELLOW
+                + "Region '" + id + "' updated.");
+
+        try {
+            mgr.save();
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
+                    + e.getMessage());
+        }
+    }
+
+    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
+            usage = "<id> <owners...>",
+            flags = "aw:",
+            desc = "Remove an owner to a region",
+            min = 1)
+    public void removeMember(CommandContext args, CommandSender sender) throws CommandException {
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
        } 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());
+            if (player != null) {
+                world = player.getWorld();
            } else {
-                plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
+                throw new CommandException("No world specified. Use -w <worldname>.");
            }
        }

-        RegionUtil.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: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"}, usage = "<id> <owners...>",
-            desc = "Remove an owner to a region", min = 2)
-    public void removeMember(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);

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
@@ -151,37 +203,63 @@ public class RegionMemberCommands {
        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);
+        if (args.hasFlag('a')) {
+            region.getMembers().removeAll();
+        } else {
+            if (args.argsLength() < 2) {
+                throw new CommandException("List some names to remove, or use -a to remove all.");
+            }
+            RegionDBUtil.removeFromDomain(region.getMembers(), args.getParsedPaddedSlice(1, 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...>",
-            desc = "Remove an owner to a region", min = 2)
+
+    @Command(aliases = {"removeowner", "remowner"},
+            usage = "<id> <owners...>",
+            flags = "aw:",
+            desc = "Remove an owner to a region",
+            min = 1)
    public void removeOwner(CommandContext args,
            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
        String id = args.getString(0);

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
@@ -190,24 +268,35 @@ public class RegionMemberCommands {
        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);
+        if (args.hasFlag('a')) {
+            region.getOwners().removeAll();
+        } else {
+            if (args.argsLength() < 2) {
+                throw new CommandException("List some names to remove, or use -a to remove all.");
+            }
+            RegionDBUtil.removeFromDomain(region.getOwners(), args.getParsedPaddedSlice(1, 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());
        }
    }
@@ -0,0 +1,334 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+/**
+ * Create a region printout, as used in /region info to show information about
+ * a region.
+ */
+public class RegionPrintoutBuilder {
+    
+    private final ProtectedRegion region;
+    private final StringBuilder builder = new StringBuilder();
+
+    /**
+     * Create a new instance with a region to report on.
+     * 
+     * @param region the region
+     */
+    public RegionPrintoutBuilder(ProtectedRegion region) {
+        this.region = region;
+    }
+
+    /**
+     * Add a new line.
+     */
+    private void newLine() {
+        builder.append("\n");
+    }
+    
+    /**
+     * Add region name, type, and priority.
+     */
+    public void appendBasics() {
+        builder.append(ChatColor.BLUE);
+        builder.append("Region: ");
+        builder.append(ChatColor.YELLOW);
+        builder.append(region.getId());
+        
+        builder.append(ChatColor.GRAY);
+        builder.append(" (type=");
+        builder.append(region.getTypeName());
+        
+        builder.append(ChatColor.GRAY);
+        builder.append(", priority=");
+        builder.append(region.getPriority());
+        builder.append(")");
+
+        newLine();
+    }
+    
+    /**
+     * Add information about flags.
+     */
+    public void appendFlags() {
+        builder.append(ChatColor.BLUE);
+        builder.append("Flags: ");
+        
+        appendFlagsList(true);
+        
+        newLine();
+    }
+    
+    /**
+     * Append just the list of flags (without "Flags:"), including colors.
+     *
+     * @param useColors true to use colors
+     */
+    public void appendFlagsList(boolean useColors) {
+        boolean hasFlags = false;
+        
+        for (Flag<?> flag : DefaultFlag.getFlags()) {
+            Object val = region.getFlag(flag), group = null;
+            
+            // No value
+            if (val == null) {
+                continue;
+            }
+
+            if (hasFlags) {
+                builder.append(", ");
+            } else {
+                if (useColors) {
+                    builder.append(ChatColor.YELLOW);
+                }
+            }
+
+            RegionGroupFlag groupFlag = flag.getRegionGroupFlag();
+            if (groupFlag != null) {
+                group = region.getFlag(groupFlag);
+            }
+
+            if(group == null) {
+                builder.append(flag.getName()).append(": ")
+                    .append(String.valueOf(val));
+            } else {
+                builder.append(flag.getName()).append(" -g ")
+                    .append(String.valueOf(group)).append(": ")
+                    .append(String.valueOf(val));
+            }
+
+            hasFlags = true;
+        }
+            
+        if (!hasFlags) {
+            if (useColors) {
+                builder.append(ChatColor.RED);
+            }
+            builder.append("(none)");
+        }
+    }
+    
+    /**
+     * Add information about parents.
+     */
+    public void appendParents() {
+        appendParentTree(true);
+    }
+    
+    /**
+     * Add information about parents.
+     * 
+     * @param useColors true to use colors
+     */
+    public void appendParentTree(boolean useColors) {
+        if (region.getParent() == null) {
+            return;
+        }
+        
+        List<ProtectedRegion> inheritance = new ArrayList<ProtectedRegion>();
+
+        ProtectedRegion r = region;
+        inheritance.add(r);
+        while (r.getParent() != null) {
+            r = r.getParent();
+            inheritance.add(r);
+        }
+
+        ListIterator<ProtectedRegion> it = inheritance.listIterator(
+                inheritance.size());
+
+        int indent = 0;
+        while (it.hasPrevious()) {
+            ProtectedRegion cur = it.previous();
+            if (useColors) {
+                builder.append(ChatColor.GREEN);
+            }
+            
+            // Put symbol for child
+            if (indent != 0) {
+                for (int i = 0; i < indent; i++) {
+                    builder.append("  ");
+                }
+                builder.append("\u2517");
+            }
+            
+            // Put name
+            builder.append(cur.getId());
+            
+            // Put (parent)
+            if (!cur.equals(region)) {
+                if (useColors) {
+                    builder.append(ChatColor.GRAY);
+                }
+                builder.append(" (parent, priority=" + cur.getPriority() + ")");
+            }
+            
+            indent++;
+            newLine();
+        }
+    }
+    
+    /**
+     * Add information about members.
+     */
+    public void appendDomain() {
+        builder.append(ChatColor.BLUE);
+        builder.append("Owners: ");
+        DefaultDomain owners = region.getOwners();
+        if (owners.size() != 0) {
+            builder.append(ChatColor.YELLOW);
+            builder.append(owners.toUserFriendlyString());
+        } else {
+            builder.append(ChatColor.RED);
+            builder.append("(no owners)");
+        }
+
+        newLine();
+
+        builder.append(ChatColor.BLUE);
+        builder.append("Members: ");
+        DefaultDomain members = region.getMembers();
+        if (members.size() != 0) {
+            builder.append(ChatColor.YELLOW);
+            builder.append(members.toUserFriendlyString());
+        } else {
+            builder.append(ChatColor.RED);
+            builder.append("(no members)");
+        }
+        
+        newLine();
+    }
+    
+    /**
+     * Add information about coordinates.
+     */
+    public void appendBounds() {
+        BlockVector min = region.getMinimumPoint();
+        BlockVector max = region.getMaximumPoint();
+        builder.append(ChatColor.BLUE);
+        builder.append("Bounds:");
+        builder.append(ChatColor.YELLOW);
+        builder.append(" (" + min.getBlockX() + "," + min.getBlockY() + "," + min.getBlockZ() + ")");
+        builder.append(" -> (" + max.getBlockX() + "," + max.getBlockY() + "," + max.getBlockZ() + ")");
+        
+        newLine();
+    }
+    
+    /**
+     * Append all the default fields used for /rg info.
+     */
+    public void appendRegionInfo() {
+        builder.append(ChatColor.GRAY);
+        builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
+        builder.append(" Region Info ");
+        builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
+        newLine();
+        appendBasics();
+        appendFlags();
+        appendParents();
+        appendDomain();
+        appendBounds();
+    }
+    
+    /**
+     * Send the report to a {@link CommandSender}.
+     * 
+     * @param sender the recepient
+     */
+    public void send(CommandSender sender) {
+        sender.sendMessage(toString());
+    }
+    
+    public StringBuilder append(boolean b) {
+        return builder.append(b);
+    }
+
+    public StringBuilder append(char c) {
+        return builder.append(c);
+    }
+
+    public StringBuilder append(char[] str, int offset, int len) {
+        return builder.append(str, offset, len);
+    }
+
+    public StringBuilder append(char[] str) {
+        return builder.append(str);
+    }
+
+    public StringBuilder append(CharSequence s, int start, int end) {
+        return builder.append(s, start, end);
+    }
+
+    public StringBuilder append(CharSequence s) {
+        return builder.append(s);
+    }
+
+    public StringBuilder append(double d) {
+        return builder.append(d);
+    }
+
+    public StringBuilder append(float f) {
+        return builder.append(f);
+    }
+
+    public StringBuilder append(int i) {
+        return builder.append(i);
+    }
+
+    public StringBuilder append(long lng) {
+        return builder.append(lng);
+    }
+
+    public StringBuilder append(Object obj) {
+        return builder.append(obj);
+    }
+
+    public StringBuilder append(String str) {
+        return builder.append(str);
+    }
+
+    public StringBuilder append(StringBuffer sb) {
+        return builder.append(sb);
+    }
+
+    public StringBuilder appendCodePoint(int codePoint) {
+        return builder.appendCodePoint(codePoint);
+    }
+    
+    @Override
+    public String toString() {
+        return builder.toString().trim();
+    }
+
+}
@@ -97,7 +97,7 @@ public class ToggleCommands {
        wcfg.fireSpreadDisableToggle = false;
    }

-    @Command(aliases = {"halt-activity"},
+    @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 void stopLag(CommandContext args, CommandSender sender) throws CommandException {
@@ -128,7 +128,7 @@ public class ToggleCommands {

                if (removed > 10) {
                    sender.sendMessage("" + removed + " entities (>10) auto-removed from "
-                            + world.toString());
+                            + world.getName());
                }
            }

@@ -72,6 +72,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: "
@@ -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);
+
 }
@@ -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;
    }
 }
@@ -30,8 +30,8 @@ import java.util.Set;
 import com.sk89q.worldguard.LocalPlayer;

 public class DefaultDomain implements Domain {
-    private Set<String> groups;
-    private Set<String> players;
+    private final Set<String> groups;
+    private final Set<String> players;
    
    public DefaultDomain() {
        this.groups = new LinkedHashSet<String>();
@@ -70,20 +70,26 @@ 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() + players.size();
    }
@@ -129,4 +135,9 @@ public class DefaultDomain implements Domain {
        
        return str.toString();
    }
+
+    public void removeAll() {
+        groups.clear();
+        players.clear();
+    }
 }
@@ -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);
 }
@@ -26,31 +26,42 @@ 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;
+    }
 }
@@ -27,15 +27,15 @@ 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);
    }
@@ -46,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();
    }
-
 }
@@ -26,29 +26,33 @@ 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();
    }
-
 }
@@ -18,22 +18,13 @@
 */
 package com.sk89q.worldguard.protection;

-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 com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
-import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.flags.*;
 import com.sk89q.worldguard.protection.flags.StateFlag.State;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;

+import java.util.*;
+
 /**
 * 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
@@ -52,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) {
@@ -64,19 +55,26 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
    /**
     * Checks if a player can build in an area.
     * 
-     * @param player
+     * @param player The player to check
     * @return build ability
     */
    public boolean canBuild(LocalPlayer player) {
-        return internalGetState(DefaultFlag.BUILD, player, null, null);
+        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 use buttons and such in an area.
     * 
-     * @param player
+     * @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 !allows(DefaultFlag.USE, player)
                && !canBuild(player);
@@ -93,7 +91,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
        if (flag == DefaultFlag.BUILD) {
            throw new IllegalArgumentException("Can't use build flag with allows()");
        }
-        return internalGetState(flag, null, null, null);
+        return internalGetState(flag, null, null);
    }
    
    /**
@@ -108,7 +106,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
        if (flag == DefaultFlag.BUILD) {
            throw new IllegalArgumentException("Can't use build flag with allows()");
        }
-        return internalGetState(flag, null, flag.getGroupFlag(), player);
+        return internalGetState(flag, null, player);
    }
    
    /**
@@ -149,12 +147,10 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     * 
     * @param flag flag to check
     * @param player null to not check owners and members
-     * @param groupFlag group flag to check
     * @param groupPlayer player to use for the group flag check
-     * @return
+     * @return the allow/deny state for the flag
     */
    private boolean internalGetState(StateFlag flag, LocalPlayer player,
-                                     RegionGroupFlag groupFlag,
                                     LocalPlayer groupPlayer) {
        boolean found = false;
        boolean hasFlagDefined = false;
@@ -210,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 (hasFlagDefined && region.getPriority() < lastPriority) {
                break;
            }
-            
+
            lastPriority = region.getPriority();

            // Ignore non-build regions
@@ -229,16 +221,16 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
            }

            // Check group permissions
-            if (groupPlayer != null && groupFlag != null) {
-                RegionGroupFlag.RegionGroup group = region.getFlag(groupFlag);
+            if (groupPlayer != null && flag.getRegionGroupFlag() != null) {
+                RegionGroup group = region.getFlag(flag.getRegionGroupFlag());
                if (group == null) {
-                    group = groupFlag.getDefault();
+                    group = flag.getRegionGroupFlag().getDefault();
                }
                if (!RegionGroupFlag.isMember(region, group, groupPlayer)) {
                    continue;
                }
            }
-            
+
            State v = region.getFlag(flag);

            // Allow DENY to override everything
@@ -276,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) {
@@ -300,15 +292,25 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
        }
    }

+    /**
+     * @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) {
+    public <T extends Flag<V>, V> V getFlag(T flag, LocalPlayer groupPlayer) {
        /*
        if (flag instanceof StateFlag) {
            throw new IllegalArgumentException("Cannot use StateFlag with getFlag()");
@@ -321,32 +323,39 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
        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;
            }

            lastPriority = region.getPriority();
        }
        
-        try {
+        if (!needsClear.isEmpty()) {
            return needsClear.values().iterator().next();
-        } catch (NoSuchElementException e) {
+        } else {
            if (globalRegion != null) {
                V gFlag = globalRegion.getFlag(flag);
                if (gFlag != null) return gFlag;
@@ -358,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) {
@@ -378,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();
@@ -386,8 +395,6 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
    
    /**
     * Get an iterator of affected regions.
-     * 
-     * @return
     */
    public Iterator<ProtectedRegion> iterator() {
        return applicable.iterator();
@@ -22,9 +22,9 @@ import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;

 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;
@@ -36,9 +36,12 @@ 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.FlatRegionManager;
+import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;

 /**
@@ -50,8 +53,6 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
 */
 public class GlobalRegionManager {

-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-
    /**
     * Reference to the plugin.
     */
@@ -65,7 +66,7 @@ public class GlobalRegionManager {
    /**
     * 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
@@ -76,12 +77,12 @@ 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>();
    }

@@ -96,8 +97,8 @@ public class GlobalRegionManager {
    /**
     * 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(),
@@ -107,13 +108,12 @@ 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);
        }
    }
@@ -126,38 +126,59 @@ 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 + "'");
-
-            // Store the last modification date so we can track changes
-            lastModified.put(name, file.lastModified());
+            if (plugin.getGlobalStateManager().get(world).summaryOnStart) {
+                plugin.getLogger().info(manager.getRegions().size()
+                        + " regions loaded for '" + name + "'");
+            }

            return manager;
-        } catch (FileNotFoundException e) { // this should no longer happen hopefully
-            logger.info("WorldGuard: Region file for world \""
-                    + name + "\" missing or inaccessible.");
-        } catch (IOException e) {
-            logger.info("WorldGuard: Failed to load regions from file "
-                    + file.getAbsolutePath() + " : " + e.getMessage());
-        } catch (Exception e) {
-            logger.info("WorldGuard: Error loading regions for world \""
-                    + name + "\":" + e.getMessage());
+        } 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) {
+            plugin.getLogger().log(Level.SEVERE, "Error loading regions for world \""
+                    + name + "\": " + e.toString() + "\n\t" + e.getMessage());
+            e.printStackTrace();
        }

        // @TODO: THIS CREATES PROBLEMS!!one!!1!!eleven!!1!!!
@@ -179,6 +200,8 @@ public class GlobalRegionManager {
     * have changed.
     */
    public void reloadChanged() {
+        if (config.useSqlDatabase) return;
+
        for (String name : managers.keySet()) {
            File file = getPath(name);

@@ -196,7 +219,7 @@ public class GlobalRegionManager {
                        load(world);
                    }
                }
-            } catch (Exception e) {
+            } catch (Exception ignore) {
            }
        }
    }
@@ -204,14 +227,19 @@ public class GlobalRegionManager {
    /**
     * 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;
@@ -220,9 +248,9 @@ public class GlobalRegionManager {
    /**
     * 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."
@@ -232,21 +260,21 @@ public class GlobalRegionManager {
    /**
     * Returns whether the player can bypass.
     *
-     * @param player
-     * @param world
-     * @return
+     * @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());
@@ -255,9 +283,9 @@ public class GlobalRegionManager {
    /**
     * 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();
@@ -281,14 +309,11 @@ 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);

@@ -296,7 +321,52 @@ public class GlobalRegionManager {
            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);
    }
 }
@@ -19,8 +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 {
@@ -28,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());
    }
@@ -38,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();
    }
@@ -48,12 +48,27 @@ import com.sk89q.worldguard.util.ArrayReader;
 * @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.
     */
@@ -63,31 +78,31 @@ public class CSVDatabase extends AbstractProtectionDatabase {
     * 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) {
@@ -162,10 +177,12 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                    }
                }
            }
+        } catch (IOException e) {
+            throw new ProtectionDatabaseException(e);
        } finally {
            try {
                reader.close();
-            } catch (IOException e) {
+            } catch (IOException ignored) {
            }
        }

@@ -189,8 +206,8 @@ public class CSVDatabase extends AbstractProtectionDatabase {
    /**
     * 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) {
@@ -232,7 +249,7 @@ public class CSVDatabase extends AbstractProtectionDatabase {
    /**
     * 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) {
@@ -263,7 +280,7 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                    flagStr = String.valueOf(k);
                }

-                StateFlag flag = DefaultFlag.getLegacyFlag(flagStr);
+                StateFlag flag = legacyFlagCodes.get(flagStr);
                if (flag != null) {
                    region.setFlag(flag, curState);
                } else {
@@ -317,8 +334,8 @@ public class CSVDatabase extends AbstractProtectionDatabase {
    /**
     * 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) {
@@ -330,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;
    }
@@ -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;
+    }
+}
@@ -19,7 +19,6 @@

 package com.sk89q.worldguard.protection.databases;

-import java.io.IOException;
 import java.util.Map;

 import com.sk89q.worldguard.protection.managers.RegionManager;
@@ -35,39 +34,39 @@ 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);
 }
@@ -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);
+    }
+}
@@ -19,6 +19,8 @@

 package com.sk89q.worldguard.protection.databases;

+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

@@ -30,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) {
@@ -57,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) {
@@ -79,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();
@@ -98,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]);
+        }
+    }
 }
@@ -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;
@@ -29,6 +30,9 @@ 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;
@@ -40,30 +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) {
+    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) {}
-            // if this is thrown, we can't do anything (caught elsewhere anyway)
+            } catch (IOException e) {
+                throw new FileNotFoundException(file.getAbsolutePath());
+            }
        }
-        config = new Configuration(file);
+        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) {
@@ -76,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;
@@ -147,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;
        }
@@ -158,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);
+                }
+            }
        }
    }
    
@@ -171,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();
        }
@@ -189,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;
@@ -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);
+            }
+        }
+    }
+}
@@ -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;
+}
+
@@ -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);
+    }
+}
@@ -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;
+    }
+}
@@ -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);
+        }
+    }
+}
@@ -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);
+        }
+    }
+
+}
@@ -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;
+    }
+}
@@ -27,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) {
@@ -27,9 +27,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 * @author sk89q
 */
 public class CommandStringFlag extends Flag<String> {
-    
-    public CommandStringFlag(String name, char legacyCode) {
-        super(name, legacyCode);
+
+    public CommandStringFlag(String name, RegionGroup defaultGroup) {
+        super(name, defaultGroup);
    }

    public CommandStringFlag(String name) {
@@ -19,7 +19,8 @@

 package com.sk89q.worldguard.protection.flags;

-import org.bukkit.entity.CreatureType;
+import org.bukkit.GameMode;
+import org.bukkit.entity.EntityType;

 /**
 *
@@ -27,20 +28,23 @@ import org.bukkit.entity.CreatureType;
 */
 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);
+    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);
@@ -54,55 +58,62 @@ public final class DefaultFlag {
    public static final StateFlag MUSHROOMS = new StateFlag("mushroom-growth", true);
    public static final StateFlag LEAF_DECAY = new StateFlag("leaf-decay", true);
    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 SOIL_DRY = new StateFlag("soil-dry", true);
    public static final StateFlag ENDER_BUILD = new StateFlag("enderman-grief", true);
-    public static final StateFlag INVINCIBILITY = new StateFlag("invincible", false);
+    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 RegionGroupFlag ENTRY_PERM = new RegionGroupFlag("entry-group", RegionGroupFlag.RegionGroup.NON_MEMBERS);
    public static final StateFlag EXIT = new StateFlag("exit", true);
-    public static final RegionGroupFlag EXIT_PERM = new RegionGroupFlag("exit-group", RegionGroupFlag.RegionGroup.NON_MEMBERS);
-    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 IntegerFlag MIN_HEAL = new IntegerFlag("heal-min-health");
-    public static final IntegerFlag MAX_HEAL = new IntegerFlag("heal-max-health");
-    public static final IntegerFlag FEED_DELAY = new IntegerFlag("feed-delay");
-    public static final IntegerFlag FEED_AMOUNT = new IntegerFlag("feed-amount");
-    public static final IntegerFlag MIN_FOOD = new IntegerFlag("feed-min-hunger");
-    public static final IntegerFlag MAX_FOOD = new IntegerFlag("feed-max-hunger");
-    public static final VectorFlag TELE_LOC = new VectorFlag("teleport");
-    public static final RegionGroupFlag TELE_PERM = new RegionGroupFlag("teleport-group", RegionGroupFlag.RegionGroup.MEMBERS);
-    public static final VectorFlag SPAWN_LOC = new VectorFlag("spawn");
-    public static final RegionGroupFlag SPAWN_PERM = new RegionGroupFlag("spawn-group", RegionGroupFlag.RegionGroup.MEMBERS);
+    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 DoubleFlag MIN_HEAL = new DoubleFlag("heal-min-health", RegionGroup.ALL);
+    public static final DoubleFlag MAX_HEAL = new DoubleFlag("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", new CommandStringFlag(null));
-    public static final SetFlag<String> ALLOWED_CMDS = new SetFlag<String>("allowed-cmds", new CommandStringFlag(null));
+    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, CHEST_ACCESS, PISTONS,
+        PASSTHROUGH, BUILD, CONSTRUCT, PVP, CHEST_ACCESS, PISTONS,
        TNT, LIGHTER, USE, PLACE_VEHICLE, DESTROY_VEHICLE, SLEEP,
-        MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY,
-        CREEPER_EXPLOSION, GHAST_FIREBALL, ENDER_BUILD,
+        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, EXIT_PERM, ENTRY, ENTRY_PERM,
+        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,
-        MUSHROOMS, LEAF_DECAY, GRASS_SPREAD,
-        FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
-        TELE_LOC, TELE_PERM, SPAWN_LOC, SPAWN_PERM,
-        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE,
+        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT, SOIL_DRY, 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
    };

-    static {
-        ENTRY.setGroupFlag(ENTRY_PERM);
-        EXIT.setGroupFlag(EXIT_PERM);
-    }
-
    private DefaultFlag() {
    }

@@ -111,15 +122,15 @@ public final class DefaultFlag {
    }

    /**
-     * Get the legacy flag.
+     * Try to match the flag with the given ID using a fuzzy name match.
     *
-     * @param flagString
-     * @return null if not found
+     * @param id the flag ID
+     * @return a flag, or null
     */
-    public static StateFlag getLegacyFlag(String flagString) {
-        for (Flag<?> flag : flagsList) {
-            if (flag instanceof StateFlag && flagString.equals(String.valueOf(flag.getLegacyCode()))) {
-                return (StateFlag) flag;
+    public static Flag<?> fuzzyMatchFlag(String id) {
+        for (Flag<?> flag : DefaultFlag.getFlags()) {
+            if (flag.getName().replace("-", "").equalsIgnoreCase(id.replace("-", ""))) {
+                return flag;
            }
        }

@@ -28,8 +28,8 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 */
 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) {
@@ -52,6 +52,8 @@ public class DoubleFlag extends Flag<Double> {
    public Double unmarshal(Object o) {
        if (o instanceof Double) {
            return (Double) o;
+        } else if (o instanceof Number) {
+        	return ((Number) o).doubleValue();
        } else {
            return null;
        }
@@ -18,28 +18,28 @@
 */
 package com.sk89q.worldguard.protection.flags;

-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;
            }
@@ -29,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;
    }

@@ -41,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) {
@@ -88,5 +92,5 @@ public class EnumFlag<T extends Enum<T>> extends Flag<T> {
    public Object marshal(T o) {
        return o.name();
    }
-    
+
 }
@@ -30,24 +30,26 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 public abstract class Flag<T> {

    private String name;
-    private Character legacyCode;
-
-    public Flag(String name, char legacyCode) {
+    private RegionGroupFlag regionGroup;
+    
+    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,
@@ -28,8 +28,8 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 */
 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) {
@@ -52,6 +52,8 @@ public class IntegerFlag extends Flag<Integer> {
    public Integer unmarshal(Object o) {
        if (o instanceof Integer) {
            return (Integer) o;
+        } else if (o instanceof Number) {
+        	return ((Number) o).intValue();
        } else {
            return null;
        }
@@ -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;
+        }
+
+    }
+}
@@ -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
+}
@@ -18,10 +18,7 @@
 */
 package com.sk89q.worldguard.protection.flags;

-import org.bukkit.command.CommandSender;
-
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;

@@ -29,24 +26,12 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 *
 * @author sk89q
 */
-public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {
-
-    public static enum RegionGroup {
-        MEMBERS,
-        OWNERS,
-        NON_MEMBERS,
-        NON_OWNERS
-    }
+public class RegionGroupFlag extends EnumFlag<RegionGroup> {

    private RegionGroup def;

-    public RegionGroupFlag(String name, char legacyCode, RegionGroup def) {
-        super(name, legacyCode);
-        this.def = def;
-    }
-
    public RegionGroupFlag(String name, RegionGroup def) {
-        super(name);
+        super(name, RegionGroup.class, null);
        this.def = def;
    }

@@ -55,8 +40,7 @@ public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {
    }

    @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")) {
@@ -67,58 +51,31 @@ public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {
            return RegionGroup.NON_OWNERS;
        } else if (input.equalsIgnoreCase("nonmembers") || input.equalsIgnoreCase("nonmember")) {
            return RegionGroup.NON_MEMBERS;
-        } else if (input.equalsIgnoreCase("everyone") || input.equalsIgnoreCase("anyone")) {
-            return null;
-        } else {
-            throw new InvalidFlagFormat("Expected [non]member/[non]owner/anyone but got '" + 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 (str.equalsIgnoreCase("nonmembers")) {
-            return RegionGroup.NON_MEMBERS;
-        } else if (str.equalsIgnoreCase("nonowners")) {
-            return RegionGroup.NON_OWNERS;
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Object marshal(RegionGroup o) {
-        if (o == RegionGroup.MEMBERS) {
-            return "members";
-        } else if (o == RegionGroup.OWNERS) {
-            return "owners";
-        } else if (o == RegionGroup.NON_MEMBERS) {
-            return "nonmembers";
-        } else if (o == RegionGroup.NON_OWNERS) {
-            return "nonowners";
+        } 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;
        }
    }

    public static boolean isMember(ProtectedRegion region, RegionGroup group, LocalPlayer player) {
-        if (group == RegionGroupFlag.RegionGroup.OWNERS) {
+        if (group == null || group == RegionGroup.ALL) {
+            return true;
+        } else if (group == RegionGroup.OWNERS) {
            if (region.isOwner(player)) {
                return true;
            }
-        } else if (group == RegionGroupFlag.RegionGroup.MEMBERS) {
+        } else if (group == RegionGroup.MEMBERS) {
            if (region.isMember(player)) {
                return true;
            }
-        } else if (group == RegionGroupFlag.RegionGroup.NON_OWNERS) {
+        } else if (group == RegionGroup.NON_OWNERS) {
            if (!region.isOwner(player)) {
                return true;
            }
-        } else if (group == RegionGroupFlag.RegionGroup.NON_MEMBERS) {
+        } else if (group == RegionGroup.NON_MEMBERS) {
            if (!region.isMember(player)) {
                return true;
            }
@@ -129,19 +86,21 @@ public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {

    public static boolean isMember(ApplicableRegionSet set,
                                   RegionGroup group, LocalPlayer player) {
-        if (group == RegionGroupFlag.RegionGroup.OWNERS) {
+        if (group == null || group == RegionGroup.ALL) {
+            return true;
+        } else if (group == RegionGroup.OWNERS) {
            if (set.isOwnerOfAll(player)) {
                return true;
            }
-        } else if (group == RegionGroupFlag.RegionGroup.MEMBERS) {
+        } else if (group == RegionGroup.MEMBERS) {
            if (set.isMemberOfAll(player)) {
                return true;
            }
-        } else if (group == RegionGroupFlag.RegionGroup.NON_OWNERS) {
+        } else if (group == RegionGroup.NON_OWNERS) {
            if (!set.isOwnerOfAll(player)) {
                return true;
            }
-        } else if (group == RegionGroupFlag.RegionGroup.NON_MEMBERS) {
+        } else if (group == RegionGroup.NON_MEMBERS) {
            if (!set.isMemberOfAll(player)) {
                return true;
            }
@@ -36,9 +36,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 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;
    }

@@ -34,10 +34,9 @@ public class StateFlag extends Flag<StateFlag.State> {
    }

    private boolean def;
-    private RegionGroupFlag groupFlag;

-    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;
    }

@@ -50,14 +49,6 @@ public class StateFlag extends Flag<StateFlag.State> {
        return def;
    }

-    public RegionGroupFlag getGroupFlag() {
-        return groupFlag;
-    }
-
-    public void setGroupFlag(RegionGroupFlag groupFlag) {
-        this.groupFlag = groupFlag;
-    }
-
    @Override
    public State parseInput(WorldGuardPlugin plugin, CommandSender sender,
            String input) throws InvalidFlagFormat {
@@ -28,8 +28,8 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 */
 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) {
@@ -39,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
@@ -33,9 +33,9 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 * @author sk89q
 */
 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) {
@@ -43,14 +43,29 @@ 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.");
        }
    }

@@ -18,13 +18,6 @@
 */
 package com.sk89q.worldguard.protection.managers;

-import java.util.ArrayList;
-import java.util.Iterator;
-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;
@@ -32,6 +25,8 @@ import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
 import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
 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
@@ -49,46 +44,28 @@ 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());
@@ -96,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());
                }
@@ -110,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 =
@@ -150,7 +103,7 @@ public class FlatRegionManager extends RegionManager {

                while (parent != null) {
                    if (!appRegions.contains(parent)) {
-                        appRegions.add(region);
+                        appRegions.add(parent);
                    }

                    parent = parent.getParent();
@@ -182,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>();
@@ -201,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) {

@@ -223,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>();
@@ -252,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();