Convert godmode over to using entity metadata

Remove old CommandBook-has-GodComponent checks (mostly)
Cleaned up some trailing whitespace

.gitignore

@@ -4,10 +4,3 @@
 target
 
 .DS_Store
-*.iml
-.idea
-
-/bin
-/dependency-reduced-pom.xml
-*-private.sh
-

.travis.yml

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

CHANGELOG.txt

@@ -1,250 +1,28 @@
-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.
+ - Added 'allow-flight' flag, which allows or disallows flight per-region
+ - Restructured /region list
+ - 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

CONTRIBUTING.md

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

README.html

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

README.md

@@ -1,38 +1,25 @@
-![WorldGuard](http://static.sk89q.com/readme/worldguard.png)
+WorldGuard
 ==========
 
-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.
+WorldGuard protects your Minecraft server. As Minecraft's oldest surviving world protection mod, you know you're in safe hands.
 
 Compiling
 ---------
 
-The project is written for Java 6 and our build process makes use of [Maven](http://maven.apache.org). Detailed compilation information [can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#Compiling).
+You need to have Maven installed (http://maven.apache.org). Once installed,
+simply run:
 
-Dependencies are automatically handled by Maven.
+    mvn clean install
+    
+Maven will automatically download dependencies for you. Note: For that to work,
+be sure to add Maven to your "PATH".
 
 Contributing
 ------------
 
-We happily accept contributions, especially through pull requests on GitHub. Submissions 
-must be licensed under the GNU General Public License v3.
+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.
 
-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)
+By submitting code, you agree to place to license your code under the 
+GNU General Public License v3.

blacklist_table.sql

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

contrib/region_storage.sql

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

contrib/region_storage_update_20110325.sql

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

pom.xml

@@ -1,160 +1,90 @@
+<!--
+  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.9.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  
-  <!-- Project information -->
+  <version>5.5.2-SNAPSHOT</version>
   <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers.</description>
-  <licenses>
-    <license>
-      <name>GNU General Public License 2.0</name>
-      <url>LICENSE.txt</url>
-      <distribution>repo</distribution>
-      <comments>License on all contributions</comments>
-    </license>
-  </licenses>
-  
-  <issueManagement>
-    <system>YouTrack</system>
-    <url>http://youtrack.sk89q.com</url>
-  </issueManagement>
-  
-  <ciManagement>
-    <system>Jenkins</system>
-    <url>http://build.sk89q.com</url>
-  </ciManagement>
-  
+  <description>WorldGuard protects your Minecraft servers</description>
+
   <scm>
     <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
-    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
     <url>https://github.com/sk89q/worldguard</url>
-    <tag>master</tag>
+    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
   </scm>
-  
-  <mailingLists>
-    <mailingList>
-      <name>Developer Discussion</name>
-      <archive>https://groups.google.com/d/forum/sk-dev-discuss</archive>
-    </mailingList>
-  </mailingLists>
-  
-  <distributionManagement>
-    <site>
-      <id>sk89q-docs-upload</id>
-      <url>ftp://sk89q-maven-deploy/worldguard/</url>
-    </site>
-    <repository>
-      <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 for zml's stuff -->
     <repository>
       <id>zml-repo</id>
       <url>http://files.zachsthings.com/repo</url>
     </repository>
+    <!-- Repository for other dependencies of SK's -->
+    <repository>
+      <id>sk89q-mvn2</id>
+      <url>http://mvn2.sk89q.com/repo</url>
+    </repository>
+    <!-- Repository for Bukkit -->
     <repository>
       <id>bukkit-repo</id>
       <url>http://repo.bukkit.org/content/groups/public</url>
     </repository>
   </repositories>
-  
+
   <dependencies>
+    <!-- Required component -->
     <dependency>
       <groupId>com.sk89q</groupId>
       <artifactId>worldedit</artifactId>
-      <version>5.5.8</version>
-      <scope>compile</scope>
-      <type>jar</type>
+      <version>5.3-SNAPSHOT</version>
     </dependency>
     
+    <!-- Bukkit -->
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
-      <version>1.7.2-R0.3</version>
-      <scope>compile</scope>
-      <type>jar</type>
+      <version>1.1-R6</version>
     </dependency>
-    
+      
+    <!-- CommandBook -->
     <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>
+      <version>2.0</version>
     </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.5.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
+      <version>1.4</version>
     </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>
 
+  <build>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+
+    <!-- Resources -->
     <resources>
       <resource>
         <targetPath>.</targetPath>
@@ -177,6 +107,7 @@
     </resources>
 
     <plugins>
+      <!-- Compile plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -186,7 +117,8 @@
           <target>1.6</target>
         </configuration>
       </plugin>
-      
+
+      <!-- JAR creation plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -204,7 +136,9 @@
           </archive>
         </configuration>
       </plugin>
-      
+
+      <!-- Shade -->
+      <!-- We want to bundle in some dependencies -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -217,16 +151,17 @@
             </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-beta-2</version>
@@ -243,85 +178,32 @@
           </execution>
         </executions>
       </plugin>
-      
+
+      <!-- Release -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>2.2.2</version>
         <configuration>
           <preparationGoals>assembly:assembly</preparationGoals>
           <goals>assembly:assembly</goals>
           <tagNameFormat>@{project.version}</tagNameFormat>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <reportPlugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.5</version>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>license</report>
-                    <report>index</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-            </plugin>
-            
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.8.1</version>
-            </plugin>
-          </reportPlugins>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   
-  <profiles>
-    <!-- Attach javadocs and source .jars -->
-    <profile>
-      <id>attach-docs</id>
-      
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.8.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <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>
 </project>

region_storage.sql

@@ -0,0 +1,184 @@
+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 `user`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `user` (
+  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(64) NOT NULL UNIQUE,
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `group`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `group` (
+  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(64) NOT NULL UNIQUE,
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `world`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `world` (
+  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `name` VARCHAR(128) NOT NULL UNIQUE,
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `region`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region` (
+  `id` VARCHAR(128) NOT NULL ,
+  `world_id` INT UNSIGNED NOT NULL ,
+  `type` ENUM('cuboid','poly2d','global') NOT NULL ,
+  `priority` SMALLINT NOT NULL DEFAULT 0 ,
+  `parent` VARCHAR(128) NULL ,
+  PRIMARY KEY (`id`, `world_id`) ,
+  INDEX `parent` (`parent` ASC) ,
+  INDEX `fk_region_world` (`world_id` ASC) ,
+  CONSTRAINT `parent`
+    FOREIGN KEY (`parent` )
+    REFERENCES `region` (`id` )
+    ON DELETE SET NULL
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_region_world1`
+    FOREIGN KEY (`world_id` )
+    REFERENCES `world` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `region_flag`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_flag` (
+  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `region_id` VARCHAR(128) NOT NULL ,
+  `flag` VARCHAR(64) NOT NULL ,
+  `value` VARCHAR(256) NOT NULL ,
+  INDEX `fk_flags_region` (`region_id` ASC) ,
+  PRIMARY KEY (`id`) ,
+  CONSTRAINT `fk_flags_region1`
+    FOREIGN KEY (`region_id` )
+    REFERENCES `region` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `region_cuboid`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_cuboid` (
+  `region_id` VARCHAR(128) NOT NULL ,
+  `min_z` BIGINT NOT NULL ,
+  `min_y` BIGINT NOT NULL ,
+  `min_x` BIGINT NOT NULL ,
+  `max_z` BIGINT NOT NULL ,
+  `max_y` BIGINT NOT NULL ,
+  `max_x` BIGINT NOT NULL ,
+  PRIMARY KEY (`region_id`) ,
+  INDEX `fk_region_cuboid_region` (`region_id` ASC) ,
+  CONSTRAINT `fk_region_cuboid_region`
+    FOREIGN KEY (`region_id` )
+    REFERENCES `region` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `region_poly2d`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_poly2d` (
+  `region_id` VARCHAR(128) NOT NULL ,
+  `max_y` INT NOT NULL ,
+  `min_y` INT NOT NULL ,
+  PRIMARY KEY (`region_id`) ,
+  INDEX `fk_region_poly2d_region` (`region_id` ASC) ,
+  CONSTRAINT `fk_region_poly2d_region`
+    FOREIGN KEY (`region_id` )
+    REFERENCES `region` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `region_players`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_players` (
+  `region_id` VARCHAR(128) NOT NULL ,
+  `user_id` INT UNSIGNED NOT NULL ,
+  `owner` TINYINT(1)  NOT NULL ,
+  PRIMARY KEY (`region_id`, `user_id`) ,
+  INDEX `fk_region_players_region` (`region_id` ASC) ,
+  INDEX `fk_region_players_user` (`user_id` ASC) ,
+  CONSTRAINT `fk_region_players_region`
+    FOREIGN KEY (`region_id` )
+    REFERENCES `region` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_region_players_user`
+    FOREIGN KEY (`user_id` )
+    REFERENCES `user` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `region_groups`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_groups` (
+  `region_id` VARCHAR(128) NOT NULL ,
+  `group_id` INT UNSIGNED NOT NULL ,
+  `owner` TINYINT(1)  NOT NULL ,
+  PRIMARY KEY (`region_id`, `group_id`) ,
+  INDEX `fk_region_groups_region` (`region_id` ASC) ,
+  INDEX `fk_region_groups_group` (`group_id` ASC) ,
+  CONSTRAINT `fk_region_groups_region`
+    FOREIGN KEY (`region_id` )
+    REFERENCES `region` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT `fk_region_groups_group`
+    FOREIGN KEY (`group_id` )
+    REFERENCES `group` (`id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `region_poly2d_point`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `region_poly2d_point` (
+  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT ,
+  `region_id` VARCHAR(128) NOT NULL ,
+  `z` BIGINT NOT NULL ,
+  `x` BIGINT NOT NULL ,
+  PRIMARY KEY (`id`) ,
+  INDEX `fk_region_poly2d_point_region_poly2d` (`region_id` ASC) ,
+  CONSTRAINT `fk_region_poly2d_point_region_poly2d`
+    FOREIGN KEY (`region_id` )
+    REFERENCES `region_poly2d` (`region_id` )
+    ON DELETE CASCADE
+    ON UPDATE CASCADE)
+ENGINE = InnoDB;
+
+
+
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;

src/main/assembly/default.xml

@@ -28,9 +28,8 @@
         <include>LICENSE.txt</include>
         <include>NOTICE.txt</include>
         <include>CHANGELOG.txt</include>
-        <include>contrib/blacklist_table.sql</include>
-        <include>contrib/region_storage.sql</include>
-        <include>contrib/region_storage_update_20110325.sql</include>
+        <include>blacklist_table.sql</include>
+        <include>region_storage.sql</include>
       </includes>
     </fileSet>
   </fileSets>

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

@@ -82,9 +82,11 @@ public abstract class LocalPlayer {
     
     @Override
     public boolean equals(Object obj) {
-
-        return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName());
-
+        if (!(obj instanceof LocalPlayer)) {
+            return false;
+        }
+        
+        return ((LocalPlayer)obj).getName().equals(getName());
     }
     
     @Override

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

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldguard.blacklist;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -106,7 +105,9 @@ public class BlacklistEntry {
      */
     public void setIgnorePermissions(String[] ignorePermissions) {
         Set<String> ignorePermissionsSet = new HashSet<String>();
-        Collections.addAll(ignorePermissionsSet, ignorePermissions);
+        for (String perm : ignorePermissions) {
+            ignorePermissionsSet.add(perm);
+        }
         this.ignorePermissions = ignorePermissionsSet;
     }
 

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

@@ -1,46 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.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);
-    }
-
-}

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

@@ -19,10 +19,9 @@
 
 package com.sk89q.worldguard.bukkit;
 
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
+import java.util.List;
+
 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;
@@ -30,15 +29,19 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-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.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.FallingSand;
+
 import org.bukkit.inventory.ItemStack;
-import java.util.List;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BlockType;
 
 public class BukkitUtil {
 
@@ -137,37 +140,20 @@ public class BukkitUtil {
     /**
      * Checks if the given block is water
      *
-     * @param world the world
-     * @param ox x
-     * @param oy y
-     * @param oz z
-     * @return true if it's water
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     * @return
      */
     public static boolean isBlockWater(World world, int ox, int oy, int oz) {
         Block block = world.getBlockAt(ox, oy, oz);
         int id = block.getTypeId();
-        return id == 8 || id == 9;
-    }
-
-    /**
-     * 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;
+        if (id == 8 || id == 9) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -249,14 +235,6 @@ 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;
     }
 
@@ -264,34 +242,15 @@ public class BukkitUtil {
      * Returns whether an entity should be removed for the halt activity mode.
      *
      * @param entity
-     * @return true if it's to be removed
+     * @return
      */
     public static boolean isIntensiveEntity(Entity entity) {
         return entity instanceof Item
                 || entity instanceof TNTPrimed
                 || entity instanceof ExperienceOrb
-                || entity instanceof FallingBlock
+                || entity instanceof FallingSand
                 || (entity instanceof LivingEntity
                     && !(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;
-    }
 }

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

@@ -18,23 +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.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+
+import com.sk89q.util.yaml.YAMLFormat;
+import com.sk89q.util.yaml.YAMLProcessor;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.Blacklist;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.metadata.MetadataValue;
 
 /**
  * Represents the global configuration and also delegates configuration
@@ -45,6 +45,8 @@ import java.util.concurrent.ConcurrentMap;
  */
 public class ConfigurationManager {
 
+    public static final String GOD_METADATA_KEY = "god";
+
     private static final String CONFIG_HEADER = "#\r\n" +
             "# WorldGuard's main configuration file\r\n" +
             "#\r\n" +
@@ -74,35 +76,22 @@ public class ConfigurationManager {
     /**
      * Holds configurations for different worlds.
      */
-    private ConcurrentMap<String, WorldConfiguration> worlds;
+    private Map<String, WorldConfiguration> worlds;
 
     /**
      * The global configuration for use when loading worlds
      */
     private YAMLProcessor config;
 
-    /**
-     * List of people with god mode.
-     */
-    @Deprecated
-    private Set<String> hasGodMode = new HashSet<String>();
-
     /**
      * List of people who can breathe underwater.
      */
     private Set<String> hasAmphibious = new HashSet<String>();
 
-    private boolean hasCommandBookGodMode = false;
-
     public boolean useRegionsScheduler;
-    public boolean useRegionsCreatureSpawnEvent;
     public boolean activityHaltToggle = false;
-    public boolean autoGodMode;
+    @Deprecated public boolean autoGodMode = false;
     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
@@ -119,13 +108,12 @@ public class ConfigurationManager {
      */
     public ConfigurationManager(WorldGuardPlugin plugin) {
         this.plugin = plugin;
-        this.worlds = new ConcurrentHashMap<String, WorldConfiguration>();
+        this.worlds = new HashMap<String, WorldConfiguration>();
     }
 
     /**
      * Load the configuration.
      */
-    @SuppressWarnings("unchecked")
     public void load() {
         // Create the default configuration file
         plugin.createDefaultConfiguration(
@@ -141,26 +129,7 @@ public class ConfigurationManager {
 
         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);
@@ -197,14 +166,10 @@ public class ConfigurationManager {
     public WorldConfiguration get(World world) {
         String worldName = world.getName();
         WorldConfiguration config = worlds.get(worldName);
-        WorldConfiguration newConfig = null;
 
-        while (config == null) {
-            if (newConfig == null) {
-                newConfig = new WorldConfiguration(plugin, worldName, this.config);
-            }
-            worlds.putIfAbsent(world.getName(), newConfig);
-            config = worlds.get(world.getName());
+        if (config == null) {
+            config = new WorldConfiguration(plugin, worldName, this.config);
+            worlds.put(worldName, config);
         }
 
         return config;
@@ -225,8 +190,6 @@ public class ConfigurationManager {
                 bl.forgetPlayer(player);
             }
         }
-
-        hasGodMode.remove(player.getName());
         hasAmphibious.remove(player.getName());
     }
 
@@ -237,8 +200,9 @@ public class ConfigurationManager {
      */
     @Deprecated
     public void enableGodMode(Player player) {
-
-        hasGodMode.add(player.getName());
+        if (!hasGodMode(player)) {
+            player.setMetadata(GOD_METADATA_KEY, new FixedMetadataValue(plugin, true));
+        }
     }
 
     /**
@@ -248,7 +212,7 @@ public class ConfigurationManager {
      */
     @Deprecated
     public void disableGodMode(Player player) {
-        hasGodMode.remove(player.getName());
+        player.removeMetadata(GOD_METADATA_KEY, plugin);
     }
 
     /**
@@ -258,13 +222,20 @@ public class ConfigurationManager {
      * @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);
-            }
+        List<MetadataValue> values = player.getMetadata(GOD_METADATA_KEY);
+        switch (values.size()) {
+            case 0:
+                return false;
+            case 1:
+                return values.get(0).asBoolean();
+            default:
+                for (MetadataValue val : values) {
+                    if (val.asBoolean()) {
+                        return true;
+                    }
+                }
+                return false;
         }
-        return hasGodMode.contains(player.getName());
     }
 
     /**
@@ -295,18 +266,12 @@ public class ConfigurationManager {
         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;
+        try {
+            Class.forName("com.sk89q.commandbook.GodComponent");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
     }
 }

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

@@ -36,47 +36,46 @@ 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 The plugin instance
      */
     public FlagStateManager(WorldGuardPlugin plugin) {
         this.plugin = plugin;
-
+        
         states = new HashMap<String, PlayerFlagState>();
     }
 
     /**
      * Run the task.
      */
-    @Override
-	public void run() {
+    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);
@@ -84,9 +83,11 @@ 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)) {
@@ -95,7 +96,7 @@ public class FlagStateManager implements Runnable {
             }
         }
     }
-
+    
     /**
      * Process healing for a player.
      *
@@ -105,36 +106,28 @@ public class FlagStateManager implements Runnable {
      */
     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);
-        Double minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
-        Double maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);
-
+        Integer minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
+        Integer maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);
+        
         if (healAmount == null || healDelay == null || healAmount == 0 || healDelay < 0) {
             return;
         }
-        if (minHealth == null) {
-			minHealth = 0.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 (minHealth == null) minHealth = 0;
+        if (maxHealth == null) maxHealth = 20;
 
         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;
@@ -144,10 +137,10 @@ public class FlagStateManager implements Runnable {
             state.lastHeal = now;
         }
     }
-
+    
     /**
      * Process restoring hunger for a player.
-     *
+     * 
      * @param applicable The set of applicable regions
      * @param player The player to process hunger flags on
      * @param state The player's state
@@ -161,20 +154,12 @@ 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;
-		}
-
-        // Apply a cap to prevent possible exceptions
-        minHunger = Math.min(20, minHunger);
-        maxHunger = Math.min(20, maxHunger);
+        if (minHunger == null) minHunger = 0;
+        if (maxHunger == null) maxHunger = 20;
 
         if (player.getFoodLevel() >= maxHunger && feedAmount > 0) {
             return;
@@ -192,7 +177,7 @@ public class FlagStateManager implements Runnable {
 
     /**
      * Forget a player.
-     *
+     * 
      * @param player The player to forget
      */
     public synchronized void forget(Player player) {
@@ -209,21 +194,21 @@ public class FlagStateManager implements Runnable {
     /**
      * 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.
      */
@@ -235,7 +220,7 @@ public class FlagStateManager implements Runnable {
         public Boolean lastExitAllowed = null;
         public Boolean notifiedForLeave = false;
         public Boolean notifiedForEnter = false;
-        public GameMode lastGameMode;
+        public Boolean lastAllowFlight = null;
         public World lastWorld;
         public int lastBlockX;
         public int lastBlockY;

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

@@ -1,145 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.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);
-    }
-
-}

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

@@ -166,7 +166,7 @@ public class ReportWriter {
     }
     
     private void appendPluginInformation(Plugin[] plugins) {
-        appendHeader("Plugins (" + plugins.length + ")");
+        appendHeader("Plugins");
         
         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/chunk]",
+                        "%d [%f]",
                         entry.getValue(),
                         (float) (entry.getValue() / (double) loadedChunkCount));
             }

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

@@ -1,70 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.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);
-    }
-
-}

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

@@ -29,14 +29,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
-
+import com.sk89q.util.yaml.YAMLFormat;
+import com.sk89q.util.yaml.YAMLProcessor;
 import org.bukkit.block.Block;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffectType;
 
-import com.sk89q.util.yaml.YAMLFormat;
-import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldguard.blacklist.Blacklist;
 import com.sk89q.worldguard.blacklist.BlacklistLogger;
 import com.sk89q.worldguard.blacklist.loggers.ConsoleLoggerHandler;
@@ -75,20 +73,16 @@ public class WorldConfiguration {
     private ChestProtection chestProtection = new SignChestProtection();
 
     /* Configuration data start */
-    public boolean summaryOnStart;
     public boolean opPermissions;
     public boolean fireSpreadDisableToggle;
     public boolean itemDurability;
     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;
@@ -100,20 +94,9 @@ 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 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;
@@ -128,9 +111,8 @@ public class WorldConfiguration {
     public boolean disableMobDamage;
     public boolean useRegions;
     public boolean highFreqFlags;
-    public int regionWand;
+    public int regionWand = 287;
     public Set<EntityType> blockCreatureSpawn;
-    public boolean allowTamedSpawns;
     // public boolean useiConomy;
     // public boolean buyOnClaim;
     // public double buyOnClaimPrice;
@@ -159,20 +141,13 @@ 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 */
 
     /**
@@ -197,9 +172,7 @@ public class WorldConfiguration {
         config = new YAMLProcessor(configFile, true, YAMLFormat.EXTENDED);
         loadConfiguration();
 
-        if (summaryOnStart) {
-            plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
-        }
+        plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
     }
 
     private boolean getBoolean(String node, boolean def) {
@@ -305,7 +278,6 @@ public class WorldConfiguration {
             e.printStackTrace();
         }
 
-        summaryOnStart = getBoolean("summary-on-start", true);
         opPermissions = getBoolean("op-permissions", true);
 
         itemDurability = getBoolean("protection.item-durability", true);
@@ -313,18 +285,6 @@ public class WorldConfiguration {
         disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);
         disableObsidianGenerators = getBoolean("protection.disable-obsidian-generators", false);
 
-        blockPotions = new HashSet<PotionEffectType>();
-        for (String potionName : getStringList("gameplay.block-potions", null)) {
-            PotionEffectType effect = PotionEffectType.getByName(potionName);
-
-            if (effect == null) {
-                plugin.getLogger().warning("Unknown potion effect type '" + potionName + "'");
-            } else {
-                blockPotions.add(effect);
-            }
-        }
-        blockPotionsAlways = getBoolean("gameplay.block-potions-overly-reliably", false);
-
         simulateSponge = getBoolean("simulation.sponge.enable", true);
         spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
         redstoneSponges = getBoolean("simulation.sponge.redstone", false);
@@ -334,7 +294,6 @@ 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));
 
@@ -349,24 +308,11 @@ 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);
-        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);
@@ -404,23 +350,18 @@ 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", 334);
+        regionWand = getInt("regions.wand", 287);
         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);
@@ -481,9 +422,7 @@ public class WorldConfiguration {
                 this.blacklist = null;
             } else {
                 this.blacklist = blist;
-                if (summaryOnStart) {
-                    plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
-                }
+                plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
 
                 BlacklistLogger blacklistLogger = blist.getLogger();
 
@@ -509,7 +448,7 @@ public class WorldConfiguration {
         }
 
         // Print an overview of settings
-        if (summaryOnStart) {
+        if (getBoolean("summary-on-start", true)) {
             plugin.getLogger().log(Level.INFO, blockTNTExplosions
                     ? "(" + worldName + ") TNT ignition is blocked."
                     : "(" + worldName + ") TNT ignition is PERMITTED.");
@@ -559,8 +498,10 @@ public class WorldConfiguration {
     }
 
     public boolean isChestProtected(Block block) {
-
-        return signChestProtection && chestProtection.isProtected(block, null);
+        if (!signChestProtection) {
+            return false;
+        }
+        return chestProtection.isProtected(block, null);
     }
 
     public boolean isChestProtectedPlacement(Block block, Player player) {
@@ -588,15 +529,13 @@ 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) {

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

@@ -18,23 +18,19 @@
  */
 package com.sk89q.worldguard.bukkit;
 
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
 
 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.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;
@@ -45,17 +41,14 @@ 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.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.worldedit.blocks.BlockID;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
@@ -141,7 +134,7 @@ public class WorldGuardBlockListener implements Listener {
             if (held.getTypeId() > 0
                     && !(ItemType.usesDamageValue(held.getTypeId())
                     || BlockType.usesData(held.getTypeId()))) {
-                held.setDurability((short) 0);
+                held.setDurability((short) -1);
                 player.setItemInHand(held);
             }
         }
@@ -271,80 +264,55 @@ public class WorldGuardBlockListener implements Listener {
         }
     }
 
-    /**
-     * Determines whether fire can spread into a block.
-     *
-     * @param block The block in question
-     * @return true if allowed, false otherwise
-     */
-    private boolean isFireSpreadAllowed(Block block) {
-        final ConfigurationManager cfg = plugin.getGlobalStateManager();
-        final WorldConfiguration wcfg = cfg.get(block.getWorld());
-
-        if (wcfg.disableFireSpread) {
-            return false;
-        }
-
-        if (wcfg.fireSpreadDisableToggle) {
-            return false;
-        }
-
-        if (!wcfg.highFreqFlags) {
-            return true;
-        }
-
-        if (!wcfg.useRegions) {
-            return true;
-        }
-
-        final Vector pt = toVector(block);
-        final RegionManager mgr = plugin.getGlobalRegionManager().get(block.getWorld());
-        final ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-        return set.allows(DefaultFlag.FIRE_SPREAD);
-
-    }
-
     /*
      * Called when a block gets ignited.
      */
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockIgnite(BlockIgniteEvent event) {
-        final Block block = event.getBlock();
-        final World world = block.getWorld();
+        IgniteCause cause = event.getCause();
+        Block block = event.getBlock();
+        World world = block.getWorld();
 
-        final ConfigurationManager cfg = plugin.getGlobalStateManager();
-        final WorldConfiguration wcfg = cfg.get(world);
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
 
         if (cfg.activityHaltToggle) {
             event.setCancelled(true);
             return;
         }
+        boolean isFireSpread = cause == IgniteCause.SPREAD;
 
-        final ApplicableRegionSet set;
-
-        if (wcfg.useRegions) {
-            Vector pt = toVector(block);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            set = mgr.getApplicableRegions(pt);
-        } else {
-            set = null;
+        if (wcfg.preventLightningFire && cause == IgniteCause.LIGHTNING) {
+            event.setCancelled(true);
+            return;
         }
 
-        switch (event.getCause()) {
-        case SPREAD:
-            if (!isFireSpreadAllowed(block)) {
-                event.setCancelled(true);
-                return;
-            }
+        if (wcfg.preventLavaFire && cause == IgniteCause.LAVA) {
+            event.setCancelled(true);
+            return;
+        }
 
-            if (wcfg.disableFireSpreadBlocks.size() <= 0) {
-                break;
-            }
+        if (wcfg.disableFireSpread && isFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
 
-            final int x = block.getX();
-            final int y = block.getY();
-            final int z = block.getZ();
+        if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL
+                && event.getPlayer() != null
+                && !plugin.hasPermission(event.getPlayer(), "worldguard.override.lighter")) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.fireSpreadDisableToggle && isFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.disableFireSpreadBlocks.size() > 0 && isFireSpread) {
+            int x = block.getX();
+            int y = block.getY();
+            int z = block.getZ();
 
             if (wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y - 1, z))
                     || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x + 1, y, z))
@@ -354,92 +322,46 @@ public class WorldGuardBlockListener implements Listener {
                 event.setCancelled(true);
                 return;
             }
+        }
 
-            break;
+        if (wcfg.useRegions) {
+            Vector pt = toVector(block);
+            Player player = event.getPlayer();
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
 
-        case LIGHTNING:
-            if (wcfg.preventLightningFire) {
+            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;
+                    }
+                    if (!set.allows(DefaultFlag.LIGHTER, localPlayer)
+                            && !plugin.hasPermission(player, "worldguard.override.lighter")) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+
+            if (wcfg.highFreqFlags && isFireSpread
+                    && !set.allows(DefaultFlag.FIRE_SPREAD)) {
                 event.setCancelled(true);
                 return;
             }
 
-            if (!wcfg.useRegions) {
-                break;
-            }
-
-            if (set.allows(DefaultFlag.LIGHTNING)) {
-                break;
-            }
-
-            event.setCancelled(true);
-            return;
-
-        case LAVA:
-            if (wcfg.preventLavaFire) {
+            if (wcfg.highFreqFlags && cause == IgniteCause.LAVA
+                    && !set.allows(DefaultFlag.LAVA_FIRE)) {
                 event.setCancelled(true);
                 return;
             }
 
-            if (!wcfg.useRegions) {
-                break;
-            }
-
-            if (!wcfg.highFreqFlags) {
-                break;
-            }
-
-            if (set.allows(DefaultFlag.LAVA_FIRE)) {
-                break;
-            }
-
-            event.setCancelled(true);
-            return;
-
-        case FIREBALL:
-            if (wcfg.useRegions && event.getPlayer() == null && !set.allows(DefaultFlag.GHAST_FIREBALL)) {
+            if (cause == IgniteCause.LIGHTNING && !set.allows(DefaultFlag.LIGHTNING)) {
                 event.setCancelled(true);
                 return;
             }
-
-            /* FALL-THROUGH */
-
-        case FLINT_AND_STEEL:
-            final Player player = event.getPlayer();
-            if (player == null) {
-                break;
-            }
-
-            if (wcfg.blockLighter && !plugin.hasPermission(player, "worldguard.override.lighter")) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (!wcfg.useRegions) {
-                break;
-            }
-
-            if (plugin.getGlobalRegionManager().hasBypass(player, world)) {
-                break;
-            }
-
-            final LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-            // Lighters are preliminarily handled in the player listener under handleBlockRightClick.
-            // Why they're handled here too, no one knows
-            if (set.allows(DefaultFlag.LIGHTER)) {
-                break;
-            }
-
-            if (set.canBuild(localPlayer)) {
-                break;
-            }
-
-            if (plugin.hasPermission(player, "worldguard.override.lighter")) {
-                break;
-            }
-
-            event.setCancelled(true);
-            return;
         }
     }
 
@@ -448,19 +370,32 @@ public class WorldGuardBlockListener implements Listener {
      */
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onBlockBurn(BlockBurnEvent event) {
-        final ConfigurationManager cfg = plugin.getGlobalStateManager();
-        final WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
 
         if (cfg.activityHaltToggle) {
             event.setCancelled(true);
             return;
         }
 
+        if (wcfg.disableFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.fireSpreadDisableToggle) {
+            Block block = event.getBlock();
+            event.setCancelled(true);
+            checkAndDestroyAround(block.getWorld(), block.getX(), block.getY(), block.getZ(), BlockID.FIRE);
+            return;
+        }
+
         if (wcfg.disableFireSpreadBlocks.size() > 0) {
-            final Block block = event.getBlock();
+            Block block = event.getBlock();
 
             if (wcfg.disableFireSpreadBlocks.contains(block.getTypeId())) {
                 event.setCancelled(true);
+                checkAndDestroyAround(block.getWorld(), block.getX(), block.getY(), block.getZ(), BlockID.FIRE);
                 return;
             }
         }
@@ -470,9 +405,36 @@ public class WorldGuardBlockListener implements Listener {
             return;
         }
 
-        if (!isFireSpreadAllowed(event.getBlock())) {
-            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;
+            }
+
+        }
+    }
+
+    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);
         }
     }
 
@@ -505,13 +467,6 @@ public class WorldGuardBlockListener implements Listener {
             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;
-            }
-        }
     }
 
     /*
@@ -708,16 +663,6 @@ public class WorldGuardBlockListener implements Listener {
 
         int type = event.getNewState().getTypeId();
 
-        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);
@@ -735,14 +680,6 @@ public class WorldGuardBlockListener implements Listener {
                 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);
@@ -789,34 +726,6 @@ public class WorldGuardBlockListener implements Listener {
                 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;
-            }
-        }
     }
 
     /*
@@ -828,58 +737,31 @@ public class WorldGuardBlockListener implements Listener {
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
 
-        switch (event.getBlock().getTypeId()) {
-        case BlockID.ICE:
+        int type = event.getBlock().getTypeId();
+
+        if (type == BlockID.ICE) {
             if (wcfg.disableIceMelting) {
                 event.setCancelled(true);
                 return;
             }
-
             if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
                     DefaultFlag.ICE_MELT, event.getBlock().getLocation())) {
                 event.setCancelled(true);
                 return;
             }
-            break;
+        }
 
-        case BlockID.SNOW:
+        if (type == BlockID.SNOW) {
             if (wcfg.disableSnowMelting) {
                 event.setCancelled(true);
                 return;
             }
-
             if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
                     DefaultFlag.SNOW_MELT, event.getBlock().getLocation())) {
                 event.setCancelled(true);
                 return;
             }
-            break;
-
-        case BlockID.FIRE:
-            if (event.getNewState().getTypeId() != BlockID.AIR) {
-                return;
-            }
-
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
-                    DefaultFlag.FIRE_EXTINGUISH, 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;
         }
-
     }
 
     /*
@@ -920,40 +802,4 @@ public class WorldGuardBlockListener implements Listener {
             }
         }
     }
-
-    /*
-     * Called when a block is damaged.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockDispense(BlockDispenseEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (wcfg.blockPotions.size() > 0) {
-            ItemStack item = event.getItem();
-            if (item.getType() == Material.POTION && !BukkitUtil.isWaterPotion(item)) {
-                Potion potion = Potion.fromDamage(BukkitUtil.getPotionEffectBits(item));
-                for (PotionEffect effect : potion.getEffects()) {
-                    if (potion.isSplash() && wcfg.blockPotions.contains(effect.getType())) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    /*
-     * Called when a block yields exp
-     */
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onBlockExp(BlockExpEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
-                event.getBlock().getLocation())) {
-            event.setExpToDrop(0);
-        }
-    }
-
 }

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

@@ -21,63 +21,55 @@ package com.sk89q.worldguard.bukkit;
 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
 
 import java.util.Set;
-
+import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldguard.LocalPlayer;
 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.Creature;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.EnderDragon;
-import org.bukkit.entity.EnderPearl;
 import org.bukkit.entity.Enderman;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Fireball;
-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.entity.Skeleton;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
-import org.bukkit.entity.ThrownPotion;
-import org.bukkit.entity.Wither;
-import org.bukkit.entity.WitherSkull;
 import org.bukkit.entity.Wolf;
-import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.event.entity.CreeperPowerEvent;
-import org.bukkit.event.entity.EntityBreakDoorEvent;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityCombustEvent;
-import org.bukkit.event.entity.EntityCreatePortalEvent;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityInteractEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.ExpBottleEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PigZapEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.entity.PotionSplashEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.painting.PaintingBreakByEntityEvent;
+import org.bukkit.event.painting.PaintingBreakEvent;
+import org.bukkit.event.painting.PaintingPlaceEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.projectiles.ProjectileSource;
-
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.GlobalRegionManager;
 import com.sk89q.worldguard.protection.events.DisallowedPVPEvent;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
@@ -116,24 +108,12 @@ public class WorldGuardEntityListener implements Listener {
         WorldConfiguration wcfg = cfg.get(entity.getWorld());
 
         if (block.getTypeId() == BlockID.SOIL) {
-            if (/* entity instanceof Creature && // catch for any entity (not thrown for players) */
-                wcfg.disableCreatureCropTrampling) {
+            if (entity instanceof Creature && wcfg.disableCreatureCropTrampling) {
                 event.setCancelled(true);
             }
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onExpBottle(ExpBottleEvent event) {
-        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
-
-        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
-                event.getEntity().getLocation())) {
-            event.setExperience(0);
-            // event.setShowEffect(false); // don't want to cancel the bottle entirely I suppose, just the exp
-        }
-    }
-
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDeath(EntityDeathEvent event) {
         WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
@@ -190,21 +170,7 @@ public class WorldGuardEntityListener implements Listener {
                 return;
             }
 
-            if (type == DamageCause.BLOCK_EXPLOSION
-                    && (wcfg.disableExplosionDamage || wcfg.blockOtherExplosions
-                            || (wcfg.explosionFlagCancellation
-                                && !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, player.getLocation())))) {
-                event.setCancelled(true);
-                return;
-            }
-        } else {
-
-            // for whatever reason, plugin-caused explosions with a null entity count as block explosions and aren't
-            // handled anywhere else
-            if (type == DamageCause.BLOCK_EXPLOSION
-                    && (wcfg.blockOtherExplosions
-                            || (wcfg.explosionFlagCancellation
-                                && !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, defender.getLocation())))) {
+            if (wcfg.disableExplosionDamage && type == DamageCause.BLOCK_EXPLOSION) {
                 event.setCancelled(true);
                 return;
             }
@@ -212,8 +178,7 @@ public class WorldGuardEntityListener implements Listener {
     }
 
     private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
-
-        if (event.getDamager() instanceof Projectile) {
+        if (event.getCause() == DamageCause.PROJECTILE) {
             onEntityDamageByProjectile(event);
             return;
         }
@@ -241,13 +206,6 @@ public class WorldGuardEntityListener implements Listener {
             }
         }
 
-        if (defender instanceof ItemFrame) {
-            if (checkItemFrameProtection(attacker, (ItemFrame) defender)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
         if (defender instanceof Player) {
             Player player = (Player) defender;
             LocalPlayer localPlayer = plugin.wrapPlayer(player);
@@ -271,142 +229,105 @@ public class WorldGuardEntityListener implements Listener {
                 return;
             }
 
-            if (wcfg.disableExplosionDamage) {
-                switch (event.getCause()) {
-                    case BLOCK_EXPLOSION:
-                    case ENTITY_EXPLOSION:
-                        event.setCancelled(true);
+            if (wcfg.disableExplosionDamage && event.getCause() == DamageCause.ENTITY_EXPLOSION) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (attacker != null && attacker instanceof Player) {
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    Vector pt2 = toVector(attacker.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+
+                    if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP, localPlayer)
+                            || !mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
+                        tryCancelPVPEvent((Player) attacker, player, event);
                         return;
+                    }
                 }
             }
 
-            if (attacker != null) {
-                if (attacker instanceof Player) {
-                    if (wcfg.useRegions) {
-                        Vector pt = toVector(defender.getLocation());
-                        Vector pt2 = toVector(attacker.getLocation());
-                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-
-                        if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
-                            tryCancelPVPEvent((Player) attacker, player, event, true);
-                        } else if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP ,localPlayer)) {
-                            tryCancelPVPEvent((Player) attacker, player, event, false);
-                        }
-                    }
+            if (attacker != null && attacker instanceof TNTPrimed) {
+                if (wcfg.blockTNTExplosions) {
+                    event.setCancelled(true);
+                    return;
                 }
-
-                if (attacker instanceof TNTPrimed || attacker instanceof ExplosiveMinecart) {
-
-                    // The check for explosion damage should be handled already... But... What ever...
-                    if (wcfg.blockTNTExplosions) {
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+                    if (!set.allows(DefaultFlag.TNT, localPlayer)) {
                         event.setCancelled(true);
                         return;
                     }
-                    if (wcfg.useRegions && wcfg.explosionFlagCancellation) {
-                        Vector pt = toVector(defender.getLocation());
-                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-                        if (!set.allows(DefaultFlag.TNT, localPlayer)) {
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
                 }
+            }
 
-                if (attacker instanceof Fireball) {
-                    if (attacker instanceof WitherSkull) {
-                        if (wcfg.blockWitherSkullExplosions) {
-                            event.setCancelled(true);
+            if (attacker != null && attacker instanceof Fireball) {
+                if (wcfg.blockFireballExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.useRegions) {
+                    Fireball fireball = (Fireball) attacker;
+                    Vector pt = toVector(defender.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+                    if (fireball.getShooter() instanceof Player) {
+                        Vector pt2 = toVector(fireball.getShooter().getLocation());
+                        if (!set.allows(DefaultFlag.PVP, localPlayer)
+                                || !mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) fireball.getShooter()))) {
+                            tryCancelPVPEvent((Player) fireball.getShooter(), player, event);
                             return;
                         }
                     } else {
-                        if (wcfg.blockFireballExplosions) {
+                        if (!set.allows(DefaultFlag.GHAST_FIREBALL, localPlayer)) {
                             event.setCancelled(true);
                             return;
                         }
                     }
-                    if (wcfg.useRegions) {
-                        Fireball fireball = (Fireball) attacker;
-                        Vector pt = toVector(defender.getLocation());
-                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-                        if (fireball.getShooter() instanceof Player) {
-                            Vector pt2 = toVector(((Player) fireball.getShooter()).getLocation());
-                            if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) fireball.getShooter()))) {
-                                tryCancelPVPEvent((Player) fireball.getShooter(), player, event, true);
-                            } else if (!set.allows(DefaultFlag.PVP, localPlayer)) {
-                                tryCancelPVPEvent((Player) fireball.getShooter(), player, event, false);
-                            }
-                        } else {
-                            if (!set.allows(DefaultFlag.GHAST_FIREBALL, localPlayer) && wcfg.explosionFlagCancellation) {
-                                event.setCancelled(true);
-                                return;
-                            }
-                        }
 
-                    }
+                }
+            }
+
+            if (attacker != null && attacker instanceof LivingEntity
+                    && !(attacker instanceof Player)) {
+                if (attacker instanceof Creeper && wcfg.blockCreeperExplosions) {
+                    event.setCancelled(true);
+                    return;
                 }
 
-                if (attacker instanceof LivingEntity && !(attacker instanceof Player)) {
-                    if (attacker instanceof Creeper && wcfg.blockCreeperExplosions) {
+                if (wcfg.disableMobDamage) {
+                    event.setCancelled(true);
+                    return;
+                }
+
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+                    if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
                         event.setCancelled(true);
                         return;
                     }
 
-                    if (wcfg.disableMobDamage) {
-                        event.setCancelled(true);
-                        return;
-                    }
-
-                    if (wcfg.useRegions) {
-                        Vector pt = toVector(defender.getLocation());
-                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-                        if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer) && !(attacker instanceof Tameable)) {
+                    if (attacker instanceof Creeper) {
+                        if (!set.allows(DefaultFlag.CREEPER_EXPLOSION, localPlayer)) {
                             event.setCancelled(true);
                             return;
                         }
-
-                        if (attacker instanceof Creeper) {
-                            if (!set.allows(DefaultFlag.CREEPER_EXPLOSION, localPlayer) && wcfg.explosionFlagCancellation) {
-                                event.setCancelled(true);
-                                return;
-                            }
-                        }
-                        if (attacker instanceof Tameable) {
-                            if (((Tameable) attacker).getOwner() == null) {
-                                if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
-                                    event.setCancelled(true);
-                                    return;
-                                }
-                            }
-                            if (!(((Tameable) attacker).getOwner() instanceof Player)) {
-                                return;
-                            }
-                            Player beastMaster = (Player) ((Tameable) attacker).getOwner();
-                            Vector pt2 = toVector(attacker.getLocation());
-                            if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer(beastMaster))) {
-                                tryCancelPVPEvent(beastMaster, player, event, true);
-                            } else if (!set.allows(DefaultFlag.PVP, localPlayer)) {
-                                tryCancelPVPEvent(beastMaster, player, event, false);
-                            }
-                        }
                     }
                 }
+
             }
         }
     }
 
     private void onEntityDamageByProjectile(EntityDamageByEntityEvent event) {
         Entity defender = event.getEntity();
-        Entity attacker;
-        ProjectileSource source = ((Projectile) event.getDamager()).getShooter();
-        if (source instanceof LivingEntity) {
-            attacker = (LivingEntity) source;
-        } else {
-            return;
-        }
+        Entity attacker = ((Projectile) event.getDamager()).getShooter();
 
         if (defender instanceof Player) {
             Player player = (Player) defender;
@@ -415,14 +336,25 @@ public class WorldGuardEntityListener implements Listener {
             ConfigurationManager cfg = plugin.getGlobalStateManager();
             WorldConfiguration wcfg = cfg.get(player.getWorld());
 
-            // Check Invincible
             if (isInvincible(player)) {
                 event.setCancelled(true);
                 return;
             }
 
-            // Check Mob
-            if (attacker != null && !(attacker instanceof Player)) {
+            if (attacker != null && attacker instanceof Player) {
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    Vector pt2 = toVector(attacker.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+
+                    if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP, localPlayer)
+                            || !mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
+                        tryCancelPVPEvent((Player) attacker, player, event);
+                        return;
+                    }
+                }
+            }
+            if (attacker != null && attacker instanceof Skeleton) {
                 if (wcfg.disableMobDamage) {
                     event.setCancelled(true);
                     return;
@@ -437,28 +369,6 @@ public class WorldGuardEntityListener implements Listener {
                     }
                 }
             }
-
-            // Check Player
-            // if (event.getDamager() instanceof EnderPearl || event.getDamager() instanceof Snowball) return;
-            if (attacker != null && attacker instanceof Player) {
-                if (event.getDamager() instanceof EnderPearl && attacker == player) return;
-                if (wcfg.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    Vector pt2 = toVector(attacker.getLocation());
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-
-                    if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
-                        tryCancelPVPEvent((Player) attacker, player, event, true);
-                    } else if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP, localPlayer)) {
-                        tryCancelPVPEvent((Player) attacker, player, event, false);
-                    }
-                }
-            }
-        } else if (defender instanceof ItemFrame) {
-            if (checkItemFrameProtection(attacker, (ItemFrame) defender)) {
-                event.setCancelled(true);
-                return;
-            }
         }
 
     }
@@ -494,25 +404,6 @@ public class WorldGuardEntityListener implements Listener {
                 return;
             }
 
-            if (type == DamageCause.WITHER) {
-                // wither boss DoT tick
-                if (wcfg.disableMobDamage) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-                    if (!set.allows(DefaultFlag.MOB_DAMAGE, plugin.wrapPlayer(player))) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-
             if (type == DamageCause.DROWNING && cfg.hasAmphibiousMode(player)) {
                 player.setRemainingAir(player.getMaximumAir());
                 event.setCancelled(true);
@@ -547,7 +438,7 @@ public class WorldGuardEntityListener implements Listener {
                 return;
             }
 
-            if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
+           if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
                 BukkitUtil.findFreePosition(player);
                 event.setCancelled(true);
                 return;
@@ -589,31 +480,31 @@ public class WorldGuardEntityListener implements Listener {
         Entity ent = event.getEntity();
 
         if (cfg.activityHaltToggle) {
-            if (ent != null) {
-                ent.remove();
-            }
+            ent.remove();
             event.setCancelled(true);
             return;
         }
 
         if (ent instanceof Creeper) {
-            if (wcfg.blockCreeperExplosions) {
-                event.setCancelled(true);
-                return;
-            }
             if (wcfg.blockCreeperBlockDamage) {
                 event.blockList().clear();
                 return;
             }
 
-            if (wcfg.useRegions) {
-                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            if (wcfg.blockCreeperExplosions) {
+                event.setCancelled(true);
+                return;
+            }
 
-                for (Block block : event.blockList()) {
-                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.CREEPER_EXPLOSION)) {
-                        event.blockList().clear();
-                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
-                        return;
+            if (wcfg.useRegions) {
+                if (wcfg.useRegions) {
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                    for (Block block : event.blockList()) {
+                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.CREEPER_EXPLOSION)) {
+                            event.blockList().clear();
+                            return;
+                        }
                     }
                 }
             }
@@ -624,97 +515,61 @@ public class WorldGuardEntityListener implements Listener {
             }
 
             if (wcfg.useRegions) {
-                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                if (wcfg.useRegions) {
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
 
-                for (Block block : event.blockList()) {
-                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
-                        event.blockList().clear();
-                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
-                        return;
+                    for (Block block : event.blockList()) {
+                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
+                            event.blockList().clear();
+                            return;
+                        }
                     }
                 }
             }
-        } else if (ent instanceof TNTPrimed || ent instanceof ExplosiveMinecart) {
-            if (wcfg.blockTNTExplosions) {
-                event.setCancelled(true);
-                return;
-            }
+        } else if (ent instanceof TNTPrimed) {
             if (wcfg.blockTNTBlockDamage) {
                 event.blockList().clear();
                 return;
             }
 
+            if (wcfg.blockTNTExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+
             if (wcfg.useRegions) {
                 RegionManager mgr = plugin.getGlobalRegionManager().get(world);
 
                 for (Block block : event.blockList()) {
                     if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.TNT)) {
                         event.blockList().clear();
-                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
                         return;
                     }
                 }
             }
         } else if (ent instanceof Fireball) {
-            if (ent instanceof WitherSkull) {
-                if (wcfg.blockWitherSkullExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-                if (wcfg.blockWitherSkullBlockDamage) {
-                    event.blockList().clear();
-                    return;
-                }
-            } else {
-                if (wcfg.blockFireballExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-                if (wcfg.blockFireballBlockDamage) {
-                    event.blockList().clear();
-                    return;
-                }
+            if (wcfg.blockFireballBlockDamage) {
+                event.blockList().clear();
+                return;
             }
-            // allow wither skull blocking since there is no dedicated flag atm
+
+            if (wcfg.blockFireballExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+
             if (wcfg.useRegions) {
                 RegionManager mgr = plugin.getGlobalRegionManager().get(world);
 
                 for (Block block : event.blockList()) {
                     if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.GHAST_FIREBALL)) {
                         event.blockList().clear();
-                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-        } else if (ent instanceof Wither) {
-            if (wcfg.blockWitherExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.blockWitherBlockDamage) {
-                event.blockList().clear();
-                return;
-            }
-        } else {
-            // unhandled entity
-            if (wcfg.blockOtherExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.useRegions) {
-                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-                for (Block block : event.blockList()) {
-                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.OTHER_EXPLOSION)) {
-                        event.blockList().clear();
-                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
                         return;
                     }
                 }
             }
         }
 
-
         if (wcfg.signChestProtection) {
             for (Block block : event.blockList()) {
                 if (wcfg.isChestProtected(block)) {
@@ -732,7 +587,6 @@ public class WorldGuardEntityListener implements Listener {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onExplosionPrime(ExplosionPrimeEvent event) {
         ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
         Entity ent = event.getEntity();
 
         if (cfg.activityHaltToggle) {
@@ -741,33 +595,6 @@ public class WorldGuardEntityListener implements Listener {
             return;
         }
 
-        if (event.getEntityType() == EntityType.WITHER) {
-            if (wcfg.blockWitherExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-        } else if (event.getEntityType() == EntityType.WITHER_SKULL) {
-            if (wcfg.blockWitherSkullExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-        } else if (event.getEntityType() == EntityType.FIREBALL) {
-            if (wcfg.blockFireballExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-        } else if (event.getEntityType() == EntityType.CREEPER) {
-            if (wcfg.blockCreeperExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-        } else if (event.getEntityType() == EntityType.PRIMED_TNT
-                || event.getEntityType() == EntityType.MINECART_TNT) {
-            if (wcfg.blockTNTExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-        }
     }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -780,18 +607,6 @@ public class WorldGuardEntityListener implements Listener {
         }
 
         WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
-
-        // allow spawning of creatures from plugins
-        if (!wcfg.blockPluginSpawning && event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.CUSTOM) {
-            return;
-        }
-
-        if (wcfg.allowTamedSpawns
-                && event.getEntity() instanceof Tameable // nullsafe check
-                && ((Tameable) event.getEntity()).isTamed()) {
-            return;
-        }
-
         EntityType entityType = event.getEntityType();
 
         if (wcfg.blockCreatureSpawn.contains(entityType)) {
@@ -801,7 +616,7 @@ public class WorldGuardEntityListener implements Listener {
 
         Location eventLoc = event.getLocation();
 
-        if (wcfg.useRegions && cfg.useRegionsCreatureSpawnEvent) {
+        if (wcfg.useRegions) {
             Vector pt = toVector(eventLoc);
             RegionManager mgr = plugin.getGlobalRegionManager().get(eventLoc.getWorld());
             // @TODO get victims' stacktraces and find out why it's null anyway
@@ -819,25 +634,6 @@ public class WorldGuardEntityListener implements Listener {
                 return;
             }
         }
-
-        if (wcfg.blockGroundSlimes && entityType == EntityType.SLIME
-                && eventLoc.getY() >= 60
-                && event.getSpawnReason() == SpawnReason.NATURAL) {
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onCreatePortal(EntityCreatePortalEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
-
-        switch (event.getEntityType()) {
-            case ENDER_DRAGON:
-                if (wcfg.blockEnderDragonPortalCreation) event.setCancelled(true);
-                break;
-        }
     }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -860,6 +656,69 @@ public class WorldGuardEntityListener implements Listener {
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPaintingBreak(PaintingBreakEvent breakEvent) {
+        if (!(breakEvent instanceof PaintingBreakByEntityEvent)) {
+            return;
+        }
+
+        PaintingBreakByEntityEvent event = (PaintingBreakByEntityEvent) breakEvent;
+        if (!(event.getRemover() instanceof Player)) {
+            return;
+        }
+
+        Painting painting= event.getPainting();
+        Player player = (Player) event.getRemover();
+        World world = painting.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.getBlacklist() != null) {
+            if (!wcfg.getBlacklist().check(
+                    new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(player.getLocation()), 321), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, painting.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPaintingPlace(PaintingPlaceEvent event) {
+        Block placedOn = event.getBlock();
+        Player player = event.getPlayer();
+        World world = placedOn.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.getBlacklist() != null) {
+            if (!wcfg.getBlacklist().check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(player.getLocation()), 321), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onEntityRegainHealth(EntityRegainHealthEvent event) {
 
@@ -876,39 +735,49 @@ public class WorldGuardEntityListener implements Listener {
     }
 
     /**
-     * Called when an entity changes a block somehow
+     * Called when an enderman picks up or puts down a block and some other cases.
      *
      * @param event Relevant event details
      */
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onEntityChangeBlock(EntityChangeBlockEvent event) {
+    public void onEndermanPickup(EntityChangeBlockEvent event) {
         Entity ent = event.getEntity();
         Block block = event.getBlock();
         Location location = block.getLocation();
 
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(ent.getWorld());
         if (ent instanceof Enderman) {
-            if (wcfg.disableEndermanGriefing) {
-                event.setCancelled(true);
-                return;
-            }
+            if (event.getTo() == Material.AIR) {
+                // pickup
+                ConfigurationManager cfg = plugin.getGlobalStateManager();
+                WorldConfiguration wcfg = cfg.get(ent.getWorld());
 
-            if (wcfg.useRegions) {
-                if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
+                if (wcfg.disableEndermanGriefing) {
                     event.setCancelled(true);
                     return;
                 }
-            }
-        } else if (ent.getType() == EntityType.WITHER) {
-            if (wcfg.blockWitherBlockDamage || wcfg.blockWitherExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-        } else if (/*ent instanceof Zombie && */event instanceof EntityBreakDoorEvent) {
-            if (wcfg.blockZombieDoorDestruction) {
-                event.setCancelled(true);
-                return;
+
+                if (wcfg.useRegions) {
+                    if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            } else {
+                // place
+                ConfigurationManager cfg = plugin.getGlobalStateManager();
+                WorldConfiguration wcfg = cfg.get(ent.getWorld());
+
+                if (wcfg.disableEndermanGriefing) {
+                    event.setCancelled(true);
+                    return;
+                }
+
+                if (wcfg.useRegions) {
+                    if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
             }
         }
     }
@@ -923,46 +792,6 @@ public class WorldGuardEntityListener implements Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
-    public void onPotionSplash(PotionSplashEvent event) {
-        Entity entity = event.getEntity();
-        ThrownPotion potion = event.getPotion();
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(entity.getWorld());
-
-        if (wcfg.blockPotionsAlways && wcfg.blockPotions.size() > 0) {
-            boolean blocked = false;
-
-            for (PotionEffect effect : potion.getEffects()) {
-                if (wcfg.blockPotions.contains(effect.getType())) {
-                    blocked = true;
-                    break;
-                }
-            }
-
-            if (blocked) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        GlobalRegionManager regionMan = plugin.getGlobalRegionManager();
-
-        int blockedEntities = 0;
-        for (LivingEntity e : event.getAffectedEntities()) {
-            if (!regionMan.allows(DefaultFlag.POTION_SPLASH, e.getLocation(),
-                    e instanceof Player ? plugin.wrapPlayer((Player) e) : null)) {
-                event.setIntensity(e, 0);
-                ++blockedEntities;
-            }
-        }
-
-        if (blockedEntities == event.getAffectedEntities().size()) {
-            event.setCancelled(true);
-        }
-    }
-
     /**
      * Check if a player is invincible, via either god mode or region flag. If
      * the region denies invincibility, the player must have an extra permission
@@ -1002,50 +831,12 @@ public class WorldGuardEntityListener implements Listener {
      * @param defendingPlayer The defender
      * @param event The event that caused WorldGuard to act
      */
-    public void tryCancelPVPEvent(final Player attackingPlayer, final Player defendingPlayer, EntityDamageByEntityEvent event, boolean aggressorTriggered) {
+    public void tryCancelPVPEvent(final Player attackingPlayer, final Player defendingPlayer, EntityDamageByEntityEvent event) {
         final DisallowedPVPEvent disallowedPVPEvent = new DisallowedPVPEvent(attackingPlayer, defendingPlayer, event);
         plugin.getServer().getPluginManager().callEvent(disallowedPVPEvent);
         if (!disallowedPVPEvent.isCancelled()) {
-            if (aggressorTriggered) attackingPlayer.sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
-            else attackingPlayer.sendMessage(ChatColor.DARK_RED + "That player is in a no-PvP area.");
+            attackingPlayer.sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
             event.setCancelled(true);
         }
     }
-
-    /**
-     * Checks regions and config settings to protect items from being knocked
-     * out of item frames.
-     * @param attacker attacking entity
-     * @param defender item frame being damaged
-     * @return true if the event should be cancelled
-     */
-    private boolean checkItemFrameProtection(Entity attacker, ItemFrame defender) {
-        World world = attacker.getWorld();
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-        if (wcfg.useRegions) {
-        // bukkit throws this event when a player attempts to remove an item from a frame
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            if (attacker instanceof Player) {
-                Player player = (Player) attacker;
-                LocalPlayer localPlayer = plugin.wrapPlayer(player);
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !mgr.getApplicableRegions(defender.getLocation())
-                                .canBuild(localPlayer)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                    return true;
-                }
-            } else {
-                if (!plugin.getGlobalRegionManager().allows(
-                        DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, defender.getLocation())) {
-                    return true;
-                }
-            }
-        }
-        if (wcfg.blockEntityItemFrameDestroy && !(attacker instanceof Player)) {
-            return true;
-        }
-        return false;
-    }
-
 }

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

@@ -1,216 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import 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);
-//            }
-        }
-    }
-}

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

@@ -32,6 +32,9 @@ import java.util.Set;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
+import com.sk89q.bukkit.util.CommandsManagerRegistration;
+import com.sk89q.minecraft.util.commands.*;
+import com.sk89q.wepif.PermissionsResolverManager;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -45,15 +48,6 @@ import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.sk89q.bukkit.util.CommandsManagerRegistration;
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandPermissionsException;
-import com.sk89q.minecraft.util.commands.CommandUsageException;
-import com.sk89q.minecraft.util.commands.CommandsManager;
-import com.sk89q.minecraft.util.commands.MissingNestedCommandException;
-import com.sk89q.minecraft.util.commands.SimpleInjector;
-import com.sk89q.minecraft.util.commands.WrappedCommandException;
-import com.sk89q.wepif.PermissionsResolverManager;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.commands.GeneralCommands;
@@ -61,7 +55,6 @@ 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.
@@ -70,11 +63,6 @@ import com.sk89q.worldguard.util.FatalConfigurationLoadingException;
  */
 public class WorldGuardPlugin extends JavaPlugin {
 
-    /**
-     * Current instance of this plugin.
-     */
-    private static WorldGuardPlugin inst;
-
     /**
      * Manager for commands. This automatically handles nested commands,
      * permissions checking, and a number of other fancy command things.
@@ -105,7 +93,7 @@ public class WorldGuardPlugin extends JavaPlugin {
         configuration = new ConfigurationManager(this);
         globalRegionManager = new GlobalRegionManager(this);
 
-        final WorldGuardPlugin plugin = inst = this;
+        final WorldGuardPlugin plugin = this;
         commands = new CommandsManager<CommandSender>() {
             @Override
             public boolean hasPermission(CommandSender player, String perm) {
@@ -114,18 +102,9 @@ public class WorldGuardPlugin extends JavaPlugin {
         };
     }
 
-    /**
-     * 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() {
 
@@ -144,7 +123,7 @@ public class WorldGuardPlugin extends JavaPlugin {
                     reg.register(GeneralCommands.class);
                 }
             }
-        }, 0L);
+        }, 1L);
 
         // Need to create the plugins/WorldGuard folder
         getDataFolder().mkdirs();
@@ -154,14 +133,9 @@ public class WorldGuardPlugin extends JavaPlugin {
         // This must be done before configuration is loaded
         LegacyWorldGuardMigration.migrateBlacklist(this);
 
-        try {
-            // Load the configuration
-            configuration.load();
-            globalRegionManager.preload();
-        } catch (FatalConfigurationLoadingException e) {
-            e.printStackTrace();
-            getServer().shutdown();
-        }
+        // Load the configuration
+        configuration.load();
+        globalRegionManager.preload();
 
         // Migrate regions after the regions were loaded because
         // the migration code reuses the loaded region managers
@@ -170,8 +144,7 @@ public class WorldGuardPlugin extends JavaPlugin {
         flagStateManager = new FlagStateManager(this);
 
         if (configuration.useRegionsScheduler) {
-            getServer().getScheduler().scheduleSyncRepeatingTask(this, flagStateManager,
-                    FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
+            getServer().getScheduler().scheduleAsyncRepeatingTask(this, flagStateManager, FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
         }
 
         // Register events
@@ -180,9 +153,6 @@ 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);
@@ -194,22 +164,11 @@ public class WorldGuardPlugin extends JavaPlugin {
             worldListener.initWorld(world);
         }
         worldListener.registerEvents();
-
-        if (!configuration.hasCommandBookGodMode()) {
-            // Check god mode for existing players, if any
-            for (Player player : getServer().getOnlinePlayers()) {
-                if (inGroup(player, "wg-invincible") ||
-                        (configuration.autoGodMode && hasPermission(player, "worldguard.auto-invincible"))) {
-                    configuration.enableGodMode(player);
-                }
-            }
-        }
     }
 
     /**
      * Called on plugin disable.
      */
-    @Override
     public void onDisable() {
         globalRegionManager.unload();
         configuration.unload();

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

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

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

@@ -18,9 +18,11 @@ import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.event.vehicle.VehicleMoveEvent;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.bukkit.FlagStateManager.PlayerFlagState;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 
 public class WorldGuardVehicleListener implements Listener {
 
@@ -80,16 +82,96 @@ public class WorldGuardVehicleListener implements Listener {
         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()) {
-                boolean result = WorldGuardPlayerListener.checkMove(plugin, player, event.getFrom(), event.getTo());
-                if (result) {
+                PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+                LocalPlayer localPlayer = plugin.wrapPlayer(player);
+                boolean hasBypass = plugin.getGlobalRegionManager().hasBypass(player, world);
+
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
+                ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+                boolean entryAllowed = set.allows(DefaultFlag.ENTRY, localPlayer);
+                if (!hasBypass && !entryAllowed) {
+
                     vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
                     vehicle.teleport(event.getFrom());
+                    return;
                 }
+
+                // Have to set this state
+                if (state.lastExitAllowed == null) {
+                    state.lastExitAllowed = mgr.getApplicableRegions(toVector(event.getFrom()))
+                            .allows(DefaultFlag.EXIT, localPlayer);
+                }
+
+                boolean exitAllowed = set.allows(DefaultFlag.EXIT, localPlayer);
+                if (!hasBypass && exitAllowed && !state.lastExitAllowed) {
+                    player.sendMessage(ChatColor.DARK_RED + "You are not permitted to leave this area.");
+
+                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
+                    vehicle.teleport(event.getFrom());
+                    return;
+                }
+
+                String greeting = set.getFlag(DefaultFlag.GREET_MESSAGE, localPlayer);
+                String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE, localPlayer);
+                Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER, localPlayer);
+                Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE, localPlayer);
+
+                if (state.lastFarewell != null && (farewell == null
+                        || !state.lastFarewell.equals(farewell))) {
+                    String replacedFarewell = plugin.replaceMacros(
+                            player, BukkitUtil.replaceColorMacros(state.lastFarewell));
+                    player.sendMessage(ChatColor.AQUA + " ** " + replacedFarewell);
+                }
+
+                if (greeting != null && (state.lastGreeting == null
+                        || !state.lastGreeting.equals(greeting))) {
+                    String replacedGreeting = plugin.replaceMacros(
+                            player, BukkitUtil.replaceColorMacros(greeting));
+                    player.sendMessage(ChatColor.AQUA + " ** " + replacedGreeting);
+                }
+
+                if ((notifyLeave == null || !notifyLeave)
+                        && state.notifiedForLeave != null && state.notifiedForLeave) {
+                    plugin.broadcastNotification(ChatColor.GRAY + "WG: "
+                            + ChatColor.LIGHT_PURPLE + player.getName()
+                            + ChatColor.GOLD + " left NOTIFY region");
+                }
+
+                if (notifyEnter != null && notifyEnter && (state.notifiedForEnter == null
+                        || !state.notifiedForEnter)) {
+                    StringBuilder regionList = new StringBuilder();
+
+                    for (ProtectedRegion region : set) {
+                        if (regionList.length() != 0) {
+                            regionList.append(", ");
+                        }
+                        regionList.append(region.getId());
+                    }
+
+                    plugin.broadcastNotification(ChatColor.GRAY + "WG: "
+                            + ChatColor.LIGHT_PURPLE + player.getName()
+                            + ChatColor.GOLD + " entered NOTIFY region: "
+                            + ChatColor.WHITE
+                            + regionList);
+                }
+
+                state.lastGreeting = greeting;
+                state.lastFarewell = farewell;
+                state.notifiedForEnter = notifyEnter;
+                state.notifiedForLeave = notifyLeave;
+                state.lastExitAllowed = exitAllowed;
+                state.lastWorld = event.getTo().getWorld();
+                state.lastBlockX = event.getTo().getBlockX();
+                state.lastBlockY = event.getTo().getBlockY();
+                state.lastBlockZ = event.getTo().getBlockZ();
             }
         }
     }

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

@@ -38,25 +38,25 @@ public class GeneralCommands {
     public GeneralCommands(WorldGuardPlugin plugin) {
         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 {
         ConfigurationManager config = plugin.getGlobalStateManager();
-        
+
         Iterable<Player> targets = null;
         boolean included = false;
-        
+
         // Detect arguments based on the number of arguments provided
         if (args.argsLength() == 0) {
             targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
+
             // Check permissions!
             plugin.checkPermission(sender, "worldguard.god");
-        } else if (args.argsLength() == 1) {            
+        } else if (args.argsLength() == 1) {
             targets = plugin.matchPlayers(sender, args.getString(0));
-            
+
             // Check permissions!
             plugin.checkPermission(sender, "worldguard.god.other");
         }
@@ -64,87 +64,87 @@ public class GeneralCommands {
         for (Player player : targets) {
             config.enableGodMode(player);
             player.setFireTicks(0);
-            
+
             // Tell the user
             if (player.equals(sender)) {
                 player.sendMessage(ChatColor.YELLOW + "God mode enabled! Use /ungod to disable.");
-                
+
                 // Keep track of this
                 included = true;
             } else {
                 player.sendMessage(ChatColor.YELLOW + "God enabled by "
                         + plugin.toName(sender) + ".");
-                
+
             }
         }
-        
+
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
         if (!included && args.hasFlag('s')) {
             sender.sendMessage(ChatColor.YELLOW.toString() + "Players now have god mode.");
         }
     }
-    
+
     @SuppressWarnings("deprecation")
     @Command(aliases = {"ungod"}, usage = "[player]",
             desc = "Disable godmode on a player", flags = "s", max = 1)
     public void ungod(CommandContext args, CommandSender sender) throws CommandException {
         ConfigurationManager config = plugin.getGlobalStateManager();
-        
+
         Iterable<Player> targets = null;
         boolean included = false;
-        
+
         // Detect arguments based on the number of arguments provided
         if (args.argsLength() == 0) {
             targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
+
             // Check permissions!
             plugin.checkPermission(sender, "worldguard.god");
-        } else if (args.argsLength() == 1) {            
+        } else if (args.argsLength() == 1) {
             targets = plugin.matchPlayers(sender, args.getString(0));
-            
+
             // Check permissions!
             plugin.checkPermission(sender, "worldguard.god.other");
         }
 
         for (Player player : targets) {
             config.disableGodMode(player);
-            
+
             // Tell the user
             if (player.equals(sender)) {
                 player.sendMessage(ChatColor.YELLOW + "God mode disabled!");
-                
+
                 // Keep track of this
                 included = true;
             } else {
                 player.sendMessage(ChatColor.YELLOW + "God disabled by "
                         + plugin.toName(sender) + ".");
-                
+
             }
         }
-        
+
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
         if (!included && args.hasFlag('s')) {
             sender.sendMessage(ChatColor.YELLOW.toString() + "Players no longer have god mode.");
         }
     }
-    
+
     @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
     public void heal(CommandContext args,CommandSender sender) throws CommandException {
-        
+
         Iterable<Player> targets = null;
         boolean included = false;
-        
+
         // Detect arguments based on the number of arguments provided
         if (args.argsLength() == 0) {
             targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
+
             // Check permissions!
             plugin.checkPermission(sender, "worldguard.heal");
-        } else if (args.argsLength() == 1) {            
+        } else if (args.argsLength() == 1) {
             targets = plugin.matchPlayers(sender, args.getString(0));
-            
+
             // Check permissions!
             plugin.checkPermission(sender, "worldguard.heal.other");
         }
@@ -152,100 +152,100 @@ public class GeneralCommands {
         for (Player player : targets) {
             player.setHealth(20);
             player.setFoodLevel(20);
-            
+
             // Tell the user
             if (player.equals(sender)) {
                 player.sendMessage(ChatColor.YELLOW + "Healed!");
-                
+
                 // Keep track of this
                 included = true;
             } else {
                 player.sendMessage(ChatColor.YELLOW + "Healed by "
                         + plugin.toName(sender) + ".");
-                
+
             }
         }
-        
+
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
         if (!included && args.hasFlag('s')) {
             sender.sendMessage(ChatColor.YELLOW.toString() + "Players healed.");
         }
     }
-    
+
     @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
     public void slay(CommandContext args, CommandSender sender) throws CommandException {
-        
+
         Iterable<Player> targets = null;
         boolean included = false;
-        
+
         // Detect arguments based on the number of arguments provided
         if (args.argsLength() == 0) {
             targets = plugin.matchPlayers(plugin.checkPlayer(sender));
-            
+
             // Check permissions!
             plugin.checkPermission(sender, "worldguard.slay");
-        } else if (args.argsLength() == 1) {            
+        } else if (args.argsLength() == 1) {
             targets = plugin.matchPlayers(sender, args.getString(0));
-            
+
             // Check permissions!
             plugin.checkPermission(sender, "worldguard.slay.other");
         }
 
         for (Player player : targets) {
             player.setHealth(0);
-            
+
             // Tell the user
             if (player.equals(sender)) {
                 player.sendMessage(ChatColor.YELLOW + "Slain!");
-                
+
                 // Keep track of this
                 included = true;
             } else {
                 player.sendMessage(ChatColor.YELLOW + "Slain by "
                         + plugin.toName(sender) + ".");
-                
+
             }
         }
-        
+
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
         if (!included && args.hasFlag('s')) {
             sender.sendMessage(ChatColor.YELLOW.toString() + "Players slain.");
         }
     }
-    
+
     @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
     @CommandPermissions({"worldguard.locate"})
     public void locate(CommandContext args, CommandSender sender) throws CommandException {
-        
+
         Player player = plugin.checkPlayer(sender);
-        
+
         if (args.argsLength() == 0) {
             player.setCompassTarget(player.getWorld().getSpawnLocation());
-            
+
             sender.sendMessage(ChatColor.YELLOW.toString() + "Compass reset to spawn.");
         } else {
             Player target = plugin.matchSinglePlayer(sender, args.getString(0));
             player.setCompassTarget(target.getLocation());
-            
+
             sender.sendMessage(ChatColor.YELLOW.toString() + "Compass repointed.");
         }
     }
-    
+
     @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0)
     @CommandPermissions({"worldguard.stack"})
     public void stack(CommandContext args, CommandSender sender) throws CommandException {
-        
+
         Player player = plugin.checkPlayer(sender);
         boolean ignoreMax = plugin.hasPermission(player, "worldguard.stack.illegitimate");
         boolean ignoreDamaged = plugin.hasPermission(player, "worldguard.stack.damaged");
-        
+
         ItemStack[] items = player.getInventory().getContents();
         int len = items.length;
 
         int affected = 0;
-        
+
         for (int i = 0; i < len; i++) {
             ItemStack item = items[i];
 
@@ -275,19 +275,17 @@ public class GeneralCommands {
                     if (item2.getTypeId() == item.getTypeId() &&
                             ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
                                     || item.getDurability() == item2.getDurability()) &&
-                                    ((item.getItemMeta() == null && item2.getItemMeta() == null)
-                                            || (item.getItemMeta() != null &&
-                                                item.getItemMeta().equals(item2.getItemMeta())))) {
+                            item.getEnchantments().equals(item2.getEnchantments())) {
                         // This stack won't fit in the parent stack
                         if (item2.getAmount() > needed) {
-                            item.setAmount(max);
+                            item.setAmount(64);
                             item2.setAmount(item2.getAmount() - needed);
                             break;
                         // This stack will
                         } else {
                             items[j] = null;
                             item.setAmount(item.getAmount() + item2.getAmount());
-                            needed = max - item.getAmount();
+                            needed = 64 - item.getAmount();
                         }
 
                         affected++;

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

@@ -1,58 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.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;
-        }
-    }
-    
-}

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

@@ -30,11 +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.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.RegionDBUtil;
 
 // @TODO: A lot of code duplication here! Need to fix.
 
@@ -44,30 +44,15 @@ public class RegionMemberCommands {
     public RegionMemberCommands(WorldGuardPlugin plugin) {
         this.plugin = plugin;
     }
-
-    @Command(aliases = {"addmember", "addmember"},
-            usage = "<id> <members...>",
-            flags = "w:",
-            desc = "Add a member to a region",
-            min = 2)
+    
+    @Command(aliases = {"addmember", "addmember"}, usage = "<id> <members...>",
+            desc = "Add a member to a region", min = 2)
     public void addMember(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 (player != null) {
-                world = player.getWorld();
-            } else {
-                throw new CommandException("No world specified. Use -w <worldname>.");
-            }
-        }
-
+        
+        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);
@@ -79,21 +64,19 @@ public class RegionMemberCommands {
 
         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());
-            }
+        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());
         }
 
-        RegionDBUtil.addToDomain(region.getMembers(), args.getParsedPaddedSlice(1, 0), 0);
+        RegionDBUtil.addToDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
 
         sender.sendMessage(ChatColor.YELLOW
                 + "Region '" + id + "' updated.");
-
+        
         try {
             mgr.save();
         } catch (ProtectionDatabaseException e) {
@@ -101,30 +84,15 @@ public class RegionMemberCommands {
                     + e.getMessage());
         }
     }
-
-    @Command(aliases = {"addowner", "addowner"},
-            usage = "<id> <owners...>",
-            flags = "w:",
-            desc = "Add an owner to a region",
-            min = 2)
+    
+    @Command(aliases = {"addowner", "addowner"}, usage = "<id> <owners...>",
+            desc = "Add an owner to a region", min = 2)
     public void addOwner(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 (player != null) {
-                world = player.getWorld();
-            } else {
-                throw new CommandException("No world specified. Use -w <worldname>.");
-            }
-        }
-
+        
+        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);
@@ -138,32 +106,30 @@ public class RegionMemberCommands {
 
         Boolean flag = region.getFlag(DefaultFlag.BUYABLE);
         DefaultDomain owners = region.getOwners();
-        if (localPlayer != null) {
-            if (flag != null && flag && owners != null && owners.size() == 0) {
-                if (!plugin.hasPermission(player, "worldguard.region.unlimited")) {
-                    int maxRegionCount = plugin.getGlobalStateManager().get(world).getMaxRegionCount(player);
-                    if (maxRegionCount >= 0 && mgr.getRegionCountOfPlayer(localPlayer)
-                            >= maxRegionCount) {
-                        throw new CommandException("You already own the maximum allowed amount of regions.");
-                    }
+        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());
+            }
+            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 {
-                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." + id.toLowerCase());
             }
         }
 
-        RegionDBUtil.addToDomain(region.getOwners(), args.getParsedPaddedSlice(1, 0), 0);
+        RegionDBUtil.addToDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
 
         sender.sendMessage(ChatColor.YELLOW
                 + "Region '" + id + "' updated.");
-
+        
         try {
             mgr.save();
         } catch (ProtectionDatabaseException e) {
@@ -171,30 +137,15 @@ public class RegionMemberCommands {
                     + e.getMessage());
         }
     }
-
-    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
-            usage = "<id> <owners...>",
-            flags = "aw:",
-            desc = "Remove an owner to a region",
-            min = 1)
+    
+    @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 {
-        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>.");
-            }
-        }
-
+        
+        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);
@@ -206,28 +157,19 @@ public class RegionMemberCommands {
 
         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());
-            }
+        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());
         }
 
-        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);
-        }
+        RegionDBUtil.removeFromDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
 
         sender.sendMessage(ChatColor.YELLOW
                 + "Region '" + id + "' updated.");
-
+        
         try {
             mgr.save();
         } catch (ProtectionDatabaseException e) {
@@ -235,31 +177,16 @@ public class RegionMemberCommands {
                     + e.getMessage());
         }
     }
-
-    @Command(aliases = {"removeowner", "remowner"},
-            usage = "<id> <owners...>",
-            flags = "aw:",
-            desc = "Remove an owner to a region",
-            min = 1)
+    
+    @Command(aliases = {"removeowner", "remowner"}, usage = "<id> <owners...>",
+            desc = "Remove an owner to a region", min = 2)
     public void removeOwner(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 (player != null) {
-                world = player.getWorld();
-            } else {
-                throw new CommandException("No world specified. Use -w <worldname>.");
-            }
-        }
-
+        
+        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);
@@ -271,28 +198,19 @@ public class RegionMemberCommands {
 
         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());
-            }
+        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());
         }
 
-        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);
-        }
+        RegionDBUtil.removeFromDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
 
         sender.sendMessage(ChatColor.YELLOW
                 + "Region '" + id + "' updated.");
-
+        
         try {
             mgr.save();
         } catch (ProtectionDatabaseException e) {

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

@@ -1,334 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.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();
-    }
-
-}

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

@@ -128,7 +128,7 @@ public class ToggleCommands {
 
                 if (removed > 10) {
                     sender.sendMessage("" + removed + " entities (>10) auto-removed from "
-                            + world.getName());
+                            + world.toString());
                 }
             }
 

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

@@ -72,7 +72,6 @@ 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: "

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

@@ -115,7 +115,10 @@ public class SignChestProtection implements ChestProtection {
     
     private boolean isProtectedSignAndChestBinary(Block block, Player player) {
         Boolean res = isProtectedSignAndChest(block, player);
-        return !(res == null || !res);
+        if (res == null || !res) {
+            return false;
+        }
+        return true;
     }
 
     public boolean isAdjacentChestProtected(Block searchBlock, Player player) {

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

@@ -30,8 +30,8 @@ import java.util.Set;
 import com.sk89q.worldguard.LocalPlayer;
 
 public class DefaultDomain implements Domain {
-    private final Set<String> groups;
-    private final Set<String> players;
+    private Set<String> groups;
+    private Set<String> players;
     
     public DefaultDomain() {
         this.groups = new LinkedHashSet<String>();
@@ -135,9 +135,4 @@ public class DefaultDomain implements Domain {
         
         return str.toString();
     }
-
-    public void removeAll() {
-        groups.clear();
-        players.clear();
-    }
 }

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

@@ -18,13 +18,23 @@
  */
 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.*;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.RegionGroup;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
 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
@@ -55,7 +65,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     /**
      * Checks if a player can build in an area.
      * 
-     * @param player The player to check
+     * @param player The player to chec
      * @return build ability
      */
     public boolean canBuild(LocalPlayer player) {
@@ -206,12 +216,16 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
         Set<ProtectedRegion> needsClear = new HashSet<ProtectedRegion>();
         Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
 
-        for (ProtectedRegion region : applicable) {
+        Iterator<ProtectedRegion> it = applicable.iterator();
+        
+        while (it.hasNext()) {
+            ProtectedRegion region = it.next();
+
             // Ignore lower priority regions
             if (hasFlagDefined && region.getPriority() < lastPriority) {
                 break;
             }
-
+            
             lastPriority = region.getPriority();
 
             // Ignore non-build regions
@@ -230,7 +244,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
                     continue;
                 }
             }
-
+            
             State v = region.getFlag(flag);
 
             // Allow DENY to override everything
@@ -323,7 +337,11 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
         Map<ProtectedRegion, V> needsClear = new HashMap<ProtectedRegion, V>();
         Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
 
-        for (ProtectedRegion region : applicable) {
+        Iterator<ProtectedRegion> it = applicable.iterator();
+
+        while (it.hasNext()) {
+            ProtectedRegion region = it.next();
+
             // Ignore lower priority regions
             if (found && region.getPriority() < lastPriority) {
                 break;
@@ -342,20 +360,20 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
 
             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();
         }
         
-        if (!needsClear.isEmpty()) {
+        try {
             return needsClear.values().iterator().next();
-        } else {
+        } catch (NoSuchElementException e) {
             if (globalRegion != null) {
                 V gFlag = globalRegion.getFlag(flag);
                 if (gFlag != null) return gFlag;

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

@@ -21,11 +21,7 @@ package com.sk89q.worldguard.protection;
 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -36,12 +32,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.ProtectionDatabase;
 import com.sk89q.worldguard.protection.databases.YAMLDatabase;
+import com.sk89q.worldguard.protection.databases.MySQLDatabase;
 import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
+import com.sk89q.worldguard.protection.managers.FlatRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 
 /**
@@ -66,7 +62,7 @@ public class GlobalRegionManager {
     /**
      * Map of managers per-world.
      */
-    private ConcurrentHashMap<String, RegionManager> managers;
+    private HashMap<String, RegionManager> managers;
 
     /**
      * Stores the list of modification dates for the world files. This allows
@@ -82,7 +78,7 @@ public class GlobalRegionManager {
     public GlobalRegionManager(WorldGuardPlugin plugin) {
         this.plugin = plugin;
         config = plugin.getGlobalStateManager();
-        managers = new ConcurrentHashMap<String, RegionManager>();
+        managers = new HashMap<String, RegionManager>();
         lastModified = new HashMap<String, Long>();
     }
 
@@ -126,26 +122,19 @@ 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 The world to load a RegionManager for
      * @return the loaded RegionManager
      */
-    public RegionManager create(World world) {
+    public RegionManager load(World world) {
         String name = world.getName();
-        boolean sql = config.useSqlDatabase;
         ProtectionDatabase database;
         File file = null;
-
+        
         try {
-            if (!sql) {
+            if (!config.useSqlDatabase) {
                 file = getPath(name);
                 database = new YAMLDatabase(file, plugin.getLogger());
 
@@ -156,27 +145,27 @@ public class GlobalRegionManager {
             }
 
             // Create a manager
-            RegionManager manager = new PRTreeRegionManager(database);
+            RegionManager manager = new FlatRegionManager(database);
+
+            managers.put(name, manager);
             manager.load();
 
-            if (plugin.getGlobalStateManager().get(world).summaryOnStart) {
-                plugin.getLogger().info(manager.getRegions().size()
-                        + " regions loaded for '" + name + "'");
-            }
+            plugin.getLogger().info(manager.getRegions().size()
+                    + " regions loaded for '" + name + "'");
 
             return manager;
         } catch (ProtectionDatabaseException e) {
             String logStr = "Failed to load regions from ";
-            if (sql) {
+            if (config.useSqlDatabase) {
                 logStr += "SQL Database <" + config.sqlDsn + "> ";
             } else {
                 logStr += "file \"" + file + "\" ";
             }
 
-            plugin.getLogger().log(Level.SEVERE, logStr + " : " + e.getMessage());
+            plugin.getLogger().info(logStr + " : " + e.getMessage());
             e.printStackTrace();
-        } catch (FileNotFoundException e) {
-            plugin.getLogger().log(Level.SEVERE, "Error loading regions for world \""
+        } catch (Exception e) {
+            plugin.getLogger().info("Error loading regions for world \""
                     + name + "\": " + e.toString() + "\n\t" + e.getMessage());
             e.printStackTrace();
         }
@@ -232,14 +221,9 @@ public class GlobalRegionManager {
      */
     public RegionManager get(World world) {
         RegionManager manager = managers.get(world.getName());
-        RegionManager newManager = null;
 
-        while (manager == null) {
-            if (newManager == null) {
-                newManager = create(world);
-            }
-            managers.putIfAbsent(world.getName(), newManager);
-            manager = managers.get(world.getName());
+        if (manager == null) {
+            manager = load(world);
         }
 
         return manager;
@@ -366,7 +350,7 @@ public class GlobalRegionManager {
             return true;
         }
 
-        RegionManager mgr = get(world);
+        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
         return mgr.getApplicableRegions(toVector(loc)).allows(flag, player);
     }
 }

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

@@ -182,7 +182,7 @@ public class CSVDatabase extends AbstractProtectionDatabase {
         } finally {
             try {
                 reader.close();
-            } catch (IOException ignored) {
+            } catch (IOException e) {
             }
         }
 

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

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

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

@@ -20,6 +20,20 @@
 package com.sk89q.worldguard.protection.databases;
 
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.PreparedStatement;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
@@ -32,23 +46,10 @@ 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 org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.DumperOptions.FlowStyle;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.SafeConstructor;
-import org.yaml.snakeyaml.error.YAMLException;
-import org.yaml.snakeyaml.representer.Representer;
-
-import java.sql.*;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class MySQLDatabase extends AbstractProtectionDatabase {
     private final Logger logger;
 
-    private Yaml yaml;
-
     private Map<String, ProtectedRegion> regions;
 
     private Map<String, ProtectedRegion> cuboidRegions;
@@ -59,35 +60,24 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
     private final ConfigurationManager config;
 
     private Connection conn;
+    private String world;
     private int worldDbId = -1; // The database will never have an id of -1;
 
     public MySQLDatabase(ConfigurationManager config, String world, Logger logger) throws ProtectionDatabaseException {
         this.config = config;
-        String world1 = world;
+        this.world = world;
         this.logger = logger;
 
         try {
             connect();
 
-            try {
-            	// Test if the database is up to date, if not throw a critical error
-            	PreparedStatement verTest = this.conn.prepareStatement(
-            			"SELECT `world_id` FROM `region_cuboid` LIMIT 0,1;"
-            		);
-            	verTest.execute();
-            } catch (SQLException ex) {
-            	throw new InvalidTableFormatException(
-            			"region_storage_update_20110325.sql"
-            		);
-            }
-
             PreparedStatement worldStmt = conn.prepareStatement(
                     "SELECT `id` FROM " +
                     "`world` " +
                     "WHERE `name` = ? LIMIT 0,1"
             );
 
-            worldStmt.setString(1, world1);
+            worldStmt.setString(1, this.world);
             ResultSet worldResult = worldStmt.executeQuery();
 
             if (worldResult.first()) {
@@ -120,32 +110,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
             // no point continuing
             return;
         }
-
-        DumperOptions options = new DumperOptions();
-        options.setIndent(2);
-        options.setDefaultFlowStyle(FlowStyle.FLOW);
-        Representer representer = new Representer();
-        representer.setDefaultFlowStyle(FlowStyle.FLOW);
-
-        // We have to use this in order to properly save non-string values
-        yaml = new Yaml(new SafeConstructor(), new Representer(), options);
     }
 
     private void connect() throws SQLException {
-    	if (conn != null) {
-    		// Make a dummy query to check the connnection is alive.
-    		try {
-    			conn.prepareStatement("SELECT 1;").execute();
-    		} catch (SQLException ex) {
-                // Test if the dummy query failed because the connection is dead,
-                // and if it is mark the connection as closed (the MySQL Driver
-                // does not ensure that the connection is marked as closed unless
-                // the close() method has been called.
-    			if ("08S01".equals(ex.getSQLState())) {
-    				conn.close();
-    			}
-    		}
-    	}
         if (conn == null || conn.isClosed()) {
             conn = DriverManager.getConnection(config.sqlDsn, config.sqlUsername, config.sqlPassword);
         }
@@ -155,12 +122,11 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         // @TODO: Iterate _ONCE_
         try {
             PreparedStatement flagsStatement = this.conn.prepareStatement(
-                    "SELECT " +
+                    "SELECT " + 
                     "`region_flag`.`flag`, " +
                     "`region_flag`.`value` " +
                     "FROM `region_flag` " +
-                    "WHERE `region_flag`.`region_id` = ? " +
-                    "AND `region_flag`.`world_id` = " + this.worldDbId
+                    "WHERE `region_flag`.`region_id` = ? "
             );
 
             flagsStatement.setString(1, region.getId().toLowerCase());
@@ -170,8 +136,8 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
             while (flagsResultSet.next()) {
                 regionFlags.put(
                         flagsResultSet.getString("flag"),
-                        sqlUnmarshal(flagsResultSet.getString("value"))
-                        );
+                        flagsResultSet.getObject("value")
+                );
             }
 
             // @TODO: Make this better
@@ -212,8 +178,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                     "LEFT JOIN `user` ON ( " +
                     "`region_players`.`user_id` = " +
                     "`user`.`id`) " +
-                    "WHERE `region_players`.`region_id` = ? " +
-                    "AND `region_players`.`world_id` = " + this.worldDbId
+                    "WHERE `region_players`.`region_id` = ? "
             );
 
             usersStatement.setString(1, region.getId().toLowerCase());
@@ -238,8 +203,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                     "LEFT JOIN `group` ON ( " +
                     "`region_groups`.`group_id` = " +
                     "`group`.`id`) " +
-                    "WHERE `region_groups`.`region_id` = ? " +
-                    "AND `region_groups`.`world_id` = " + this.worldDbId
+                    "WHERE `region_groups`.`region_id` = ? "
             );
 
             groupsStatement.setString(1, region.getId().toLowerCase());
@@ -271,8 +235,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                     "`parent`.`id` AS `parent` " +
                     "FROM `region` " +
                     "LEFT JOIN `region` AS `parent` " +
-                    "ON (`region`.`parent` = `parent`.`id` " +
-                    "AND `region`.`world_id` = `parent`.`world_id`) " +
+                    "ON (`region`.`parent` = `parent`.`id`) " +
                     "WHERE `region`.`type` = 'global' " +
                     "AND `region`.`world_id` = ? "
             );
@@ -326,11 +289,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                     "`parent`.`id` AS `parent` " +
                     "FROM `region_cuboid` " +
                     "LEFT JOIN `region` " +
-                    "ON (`region_cuboid`.`region_id` = `region`.`id` " +
-                    "AND `region_cuboid`.`world_id` = `region`.`world_id`) " +
+                    "ON (`region_cuboid`.`region_id` = `region`.`id`) " +
                     "LEFT JOIN `region` AS `parent` " +
-                    "ON (`region`.`parent` = `parent`.`id` " +
-                    "AND `region`.`world_id` = `parent`.`world_id`) " +
+                    "ON (`region`.`parent` = `parent`.`id`) " +
                     "WHERE `region`.`world_id` = ? "
             );
 
@@ -397,11 +358,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                     "`parent`.`id` AS `parent` " +
                     "FROM `region_poly2d` " +
                     "LEFT JOIN `region` " +
-                    "ON (`region_poly2d`.`region_id` = `region`.`id` " +
-                    "AND `region_poly2d`.`world_id` = `region`.`world_id`) " +
+                    "ON (`region_poly2d`.`region_id` = `region`.`id`) " +
                     "LEFT JOIN `region` AS `parent` " +
-                    "ON (`region`.`parent` = `parent`.`id` " +
-                    "AND `region`.`world_id` = `parent`.`world_id`) " +
+                    "ON (`region`.`parent` = `parent`.`id`) " +
                     "WHERE `region`.`world_id` = ? "
             );
 
@@ -413,8 +372,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                     "`region_poly2d_point`.`x`, " +
                     "`region_poly2d_point`.`z` " +
                     "FROM `region_poly2d_point` " +
-                    "WHERE `region_poly2d_point`.`region_id` = ? " +
-                    "AND `region_poly2d_point`.`world_id` = " + this.worldDbId
+                    "WHERE `region_poly2d_point`.`region_id` = ? "
             );
 
             while (poly2dResultSet.next()) {
@@ -460,7 +418,6 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         poly2dRegions = regions;
     }
 
-    @Override
     public void load() throws ProtectionDatabaseException {
         try {
             connect();
@@ -471,7 +428,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         parentSets = new HashMap<ProtectedRegion,String>();
 
         // We load the cuboid regions first, as this is likely to be the
-        // largest dataset. This should save time in regards to the putAll()s
+        // largest dataset. This should save time in regards to the putAll()s 
         this.loadCuboid();
         Map<String,ProtectedRegion> regions = this.cuboidRegions;
         this.cuboidRegions = null;
@@ -541,15 +498,15 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                     Statement.RETURN_GENERATED_KEYS
             );
 
-            for (String username : usernames) {
-                if (!users.containsKey(username)) {
-                    insertUserStatement.setString(1, username);
+            for(int i=0, len=usernames.length; i<len; i++) {
+                if (!users.containsKey(usernames[i])) {
+                    insertUserStatement.setString(1, usernames[i]);
                     insertUserStatement.execute();
                     ResultSet generatedKeys = insertUserStatement.getGeneratedKeys();
                     if (generatedKeys.first()) {
-                        users.put(username, generatedKeys.getInt(1));
+                        users.put(usernames[i], generatedKeys.getInt(1));
                     } else {
-                        logger.warning("Could not get the database id for user " + username);
+                        logger.warning("Could not get the database id for user " + usernames[i]);
                     }
                 }
             }
@@ -605,15 +562,15 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                     Statement.RETURN_GENERATED_KEYS
             );
 
-            for (String groupname : groupnames) {
-                if (!groups.containsKey(groupname)) {
-                    insertGroupStatement.setString(1, groupname);
+            for(int i=0, len=groupnames.length; i<len; i++) {
+                if (!groups.containsKey(groupnames[i])) {
+                    insertGroupStatement.setString(1, groupnames[i]);
                     insertGroupStatement.execute();
                     ResultSet generatedKeys = insertGroupStatement.getGeneratedKeys();
                     if (generatedKeys.first()) {
-                        groups.put(groupname, generatedKeys.getInt(1));
+                        groups.put(groupnames[i], generatedKeys.getInt(1));
                     } else {
-                        logger.warning("Could not get the database id for user " + groupname);
+                        logger.warning("Could not get the database id for user " + groupnames[i]);
                     }
                 }
             }
@@ -633,13 +590,12 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
      *   b) If the region is not in the database, we insert it
      *  3) We iterate over what remains of the in-database list and remove
      *     them from the database
-     *
+     *     
      * TODO: Look at adding/removing/updating the database when the in
      *       memory region is created/remove/updated
-     *
+     *        
      * @see com.sk89q.worldguard.protection.databases.ProtectionDatabase#save()
      */
-    @Override
     public void save() throws ProtectionDatabaseException {
         try {
             connect();
@@ -707,7 +663,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                 PreparedStatement setParentStatement = this.conn.prepareStatement(
                         "UPDATE `region` SET " +
                         "`parent` = ? " +
-                        "WHERE `id` = ? AND `world_id` = " + this.worldDbId
+                        "WHERE `id` = ? "
                 );
 
                 setParentStatement.setString(1, entry.getValue().getParent().getId().toLowerCase());
@@ -738,8 +694,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
     private void updateFlags(ProtectedRegion region) throws SQLException {
         PreparedStatement clearCurrentFlagStatement = this.conn.prepareStatement(
                 "DELETE FROM `region_flag` " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId
+                "WHERE `region_id` = ? "
         );
 
         clearCurrentFlagStatement.setString(1, region.getId().toLowerCase());
@@ -748,16 +703,15 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         for (Map.Entry<Flag<?>, Object> entry : region.getFlags().entrySet()) {
             if (entry.getValue() == null) continue;
 
-            Object flag = sqlMarshal(marshalFlag(entry.getKey(), entry.getValue()));
+            Object flag = marshalFlag(entry.getKey(), entry.getValue());
 
             PreparedStatement insertFlagStatement = this.conn.prepareStatement(
                     "INSERT INTO `region_flag` ( " +
                     "`id`, " +
                     "`region_id`, " +
-                    "`world_id`, " +
                     "`flag`, " +
                     "`value` " +
-                    ") VALUES (null, ?, " + this.worldDbId + ", ?, ?)"
+                    ") VALUES (null, ?, ?, ?)"
             );
 
             insertFlagStatement.setString(1, region.getId().toLowerCase());
@@ -780,7 +734,6 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         PreparedStatement deleteUsersForRegion = this.conn.prepareStatement(
                 "DELETE FROM `region_players` " +
                 "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId + " " +
                 "AND `owner` = ?"
         );
 
@@ -790,13 +743,12 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
 
         PreparedStatement insertUsersForRegion = this.conn.prepareStatement(
                 "INSERT INTO `region_players` " +
-                "(`region_id`, `world_id`, `user_id`, `owner`) " +
-                "VALUES (?, " + this.worldDbId + ",  ?, ?)"
+                "(`region_id`, `user_id`, `owner`) VALUES (?, ?, ?)"
         );
 
-        Set<String> var = domain.getPlayers();
+        Map<String,Integer> players = getUserIds(domain.getPlayers().toArray(new String[0]));
 
-        for (Integer player : getUserIds(var.toArray(new String[var.size()])).values()) {
+        for (Integer player : players.values()) {
             insertUsersForRegion.setString(1, region.getId().toLowerCase());
             insertUsersForRegion.setInt(2, player);
             insertUsersForRegion.setBoolean(3, owners);
@@ -807,7 +759,6 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         PreparedStatement deleteGroupsForRegion = this.conn.prepareStatement(
                 "DELETE FROM `region_groups` " +
                 "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId + " " +
                 "AND `owner` = ?"
         );
 
@@ -817,12 +768,12 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
 
         PreparedStatement insertGroupsForRegion = this.conn.prepareStatement(
                 "INSERT INTO `region_groups` " +
-                "(`region_id`, `world_id`, `group_id`, `owner`) " +
-                "VALUES (?, " + this.worldDbId + ",  ?, ?)"
+                "(`region_id`, `group_id`, `owner`) VALUES (?, ?, ?)"
         );
 
-        Set<String> groupVar = domain.getGroups();
-        for (Integer group : getGroupIds(groupVar.toArray(new String[groupVar.size()])).values()) {
+        Map<String,Integer> groups = getGroupIds(domain.getGroups().toArray(new String[0]));
+
+        for (Integer group : groups.values()) {
             insertGroupsForRegion.setString(1, region.getId().toLowerCase());
             insertGroupsForRegion.setInt(2, group);
             insertGroupsForRegion.setBoolean(3, owners);
@@ -844,13 +795,12 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                 "`type`, " +
                 "`priority`, " +
                 "`parent` " +
-                ") VALUES (?, ?, ?, ?, null)"
+                ") VALUES (?, " + this.worldDbId  + ", ?, ?, null)"
         );
 
         insertRegionStatement.setString(1, region.getId().toLowerCase());
-        insertRegionStatement.setInt(2, this.worldDbId);
-        insertRegionStatement.setString(3, type);
-        insertRegionStatement.setInt(4, region.getPriority());
+        insertRegionStatement.setString(2, type);
+        insertRegionStatement.setInt(3, region.getPriority());
 
         insertRegionStatement.execute();
 
@@ -866,14 +816,13 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         PreparedStatement insertCuboidRegionStatement = this.conn.prepareStatement(
                 "INSERT INTO `region_cuboid` (" +
                 "`region_id`, " +
-                "`world_id`, " +
                 "`min_z`, " +
                 "`min_y`, " +
                 "`min_x`, " +
                 "`max_z`, " +
                 "`max_y`, " +
                 "`max_x` " +
-                ") VALUES (?, " + this.worldDbId + ", ?, ?, ?, ?, ?, ?)"
+                ") VALUES (?, ?, ?, ?, ?, ?, ?)"
         );
 
         BlockVector min = region.getMinimumPoint();
@@ -896,10 +845,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         PreparedStatement insertPoly2dRegionStatement = this.conn.prepareStatement(
                 "INSERT INTO `region_poly2d` (" +
                 "`region_id`, " +
-                "`world_id`, " +
                 "`max_y`, " +
                 "`min_y` " +
-                ") VALUES (?, " + this.worldDbId + ", ?, ?)"
+                ") VALUES (?, ?, ?)"
         );
 
         insertPoly2dRegionStatement.setString(1, region.getId().toLowerCase());
@@ -914,8 +862,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
     private void updatePoly2dPoints(ProtectedPolygonalRegion region) throws SQLException {
         PreparedStatement clearPoly2dPointsForRegionStatement = this.conn.prepareStatement(
                 "DELETE FROM `region_poly2d_point` " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId
+                "WHERE `region_id` = ? "
         );
 
         clearPoly2dPointsForRegionStatement.setString(1, region.getId().toLowerCase());
@@ -926,15 +873,13 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                 "INSERT INTO `region_poly2d_point` (" +
                 "`id`, " +
                 "`region_id`, " +
-                "`world_id`, " +
                 "`z`, " +
                 "`x` " +
-                ") VALUES (null, ?, " + this.worldDbId + ", ?, ?)"
+                ") VALUES (null, ?, ?, ?)"
         );
 
-        String lowerId = region.getId();
         for (BlockVector2D point : region.getPoints()) {
-            insertPoly2dPointStatement.setString(1, lowerId);
+            insertPoly2dPointStatement.setString(1, region.getId().toLowerCase());
             insertPoly2dPointStatement.setInt(2, point.getBlockZ());
             insertPoly2dPointStatement.setInt(3, point.getBlockX());
 
@@ -949,7 +894,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
     private void updateRegion(ProtectedRegion region, String type) throws SQLException  {
         PreparedStatement updateRegionStatement = this.conn.prepareStatement(
                 "UPDATE `region` SET " +
-                "`priority` = ? WHERE `id` = ? AND `world_id` = " + this.worldDbId
+                "`priority` = ? WHERE `id` = ? "
         );
 
         updateRegionStatement.setInt(1, region.getPriority());
@@ -974,8 +919,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                 "`max_z` = ?, " +
                 "`max_y` = ?, " +
                 "`max_x` = ? " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId
+                "WHERE `region_id` = ? "
         );
 
         BlockVector min = region.getMinimumPoint();
@@ -999,8 +943,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                 "UPDATE `region_poly2d` SET " +
                 "`max_y` = ?, " +
                 "`min_y` = ? " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId
+                "WHERE `region_id` = ? "
         );
 
         updatePoly2dRegionStatement.setInt(1, region.getMaximumPoint().getBlockY());
@@ -1016,25 +959,11 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
         updateRegion(region, "global");
     }
 
-    @Override
     public Map<String, ProtectedRegion> getRegions() {
         return regions;
     }
 
-    @Override
     public void setRegions(Map<String, ProtectedRegion> regions) {
         this.regions = regions;
     }
-    
-    protected Object sqlUnmarshal(String rawValue) {
-        try {
-            return yaml.load(rawValue);
-        } catch (YAMLException e) {
-            return String.valueOf(rawValue);
-        }
-    }
-    
-    protected String sqlMarshal(Object rawObject) {
-        return yaml.dump(rawObject);
-    }
 }

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

@@ -19,14 +19,6 @@
 
 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;
@@ -37,6 +29,14 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+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;
+
 public class MySQLToYAMLMigrator extends AbstractDatabaseMigrator {
 
     private WorldGuardPlugin plugin;
@@ -59,7 +59,7 @@ public class MySQLToYAMLMigrator extends AbstractDatabaseMigrator {
 
             conn.close();
         } catch (SQLException e) {
-            throw new MigrationException(e);
+            throw new MigrationException((Exception) e);
         }
     }
 
@@ -75,7 +75,7 @@ public class MySQLToYAMLMigrator extends AbstractDatabaseMigrator {
             oldDatabase = new MySQLDatabase(plugin.getGlobalStateManager(), world, plugin.getLogger());
             oldDatabase.load();
         } catch (ProtectionDatabaseException e) {
-            throw new MigrationException(e);
+            throw new MigrationException((Exception) e);
         }
 
         return oldDatabase.getRegions();
@@ -89,9 +89,9 @@ public class MySQLToYAMLMigrator extends AbstractDatabaseMigrator {
 
             return new YAMLDatabase(file, plugin.getLogger());
         } catch (FileNotFoundException e) {
-            throw new MigrationException(e);
+            throw new MigrationException((Exception) e);
         } catch (ProtectionDatabaseException e) {
-            throw new MigrationException(e);
+            throw new MigrationException((Exception) e);
         }
     }
 }

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

@@ -19,6 +19,12 @@
 
 package com.sk89q.worldguard.protection.databases.migrators;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.databases.MySQLDatabase;
 import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
@@ -26,12 +32,6 @@ 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;
@@ -66,9 +66,9 @@ public class YAMLToMySQLMigrator extends AbstractDatabaseMigrator {
             oldDatabase = new YAMLDatabase(this.regionYamlFiles.get(world), plugin.getLogger());
             oldDatabase.load();
         } catch (FileNotFoundException e) {
-            throw new MigrationException(e);
+            throw new MigrationException((Exception) e);
         } catch (ProtectionDatabaseException e) {
-            throw new MigrationException(e);
+            throw new MigrationException((Exception) e);
         }
 
         return oldDatabase.getRegions();
@@ -79,7 +79,7 @@ public class YAMLToMySQLMigrator extends AbstractDatabaseMigrator {
         try {
             return new MySQLDatabase(plugin.getGlobalStateManager(), world, plugin.getLogger());
         } catch (ProtectionDatabaseException e) {
-            throw new MigrationException(e);
+            throw new MigrationException((Exception) e);
         }
     }
 

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

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldguard.protection.flags;
 
-import org.bukkit.GameMode;
 import org.bukkit.entity.EntityType;
 
 /**
@@ -37,12 +36,10 @@ public final class DefaultFlag {
     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", true, RegionGroup.ALL);
-    public static final StateFlag LIGHTER = new StateFlag("lighter", true);
+    public static final StateFlag LIGHTER = new StateFlag("lighter", true, RegionGroup.ALL);
     public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", true);
-    public static final StateFlag FIRE_EXTINGUISH = new StateFlag("fire-extinguish", 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", false);
@@ -59,82 +56,53 @@ 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, RegionGroup.ALL);
     public static final StateFlag EXP_DROPS = new StateFlag("exp-drops", true, RegionGroup.ALL);
-    public static final StateFlag SEND_CHAT = new StateFlag("send-chat", true);
-    public static final StateFlag RECEIVE_CHAT = new StateFlag("receive-chat", true);
     public static final StateFlag ENTRY = new StateFlag("entry", true);
     public static final StateFlag EXIT = new StateFlag("exit", true);
-    public static final StateFlag ITEM_DROP = new StateFlag("item-drop", true);
-    public static final StateFlag ENDERPEARL = new StateFlag("enderpearl", true);
-    public static final StateFlag ENTITY_PAINTING_DESTROY = new StateFlag("entity-painting-destroy", true);
-    public static final StateFlag ENTITY_ITEM_FRAME_DESTROY = new StateFlag("entity-item-frame-destroy", true);
-    public static final StateFlag POTION_SPLASH = new StateFlag("potion-splash", true);
     public static final StringFlag GREET_MESSAGE = new StringFlag("greeting", RegionGroup.ALL);
     public static final StringFlag FAREWELL_MESSAGE = new StringFlag("farewell", RegionGroup.ALL);
     public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter", RegionGroup.ALL);
     public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave", RegionGroup.ALL);
     public static final SetFlag<EntityType> DENY_SPAWN = new SetFlag<EntityType>("deny-spawn", RegionGroup.ALL, new EntityTypeFlag(null));
-    public static final EnumFlag<GameMode> GAME_MODE = new EnumFlag<GameMode>("game-mode", GameMode.class, RegionGroup.ALL);
     public static final IntegerFlag HEAL_DELAY = new IntegerFlag("heal-delay", RegionGroup.ALL);
     public static final IntegerFlag HEAL_AMOUNT = new IntegerFlag("heal-amount", RegionGroup.ALL);
-    public static final 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 MIN_HEAL = new IntegerFlag("heal-min-health", RegionGroup.ALL);
+    public static final IntegerFlag MAX_HEAL = new IntegerFlag("heal-max-health", RegionGroup.ALL);
     public static final IntegerFlag FEED_DELAY = new IntegerFlag("feed-delay", RegionGroup.ALL);
     public static final IntegerFlag FEED_AMOUNT = new IntegerFlag("feed-amount", RegionGroup.ALL);
     public static final IntegerFlag MIN_FOOD = new IntegerFlag("feed-min-hunger", RegionGroup.ALL);
     public static final IntegerFlag MAX_FOOD = new IntegerFlag("feed-max-hunger", RegionGroup.ALL);
-    // public static final IntegerFlag MAX_PLAYERS = new IntegerFlag("max-players-allowed", RegionGroup.ALL);
-    // public static final StringFlag MAX_PLAYERS_MESSAGE = new StringFlag("max-players-reject-message", RegionGroup.ALL);
     public static final LocationFlag TELE_LOC = new LocationFlag("teleport", RegionGroup.MEMBERS);
     public static final LocationFlag SPAWN_LOC = new LocationFlag("spawn", RegionGroup.MEMBERS);
-    public static final StateFlag ENABLE_SHOP = new StateFlag("allow-shop", false);
     public static final BooleanFlag BUYABLE = new BooleanFlag("buyable");
     public static final DoubleFlag PRICE = new DoubleFlag("price");
     public static final SetFlag<String> BLOCKED_CMDS = new SetFlag<String>("blocked-cmds", RegionGroup.ALL, new CommandStringFlag(null));
     public static final SetFlag<String> ALLOWED_CMDS = new SetFlag<String>("allowed-cmds", RegionGroup.ALL, new CommandStringFlag(null));
+    public static final BooleanFlag ALLOW_FLIGHT = new BooleanFlag("allow-flight", RegionGroup.ALL);
 
     public static final Flag<?>[] flagsList = new Flag<?>[] {
         PASSTHROUGH, BUILD, CONSTRUCT, PVP, CHEST_ACCESS, PISTONS,
         TNT, LIGHTER, USE, PLACE_VEHICLE, DESTROY_VEHICLE, SLEEP,
         MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY, EXP_DROPS,
-        CREEPER_EXPLOSION, OTHER_EXPLOSION, ENDERDRAGON_BLOCK_DAMAGE, GHAST_FIREBALL, ENDER_BUILD,
+        CREEPER_EXPLOSION, ENDERDRAGON_BLOCK_DAMAGE, GHAST_FIREBALL, ENDER_BUILD,
         GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
-        EXIT, ENTRY, LIGHTNING, ENTITY_PAINTING_DESTROY, ENDERPEARL,
-        ENTITY_ITEM_FRAME_DESTROY, ITEM_DROP, /*MAX_PLAYERS, MAX_PLAYERS_MESSAGE,*/
+        EXIT, ENTRY, LIGHTNING,
         HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
         FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
-        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, FIRE_EXTINGUISH, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
-        TELE_LOC, SPAWN_LOC, POTION_SPLASH,
-        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE, ENABLE_SHOP
+        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT,
+        MUSHROOMS, LEAF_DECAY, GRASS_SPREAD,
+        FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
+        TELE_LOC, SPAWN_LOC,
+        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE, ALLOW_FLIGHT,
     };
 
+
     private DefaultFlag() {
     }
 
     public static Flag<?>[] getFlags() {
         return flagsList;
     }
-
-    /**
-     * Try to match the flag with the given ID using a fuzzy name match.
-     *
-     * @param id the flag ID
-     * @return a flag, or null
-     */
-    public static Flag<?> fuzzyMatchFlag(String id) {
-        for (Flag<?> flag : DefaultFlag.getFlags()) {
-            if (flag.getName().replace("-", "").equalsIgnoreCase(id.replace("-", ""))) {
-                return flag;
-            }
-        }
-
-        return null;
-    }
 }

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

@@ -52,8 +52,6 @@ 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;
         }

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

@@ -41,10 +41,6 @@ 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) {
@@ -92,5 +88,5 @@ public class EnumFlag<T extends Enum<T>> extends Flag<T> {
     public Object marshal(T o) {
         return o.name();
     }
-
+    
 }

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

@@ -52,8 +52,6 @@ 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;
         }

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

@@ -38,7 +38,7 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  * @author sk89q
  */
 public class LocationFlag extends Flag<Location> {
-
+    
     public LocationFlag(String name, RegionGroup defaultGroup) {
         super(name, defaultGroup);
     }
@@ -82,7 +82,7 @@ public class LocationFlag extends Flag<Location> {
                             ),
                             yaw, pitch
                     );
-                } catch (NumberFormatException ignored) {
+                } catch (NumberFormatException e) {
                 }
             }
 
@@ -139,11 +139,16 @@ public class LocationFlag extends Flag<Location> {
     }
 
     private double toNumber(Object o) {
-        if (o instanceof Number) {
-            return ((Number) o).doubleValue();
+        if (o instanceof Integer) {
+            return (Integer) o;
+        } else if (o instanceof Long) {
+            return (Long) o;
+        } else if (o instanceof Float) {
+            return (Float) o;
+        } else if (o instanceof Double) {
+            return (Double) o;
         } else {
             return 0;
         }
-
     }
 }

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

@@ -39,7 +39,7 @@ public class StringFlag extends Flag<String> {
     @Override
     public String parseInput(WorldGuardPlugin plugin, CommandSender sender,
             String input) throws InvalidFlagFormat {
-        return input.replaceAll("(?!\\\\)\\\\n", "\n").replaceAll("\\\\\\\\n", "\\n");
+        return input;
     }
 
     @Override

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

@@ -61,7 +61,7 @@ public class VectorFlag extends Flag<Vector> {
                             Double.parseDouble(split[1]),
                             Double.parseDouble(split[2])
                     );
-                } catch (NumberFormatException ignored) {
+                } catch (NumberFormatException e) {
                 }
             }
 

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

@@ -18,6 +18,13 @@
  */
 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;
@@ -25,8 +32,6 @@ 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
@@ -73,7 +78,9 @@ public class FlatRegionManager extends RegionManager {
 
         if (region != null) {
             List<String> removeRegions = new ArrayList<String>();
-            for (ProtectedRegion curRegion : regions.values()) {
+            Iterator<ProtectedRegion> iter = regions.values().iterator();
+            while (iter.hasNext()) {
+                ProtectedRegion curRegion = iter.next();
                 if (curRegion.getParent() == region) {
                     removeRegions.add(curRegion.getId().toLowerCase());
                 }

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

@@ -18,18 +18,22 @@
  */
 package com.sk89q.worldguard.protection.managers;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.khelekore.prtree.MBRConverter;
+import org.khelekore.prtree.PRTree;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
 import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegionMBRConverter;
-import org.khelekore.prtree.MBR;
-import org.khelekore.prtree.MBRConverter;
-import org.khelekore.prtree.PRTree;
-import org.khelekore.prtree.SimpleMBR;
-
-import java.util.*;
 
 public class PRTreeRegionManager extends RegionManager {
 
@@ -51,11 +55,13 @@ public class PRTreeRegionManager extends RegionManager {
      * Construct the manager.
      *
      * @param regionLoader The region loader to use
+     * @throws ProtectionDatabaseException when an error occurs while loading
      */
-    public PRTreeRegionManager(ProtectionDatabase regionLoader) {
+    public PRTreeRegionManager(ProtectionDatabase regionLoader) throws ProtectionDatabaseException {
         super(regionLoader);
         regions = new TreeMap<String, ProtectedRegion>();
         tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        this.load();
     }
 
     @Override
@@ -101,32 +107,21 @@ public class PRTreeRegionManager extends RegionManager {
             }
         }
 
-        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+    tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
         tree.load(regions.values());
     }
 
     @Override
     public ApplicableRegionSet getApplicableRegions(Vector pt) {
+        List<ProtectedRegion> appRegions =
+                new ArrayList<ProtectedRegion>();
 
-        // Floor the vector to ensure we get accurate points
-        pt = pt.floor();
+        int x = pt.getBlockX();
+        int z = pt.getBlockZ();
 
-        List<ProtectedRegion> appRegions = new ArrayList<ProtectedRegion>();
-        MBR pointMBR = new SimpleMBR(pt.getX(), pt.getX(), pt.getY(), pt.getY(), pt.getZ(), pt.getZ());
-
-        for (ProtectedRegion region : tree.find(pointMBR)) {
-            if (region.contains(pt) && !appRegions.contains(region)) {
+        for (ProtectedRegion region : tree.find(x, z, x, z)) {
+            if (region.contains(pt)) {
                 appRegions.add(region);
-
-                ProtectedRegion parent = region.getParent();
-
-                while (parent != null) {
-                    if (!appRegions.contains(parent)) {
-                        appRegions.add(parent);
-                    }
-
-                    parent = parent.getParent();
-                }
             }
         }
 
@@ -152,26 +147,14 @@ public class PRTreeRegionManager extends RegionManager {
 
     @Override
     public List<String> getApplicableRegionsIDs(Vector pt) {
-
-        // Floor the vector to ensure we get accurate points
-        pt = pt.floor();
-
         List<String> applicable = new ArrayList<String>();
-        MBR pointMBR = new SimpleMBR(pt.getX(), pt.getX(), pt.getY(), pt.getY(), pt.getZ(), pt.getZ());
 
-        for (ProtectedRegion region : tree.find(pointMBR)) {
-            if (region.contains(pt) && !applicable.contains(region.getId())) {
+        int x = pt.getBlockX();
+        int z = pt.getBlockZ();
+
+        for (ProtectedRegion region : tree.find(x, z, x, z)) {
+            if (region.contains(pt)) {
                 applicable.add(region.getId());
-
-                ProtectedRegion parent = region.getParent();
-
-                while (parent != null) {
-                    if (!applicable.contains(parent.getId())) {
-                        applicable.add(parent.getId());
-                    }
-
-                    parent = parent.getParent();
-                }
             }
         }
 
@@ -217,4 +200,4 @@ public class PRTreeRegionManager extends RegionManager {
 
         return count;
     }
-}
+}

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

@@ -76,7 +76,6 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
         setMinMaxPoints(min, pt);
     }
 
-    @Override
     public List<BlockVector2D> getPoints() {
         List<BlockVector2D> pts = new ArrayList<BlockVector2D>();
         int x1 = min.getBlockX();
@@ -86,8 +85,8 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
 
         pts.add(new BlockVector2D(x1, z1));
         pts.add(new BlockVector2D(x2, z1));
-        pts.add(new BlockVector2D(x2, z2));
         pts.add(new BlockVector2D(x1, z2));
+        pts.add(new BlockVector2D(x2, z2));
 
         return pts;
     }
@@ -129,14 +128,30 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
     */
 
     @Override
-    public boolean intersectsRegion(ProtectedRegion region) {
-        if (region instanceof ProtectedPolygonalRegion) {
-            return intersectsRegionHelper(region);
-        } else if (region instanceof ProtectedCuboidRegion) {
-            return intersectsBoundingBox(region);
-        } else {
-            throw new UnsupportedOperationException("Not supported yet.");
+    public List<ProtectedRegion> getIntersectingRegions(List<ProtectedRegion> regions) throws UnsupportedIntersectionException {
+        List<ProtectedRegion> intersectingRegions = new ArrayList<ProtectedRegion>();
+
+        for (ProtectedRegion region : regions) {
+            if (!intersectsBoundingBox(region)) continue;
+
+            // If both regions are Cuboids and their bounding boxes intersect, they intersect
+            if (region instanceof ProtectedCuboidRegion) {
+                intersectingRegions.add(region);
+                continue;
+            } else if (region instanceof ProtectedPolygonalRegion) {
+                // If either region contains the points of the other,
+                // or if any edges intersect, the regions intersect
+                if (containsAny(region.getPoints())
+                        || region.containsAny(getPoints())
+                        || intersectsEdges(region)) {
+                    intersectingRegions.add(region);
+                    continue;
+                }
+            } else {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
         }
+        return intersectingRegions;
     }
 
     @Override

src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java

@@ -23,6 +23,7 @@ import java.util.List;
 
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
 
 public class ProtectedPolygonalRegion extends ProtectedRegion {
 
@@ -121,6 +122,30 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
         return inside;
     }
 
+    @Override
+    public List<ProtectedRegion> getIntersectingRegions(List<ProtectedRegion> regions) throws UnsupportedIntersectionException {
+        List<ProtectedRegion> intersectingRegions = new ArrayList<ProtectedRegion>();
+
+        for (ProtectedRegion region : regions) {
+            if (!intersectsBoundingBox(region)) continue;
+
+            if (region instanceof ProtectedPolygonalRegion || region instanceof ProtectedCuboidRegion) {
+                // If either region contains the points of the other,
+                // or if any edges intersect, the regions intersect
+                if (containsAny(region.getPoints())
+                        || region.containsAny(getPoints())
+                        || intersectsEdges(region)) {
+                    intersectingRegions.add(region);
+                    continue;
+                }
+            } else {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+        }
+        return intersectingRegions;
+    }
+
+
     /**
      * Return the type of region as a user-friendly name.
      *
@@ -133,30 +158,41 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
 
     @Override
     public int volume() {
-        int yLength = max.getBlockY() - min.getBlockY() + 1;
-
-        int numPoints = points.size();
+        int volume = 0;
+        // TODO: Fix this
+        /*int numPoints = points.size();
         if (numPoints < 3) {
-            int xLength = max.getBlockX() - min.getBlockX() + 1;
-            int zLength = max.getBlockZ() - min.getBlockZ() + 1;
-
-            return xLength * yLength * zLength;
+            return 0;
         }
 
-        int area = 0;
-        BlockVector2D p1, p2;
-        int s = numPoints - 1;
+        double area = 0;
+        int xa, z1, z2;
 
         for (int i = 0; i < numPoints; i++) {
+            xa = points.get(i).getBlockX();
+            //za = points.get(i).getBlockZ();
 
-            // Update/define p1 & p2
-            p1 = points.get(i);
-            p2 = points.get(s);
+            if (points.get(i + 1) == null) {
+                z1 = points.get(0).getBlockZ();
+            } else {
+                z1 = points.get(i + 1).getBlockZ();
+            }
+            if (points.get(i - 1) == null) {
+                z2 = points.get(numPoints - 1).getBlockZ();
+            } else {
+                z2 = points.get(i - 1).getBlockZ();
+            }
 
-            // Do the math, then reassign s
-            area += (p2.getBlockX() + p1.getBlockX() + 1) * (p2.getBlockZ() - p1.getBlockZ());
-            s = i;
+            area = area + (xa * (z1 - z2));
         }
-        return (int) Math.abs(Math.ceil(area / 2D) * yLength);
+
+        xa = points.get(0).getBlockX();
+        //za = points.get(0).getBlockZ();
+
+        area = area + (xa * (points.get(1).getBlockZ() - points.get(numPoints - 1).getBlockZ()));
+
+        volume = (Math.abs(maxY - minY) + 1) * (int) Math.ceil((Math.abs(area) / 2));*/
+
+        return volume;
     }
 }

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

@@ -19,6 +19,12 @@
 
 package com.sk89q.worldguard.protection.regions;
 
+import java.awt.geom.Line2D;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
@@ -27,13 +33,6 @@ import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
 import com.sk89q.worldguard.protection.flags.Flag;
 
-import java.awt.geom.Line2D;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
 /**
  * Represents a region of any shape and size that can be protected.
  *
@@ -488,24 +487,6 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
         return id.compareTo(other.id);
     }
 
-    protected boolean intersectsRegionHelper(ProtectedRegion region) {
-        if (!intersectsBoundingBox(region)) {
-            return false;
-        }
-
-        // If either region contains the points of the other,
-        // or if any edges intersect, the regions intersect
-        return containsAny(region.getPoints()) || region.containsAny(getPoints()) || intersectsEdges(region);
-    }
-
-    public boolean intersectsRegion(ProtectedRegion region) {
-        if (!(region instanceof ProtectedPolygonalRegion) && (!(region instanceof ProtectedCuboidRegion))) {
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-
-        return intersectsRegionHelper(region);
-    }
-
     /**
      * Return the type of region as a user-friendly, lowercase name.
      *
@@ -520,16 +501,9 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
      * @return The elements of {@code regions} that intersect with this region
      * @throws UnsupportedIntersectionException if an invalid intersection is detected
      */
-    public List<ProtectedRegion> getIntersectingRegions(List<ProtectedRegion> regions) throws UnsupportedIntersectionException {
-        List<ProtectedRegion> intersectingRegions = new ArrayList<ProtectedRegion>();
-
-        for (ProtectedRegion region : regions) {
-            if (intersectsRegion(region)) {
-                intersectingRegions.add(region);
-            }
-        }
-        return intersectingRegions;
-    }
+    public abstract List<ProtectedRegion> getIntersectingRegions(
+            List<ProtectedRegion> regions)
+            throws UnsupportedIntersectionException;
 
     /**
      * Checks if the bounding box of a region intersects with with the bounding
@@ -567,25 +541,25 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
         List<BlockVector2D> pts2 = region.getPoints();
         BlockVector2D lastPt1 = pts1.get(pts1.size() - 1);
         BlockVector2D lastPt2 = pts2.get(pts2.size() - 1);
-        for (BlockVector2D aPts1 : pts1) {
-            for (BlockVector2D aPts2 : pts2) {
+        for (int i = 0; i < pts1.size(); i++ ) {
+            for (int j = 0; j < pts2.size(); j++) {
 
                 Line2D line1 = new Line2D.Double(
                         lastPt1.getBlockX(),
                         lastPt1.getBlockZ(),
-                        aPts1.getBlockX(),
-                        aPts1.getBlockZ());
+                        pts1.get(i).getBlockX(),
+                        pts1.get(i).getBlockZ());
 
                 if (line1.intersectsLine(
-                        lastPt2.getBlockX(),
-                        lastPt2.getBlockZ(),
-                        aPts2.getBlockX(),
-                        aPts2.getBlockZ())) {
+                                lastPt2.getBlockX(),
+                                lastPt2.getBlockZ(),
+                                pts2.get(j).getBlockX(),
+                                pts2.get(j).getBlockZ())) {
                     return true;
                 }
-                lastPt2 = aPts2;
+                lastPt2 = pts2.get(j);
             }
-            lastPt1 = aPts1;
+            lastPt1 = pts1.get(i);
         }
         return false;
     }

src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java

@@ -22,35 +22,19 @@ package com.sk89q.worldguard.protection.regions;
 import org.khelekore.prtree.MBRConverter;
 
 public class ProtectedRegionMBRConverter implements MBRConverter<ProtectedRegion> {
-
-    @Override
-    public int getDimensions() {
-        return 3;
+    public double getMinX(ProtectedRegion t) {
+        return t.getMinimumPoint().getBlockX();
     }
 
-    @Override
-    public double getMax(int dimension, ProtectedRegion region) {
-        switch (dimension) {
-            case 0:
-                return region.getMaximumPoint().getBlockX();
-            case 1:
-                return region.getMaximumPoint().getBlockY();
-            case 2:
-                return region.getMaximumPoint().getBlockZ();
-        }
-        return 0;
+    public double getMinY(ProtectedRegion t) {
+        return t.getMinimumPoint().getBlockZ();
     }
 
-    @Override
-    public double getMin(int dimension, ProtectedRegion region) {
-        switch (dimension) {
-            case 0:
-                return region.getMinimumPoint().getBlockX();
-            case 1:
-                return region.getMinimumPoint().getBlockY();
-            case 2:
-                return region.getMinimumPoint().getBlockZ();
-        }
-        return 0;
+    public double getMaxX(ProtectedRegion t) {
+        return t.getMaximumPoint().getBlockX();
+    }
+
+    public double getMaxY(ProtectedRegion t) {
+        return t.getMaximumPoint().getBlockZ();
     }
 }

src/main/java/com/sk89q/worldguard/util/FatalConfigurationLoadingException.java

@@ -1,6 +0,0 @@
-package com.sk89q.worldguard.util;
-
-public class FatalConfigurationLoadingException extends RuntimeException {
-	private static final long serialVersionUID = 1L;
-
-}

src/main/java/com/sk89q/worldguard/util/PastebinPoster.java

@@ -84,7 +84,7 @@ public class PastebinPoster {
                     in = conn.getInputStream();
                     BufferedReader reader = new BufferedReader(new InputStreamReader(in));
                     String line;
-                    StringBuilder response = new StringBuilder();
+                    StringBuffer response = new StringBuffer(); 
                     while ((line = reader.readLine()) != null) {
                         response.append(line);
                         response.append("\r\n");
@@ -114,13 +114,13 @@ public class PastebinPoster {
                 if (in != null) {
                     try {
                         in.close();
-                    } catch (IOException ignored) {
+                    } catch (IOException e) {
                     }
                 }
                 if (out != null) {
                     try {
                         out.close();
-                    } catch (IOException ignored) {
+                    } catch (IOException e) {
                     }
                 }
             }

src/main/java/org/enginehub/util/PermissionModel.java

@@ -1,23 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the WorldGuard team and contributors
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package org.enginehub.util;
-
-public interface PermissionModel {
-
-}

src/test/java/com/sk89q/worldguard/TestPlayer.java

@@ -19,12 +19,11 @@
 
 package com.sk89q.worldguard;
 
-import java.util.HashSet;
 import java.util.Set;
-
+import java.util.HashSet;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
 
-@org.junit.Ignore
 public class TestPlayer extends LocalPlayer {
     private String name;
     private Set<String> groups = new HashSet<String>();
@@ -49,27 +48,32 @@ public class TestPlayer extends LocalPlayer {
 
     @Override
     public Vector getPosition() {
-        return new Vector(0, 0, 0);
+        // TODO Auto-generated method stub
+        return null;
     }
 
     @Override
     public void kick(String msg) {
-        System.out.println("TestPlayer{" + this.name + "} kicked!");
+        // TODO Auto-generated method stub
+        
     }
 
     @Override
     public void ban(String msg) {
-        System.out.println("TestPlayer{" + this.name + "} banned!");
+        // TODO Auto-generated method stub
+        
     }
 
     @Override
     public void printRaw(String msg) {
-        System.out.println("-> TestPlayer{" + this.name + "}: " + msg);
+        // TODO Auto-generated method stub
+        
     }
 
     @Override
     public String[] getGroups() {
-        return groups.toArray(new String[groups.size()]);
+        // TODO Auto-generated method stub
+        return null;
     }
 
     @Override

src/test/java/com/sk89q/worldguard/protection/FlatRegionManagerTest.java

@@ -1,29 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.protection.managers.FlatRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class FlatRegionManagerTest extends RegionOverlapTest {
-    protected RegionManager createRegionManager() throws Exception {
-        return new FlatRegionManager(null);
-    }
-}

src/test/java/com/sk89q/worldguard/protection/FlatRegionOverlapTest.java

@@ -1,29 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.protection.managers.FlatRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class FlatRegionOverlapTest extends RegionOverlapTest {
-    protected RegionManager createRegionManager() throws Exception {
-        return new FlatRegionManager(null);
-    }
-}

src/test/java/com/sk89q/worldguard/protection/FlatRegionPriorityTest.java

@@ -1,29 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.protection.managers.FlatRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class FlatRegionPriorityTest extends RegionPriorityTest {
-    protected RegionManager createRegionManager() throws Exception {
-        return new FlatRegionManager(null);
-    }
-}

src/test/java/com/sk89q/worldguard/protection/PRTreeRegionEntryExitTest.java

@@ -1,30 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class PRTreeRegionEntryExitTest extends RegionEntryExitTest {
-    @Override
-    protected RegionManager createRegionManager() throws Exception {
-        return new PRTreeRegionManager(null);
-    }
-}

src/test/java/com/sk89q/worldguard/protection/PRTreeRegionManagerTest.java

@@ -1,29 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class PRTreeRegionManagerTest extends RegionOverlapTest {
-    protected RegionManager createRegionManager() throws Exception {
-        return new PRTreeRegionManager(null);
-    }
-}

src/test/java/com/sk89q/worldguard/protection/PRTreeRegionOverlapTest.java

@@ -1,29 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class PRTreeRegionOverlapTest extends RegionOverlapTest {
-    protected RegionManager createRegionManager() throws Exception {
-        return new PRTreeRegionManager(null);
-    }
-}

src/test/java/com/sk89q/worldguard/protection/PRTreeRegionPriorityTest.java

@@ -1,29 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class PRTreeRegionPriorityTest extends RegionPriorityTest {
-    protected RegionManager createRegionManager() throws Exception {
-        return new PRTreeRegionManager(null);
-    }
-}

src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java

@@ -1,146 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2013 sk89q <http://www.sk89q.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.TestPlayer;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
-public abstract class RegionEntryExitTest {
-    static String ENTRY_ID = "entry_rg";
-    static String EXIT_ID = "exit_rg";
-    static String BUILDER_GROUP = "builder";
-    static String VIP_GROUP = "vip";
-
-    Vector inEntry = new Vector(5, 64, 5);
-    Vector inExit = new Vector(-5, 65, -5);
-
-    RegionManager manager;
-    ProtectedRegion globalRegion;
-    ProtectedRegion entryRegion;
-    ProtectedRegion exitRegion;
-    TestPlayer vip_player;
-    TestPlayer builder_player;
-
-    protected abstract RegionManager createRegionManager() throws Exception;
-
-    @Before
-    public void setUp() throws Exception {
-        setUpGlobalRegion();
-
-        manager = createRegionManager();
-
-        setUpPlayers();
-        setUpEntryRegion();
-        setUpExitRegion();
-    }
-
-    void setUpPlayers() {
-        vip_player = new TestPlayer("dudu");
-        vip_player.addGroup(VIP_GROUP);
-
-        builder_player = new TestPlayer("esskay");
-        builder_player.addGroup(BUILDER_GROUP);
-
-        // @Test
-        // assertFalse(builderPlayer.wuvs(vip_player)); // causes test to fail
-    }
-
-    void setUpGlobalRegion() {
-        globalRegion = new GlobalProtectedRegion("__global__");
-    }
-
-    void setUpEntryRegion() {
-        DefaultDomain domain = new DefaultDomain();
-        domain.addGroup(VIP_GROUP);
-
-        ProtectedRegion region = new ProtectedCuboidRegion(ENTRY_ID, new BlockVector(1, 0, 1), new BlockVector(10, 255, 10));
-
-        region.setMembers(domain);
-        manager.addRegion(region);
-
-        entryRegion = region;
-        // this is the way it's supposed to work
-        // whatever the group flag is set to is the group that the flag APPLIES to
-        // in this case, non members (esskay) should be DENIED entry
-        entryRegion.setFlag(DefaultFlag.ENTRY, StateFlag.State.DENY);
-        entryRegion.setFlag(DefaultFlag.ENTRY.getRegionGroupFlag(), RegionGroup.NON_MEMBERS);
-    }
-
-    void setUpExitRegion() throws Exception {
-        DefaultDomain domain = new DefaultDomain();
-        domain.addGroup(BUILDER_GROUP);
-
-        ProtectedRegion region = new ProtectedCuboidRegion(EXIT_ID, new BlockVector(-1, 0, -1), new BlockVector(-10, 255, -10));
-
-        region.setOwners(domain);
-        manager.addRegion(region);
-
-        entryRegion = region;
-        // same as above
-        entryRegion.setFlag(DefaultFlag.EXIT, StateFlag.State.DENY);
-        entryRegion.setFlag(DefaultFlag.EXIT.getRegionGroupFlag(), RegionGroup.NON_OWNERS);
-    }
-
-    @Test
-    public void testEntry() throws Exception {
-        ApplicableRegionSet appl;
-
-        appl = manager.getApplicableRegions(inEntry);
-//        ProtectedRegion rg = appl.iterator().next();
-//        System.out.println("rg   " + rg.getId());
-//        System.out.println("mem  " + rg.getMembers().toGroupsString());
-//        System.out.println("flag " + appl.getFlag(DefaultFlag.ENTRY));
-//        System.out.println("grp  " + appl.getFlag(DefaultFlag.ENTRY.getRegionGroupFlag()));
-//        System.out.println("===");
-        assertTrue("Allowed Entry", appl.allows(DefaultFlag.ENTRY, vip_player));
-        assertFalse("Forbidden Entry", appl.allows(DefaultFlag.ENTRY, builder_player));
-    }
-
-    @Test
-    public void testExit() throws Exception {
-        ApplicableRegionSet appl;
-
-        appl = manager.getApplicableRegions(inExit);
-//        ProtectedRegion rg = appl.iterator().next();
-//        System.out.println("rg   " + rg.getId());
-//        System.out.println("own  " + rg.getOwners().toGroupsString());
-//        System.out.println("flag " + appl.getFlag(DefaultFlag.EXIT));
-//        System.out.println("grp  " + appl.getFlag(DefaultFlag.EXIT.getRegionGroupFlag()));
-//        System.out.println("===");
-        assertTrue("Allowed Exit", appl.allows(DefaultFlag.EXIT, builder_player));
-        assertFalse("Forbidden Exit", appl.allows(DefaultFlag.EXIT, vip_player));
-    }
-
-}

src/test/java/com/sk89q/worldguard/protection/RegionIntersectTest.java

@@ -1,12 +1,14 @@
-package com.sk89q.worldguard.protection.regions;
+package com.sk89q.worldguard.protection;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class RegionIntersectTest {
@@ -77,27 +79,4 @@ public class RegionIntersectTest {
 
         assertEquals("Check for '" + region2.getId() + "' region failed.", expected, actual);
     }
-
-    private static final BlockVector2D[] polygon = {
-            new BlockVector2D(1, 0),
-            new BlockVector2D(4, 3),
-            new BlockVector2D(4, -3),
-    };
-
-    @Test
-    public void testIntersection() throws Exception {
-        final ProtectedCuboidRegion cuboidRegion = new ProtectedCuboidRegion("cuboidRegion", new BlockVector(-3, -3, -3), new BlockVector(3, 3, 3));
-        for (int angle = 0; angle < 360; angle += 90) {
-            final BlockVector2D[] rotatedPolygon = new BlockVector2D[polygon.length];
-            for (int i = 0; i < polygon.length; i++) {
-                final BlockVector2D vertex = polygon[i];
-                rotatedPolygon[i] = vertex.transform2D(angle, 0, 0, 0, 0).toBlockVector2D();
-            }
-
-            final ProtectedPolygonalRegion polygonalRegion = new ProtectedPolygonalRegion("polygonalRegion", Arrays.asList(rotatedPolygon), -3, 3);
-
-            assertTrue(String.format("%s does not intersect (cuboid.intersectsEdges(polygonal)", Arrays.asList(rotatedPolygon)), cuboidRegion.intersectsEdges(polygonalRegion));
-            assertTrue(String.format("%s does not intersect (polygonal.intersectsEdges(cuboid)", Arrays.asList(rotatedPolygon)), polygonalRegion.intersectsEdges(cuboidRegion));
-        }
-    }
 }

src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java

@@ -19,15 +19,6 @@
 
 package com.sk89q.worldguard.protection;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
@@ -35,13 +26,21 @@ import com.sk89q.worldguard.TestPlayer;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.FlatRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import org.junit.Before;
+import org.junit.Test;
+import java.util.ArrayList;
+import java.util.HashSet;
 
-public abstract class RegionOverlapTest {
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class RegionOverlapTest {
     static String COURTYARD_ID = "courtyard";
     static String FOUNTAIN_ID = "fountain";
     static String NO_FIRE_ID = "nofire";
@@ -58,14 +57,12 @@ public abstract class RegionOverlapTest {
     ProtectedRegion fountain;
     TestPlayer player1;
     TestPlayer player2;
-    
-    protected abstract RegionManager createRegionManager() throws Exception;
 
     @Before
     public void setUp() throws Exception {
         setUpGlobalRegion();
-        
-        manager = createRegionManager();
+
+        manager = new FlatRegionManager(null);
 
         setUpPlayers();
         setUpCourtyardRegion();
@@ -167,6 +164,7 @@ public abstract class RegionOverlapTest {
         HashSet<ProtectedRegion> test = new HashSet<ProtectedRegion>();
         test.add(courtyard);
         test.add(fountain);
+        System.out.println(test);
 
         // Outside
         appl = manager.getApplicableRegions(outside);

src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java

@@ -28,12 +28,13 @@ import com.sk89q.worldguard.TestPlayer;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.FlatRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.*;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public abstract class RegionPriorityTest {
+public class RegionPriorityTest {
     static String COURTYARD_ID = "courtyard";
     static String FOUNTAIN_ID = "fountain";
     static String NO_FIRE_ID = "nofire";
@@ -49,14 +50,12 @@ public abstract class RegionPriorityTest {
     ProtectedRegion fountain;
     TestPlayer player1;
     TestPlayer player2;
-    
-    protected abstract RegionManager createRegionManager() throws Exception;
 
     @Before
     public void setUp() throws Exception {
         setUpGlobalRegion();
         
-        manager = createRegionManager();
+        manager = new FlatRegionManager(null);
 
         setUpPlayers();
         setUpCourtyardRegion();