[maven-release-plugin] prepare release 5.6

Updated CHANGELOG.txt for 5.6.
Updated README.html to mention the moved spawn-protection setting, added more explanations.
2012-11-03 12:37:52 -07:00 · 2012-11-03 12:15:43 -07:00 · 2012-11-03 12:15:43 -07:00 · 2012-11-03 12:15:43 -07:00 · 2012-11-03 12:15:43 -07:00 · 2012-11-03 00:19:40 -04:00
47 changed files with 1592 additions and 625 deletions
@@ -0,0 +1,7 @@
+language: java
+jdk:
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
+notifications:
+  email: false
@@ -1,3 +1,49 @@
+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.
@@ -9,32 +55,41 @@
    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 potion-splash flag to block splash potions
+- Add entity-painting-destroy which can be used to prevent entities from destroying
+    paintings (skeletons firing arrows)
+- Added send-chat and receive-chat flags
+- Fixed having regions in multiple worlds with the same name not working with MySQL
+- A cancellable event is now fired if WorldGuard disallows PvP. (for developers!)
+- Made /region setparent check worldguard.region.setparent.own/member.<parent> instead
+    of worldguard.region.setparent.own/member.<child>.
+- Allowed passing #<index> in place of a region ID, where <index> is the index as
+    displayed by /region list.
+- Fixed an error that occured when clearing a non-existant region's parent.
+- Added a -s flag to /region teleport, which sends you to the spawn point instead of the
+    teleport point of a region.
+- Added region/role-based permissions to /region teleport.
+- BREAKING CHANGE: Added a LocationFlag class and made the teleport and spawn flags
+    use it.
+- /region info -s now selects the region being queried.
+- Added /region teleport <id>.
+- Vector flags can now be set to the current location with the value "here" and to a
+    specific position with x,y,z.
+- Made /region info show the region you're in if you don't specify an id explicitly.
+- Prevent block ignition from lightning strikes if lightning is blocked in region. Fixes
+    #1175
+- Correctly check both WEPIF and superperms in WorldGurdPlugin.broadcastNotification()
+- Destroy fire blocks when fire-spread is disallowed
+- Added a construct flag that can be used to restrict block placing/destroying in zones
+    to certain roles.
+- Added FallingSand to list of intensive entities to be removed with /halt-activiy.
+- Replaced all usage of CreatureType by EntityType.
+- Updated to support Bukkit 1.2-R0.3 and newer
+- Made auto-god-mode disabled by default again.
+- Added sign protection check disable.
+- Cleaned up javadoc, deprecated duplicate methods, other cleanup
+- Added a RegionGroupFlag to evey region flag Using the /region flag command with -g,
+    the region group that the region flag applies to can be set.

 5.5.1:
 - Fixed attacking with arrows from non-PVP to PVP areas
@@ -0,0 +1,69 @@
+Contributing
+============
+
+Thank you for your interest in contributing to WorldGuard! We appreciate your 
+effort, but to make sure that the inclusion of your patch is a smooth process, we
+ask that you make note of the following guidelines.
+
+* **Follow the [Oracle coding conventions](http://www.oracle.com/technetwork/java/codeconv-138413.html).**
+  We can't stress this enough; if your code has notable issues, it may delay
+  the process significantly.
+* **Target Java 6 for source and compilation.** Make sure to mark methods with
+  ` @Override` that override methods of parent classes, or that implement
+  methods of interfaces (Java 6+).
+* **Use only spaces for indentation.** Our indents are 4-spaces long, and tabs
+  are unacceptable.
+* **Wrap code to a 89 column limit.** We do this to make side by side diffs
+  and other such tasks easier. Ignore this guideline if it makes the code
+  too unreadable.
+* **Write complete Javadocs.** Do so only for public methods, and make sure
+  that your `@param` and `@return` fields are not just blank.
+* **Don't tag classes with @author.** Some legacy classes may have this tag,
+  but we are phasing it out.
+* **Make sure the code is efficient.** One way you can achieve this is to spend
+  around ten minutes to think about what the code is doing and whether it
+  seems awfully roundabout. If you had to copy the same large piece of
+  code in several places, that's bad.
+* **Keep commit summaries under 70 characters.** For more details, place two
+  new lines after the summary line and write away!
+* **Test your code.** We're not interested in broken code, for the obvious reasons.
+* **Write unit tests.** While this is strictly optional, we recommend it for
+  complicated algorithms.
+
+
+Checklist
+---------
+
+Ready to submit? Perform the checklist below:
+
+1. Have all tabs been replaced into four spaces? Are indentations 4-space wide?
+2. Have I written proper Javadocs for my public methods? Are the @param and
+   @return fields actually filled out?
+3. Have I `git rebase`d my pull request to the latest commit of the target
+   branch?
+4. Have I combined my commits into a reasonably small number (if not one)
+   commit using `git rebase`?
+5. Have I made my pull request too large? Pull requests should introduce
+   small sets of changes at a time. Major changes should be discussed with
+   the team prior to starting work.
+6. Are my commit messages descriptive?
+
+You should be aware of [`git rebase`](http://learn.github.com/p/rebasing.html).
+It allows you to modify existing commit messages, and combine, break apart, or
+adjust past changes.
+
+Example
+-------
+
+This is **GOOD:**
+
+    if (var.func(param1, param2)) {
+        // do things
+    }
+
+This is **EXTREMELY BAD:**
+
+    if(var.func( param1, param2 ))
+    {
+        // do things
+    }
@@ -1,116 +1,232 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>WorldGuard ${version}</title>
+<title>${project.name} ${version}</title>
+<link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Ropa+Sans" rel="stylesheet" type="text/css">
 <style>
 body {
-  margin: 0;
-  padding: 20px;
-  background: #efefef;
-  color: #333;
+    margin: 0;
+    padding: 3em 1em;
+    background: #efefef;
+    color: #333;
+    line-height: 1.5;
 }
 #wrapper {
-  margin: 20px auto 20px auto;
-  width: 600px;
-  background: #fff;
-  padding: 40px;
-  border: 1px solid #fff;
-  border-radius: 10px;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 10px;
-  box-shadow: 0 0 2px #999;
-  -webkit-box-shadow: 0 0 3px #999;
-}
-a img {
-  border: 0;
+    width: 600px;
+    margin: auto;
 }
 body, th, td, input {
-  font: 13px/17px "Lucida Grande", "Lucida Sans Unicode", Arial, Verdana, sans-serif;
+    font: 14px 'Source Sans Pro', Arial, sans-serifsans-serif;
+}
+.section {
+	background: #fff;
+	position: relative;
+	padding: 2em 2.4em;
+	margin: 3em auto 4em auto;
+    width: 80%;
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+}
+.section:before, .section:after {
+	content: "";
+	position: absolute;
+	z-index: -2;
+}
+.section {
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+.section:before, .section:after {
+	bottom: 15px;
+	left: 10px;
+	width: 50%;
+	height: 20%;
+	max-width: 300px;
+	max-height: 100px;
+    -webkit-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    -webkit-transform: rotate(-1deg);
+    -moz-transform: rotate(-1deg);
+    -ms-transform: rotate(-1deg);
+    -o-transform: rotate(-1deg);
+    transform: rotate(-1deg);
+}
+.section:after {
+    right: 10px;
+    left: auto;
+    -webkit-transform: rotate(1deg);
+    -moz-transform: rotate(1deg);
+    -ms-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
+    transform: rotate(1deg);
 }
 a:link, a:visited {
-  color: #00688f;
-  text-decoration: underline;
+    color: #0004b2;   
+    text-decoration: none;
 }
-a:hover, a:active {
-  color: #000;
-  border: 0;
+a:hover {
+    color: #ac0000;
+    text-decoration: none;
+    border-bottom: 1px solid #999;
 }
 h1 {
-  font: 170% "Trebuchet MS", Georgia, serif;
-  font-weight: bold;
-  color: #b90000;
-  margin: 15px 0 5px 0;
+    font: 2.7em 'Ropa Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif;
+    color: #000;
+    margin: 0 0;
+    padding: 0 0 0.2em 0;
+    font-weight: normal;
+    text-align: center;
+    text-shadow: 2px 2px #FFF;
 }
 h2 {
-  font: 130% "Trebuchet MS", Georgia, serif;
-  font-weight: bold;
-  color: #6a45ac;
-  margin: 50px 0 5px 0;
-  padding: 0 0 3px 0;
-  border-bottom: 1px solid #ccc;
+    font-size: 1.3em;
+    color: #FFF;
+    margin: -2.5em 0 0.8em 0;
+    float: left;
+    background: #0049FF;
+    padding: 0.4em 0.8em;
+    border-radius: 0.2em;
+    font-weight: normal;
+    text-align: center; 
 }
-.warning {
-  background: #fffedf;
-  padding: 8px;
-  border: 1px dashed #ccc;
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  font-size: 90%;
+h3 {
+    text-transform: uppercase;
+    font-weight: bold;
 }
-.subtle {
-  color: #999;
+h2 + * {
+    clear: both;
 }
-.optional {
-  background: none repeat scroll 0 0 #FFE081;
-  border-radius: 3px 3px 3px 3px;
-  font-size: 80%;
-	font-weight: normal;
-  padding: 1px 4px;
+@media (max-width: 650px) {
+    #wrapper {
+        width: 100%;
+    }
 }
 </style>
 </head>
 <body>

 <div id="wrapper">
-
-<h1>WorldGuard ${version}</h1>
-<p>Thanks for choosing WorldGuard!</p>
-<h2>Getting Started</h2>
-
-<p>Now, to begin, you want to:</p>
-<ol>
-  <li><strong>Install the plugin:</strong> Copy WorldGuard.jar into your Bukkit server's &quot;plugins&quot; directory.</li>
-  <li><strong>Change the configuration:</strong> Run your server once (with WorldGuard) to generate the default configuration files. There are <em>two</em> types of configuration files:
-    <ul>
-      <li>The main config.yml file  inside &quot;plugins/WorldGuard&quot; is the main configuration. </li>
-      <li>Each world has a configuration file in &quot;plugins/WorldGuard/worlds&quot; that you can use to override any setting in the main configuration file for that specific world.</li>
-    </ul>
-  </li>
-  Use <em>/wg reload</em> in the console to reload the configuration.
-  <li><strong>Learn how to use WorldGuard:</strong> Check <a href="http://wiki.sk89q.com/wiki/WorldGuard">out the wiki</a> to learn how to disable things like fire and to protect regions.</li>
-</ol>
-<p class="warning"><strong>Note:</strong> <a href="http://www.sk89q.com/projects/worldedit/">WorldEdit</a> must be installed, but if you do not want it,  put WorldEdit.jar into your Bukkit root folder (outside of plugins/). Note that region protection  requires WorldEdit in plugins/.</p>
-<p>Be sure to:</p>
-<ul>
-  <li>Subscribe to <a href="http://minecraftnews.sk89q.com/">SK's Minecraft blog</a> for news about WorldGuard</li>
-  <li>Idle with us in IRC at <a href="http://skq.me/irc/irc.esper.net/worldguard">irc.esper.net in #worldguard</a></li>
-</ul>
-<h2>Getting Help</h2>
-<p>If you need help, the best two ways to ask are:</p>
-<ul>
-  <li><a href="http://forum.sk89q.com/">Visit the WorldGuard forum</a></li>
-  <li>Ask in IRC chat on <a href="http://skq.me/irc/irc.esper.net/worldguard">irc.esper.net in #worldguard</a> (idle with us!)</li>
-  <li>Submit bug reports and suggestions to the <a href="http://redmine.sk89q.com/projects/worldguard/issues">issue tracker</a></li>
-</ul>
-<h2>Contributing</h2>
-<p>WorldGuard is entirely open source! You can download all of the plugin code to learn from it, modify it for your own self, or even contribute back!</p>
-<ul>
-  <li><a href="https://github.com/sk89q/worldguard">Download WorldGuard code from GitHub</a></li>
-  <li>You can also <a href="http://www.sk89q.com/donate/">donate</a></li>
-  </ul>
-<p>The code is covered under the GNU General Public License v3.</p>
-<p class="subtle">Maven information: ${groupId}/${artifactId}/${version}</p>
+    <h1>${project.name} ${version}</h1>
+    <div class="section">
+        <h2>Getting Started</h2>
+        <p>
+            Thanks for choosing ${project.name}! When you first install ${project.name},
+            nothing will be enabled, so you will need to switch on the features
+            that you need to use, whenever it is convenient for you.
+        </p>
+        <ul>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Installation">How do I install ${project.name}?</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Upgrading">How do I update ${project.name}?</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}#Usage">How do I use ${project.name}?</a></li>
+        </ul>
+        <p>
+            Need help?
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
+        </p>
+    </div>
+    <div class="section">
+        <h2>Common Issues</h2>
+        
+        <h3>What are the other files that come with the download?</h3>
+        <p>
+            Inside the folder "contrib" of the download are the following files:
+        </p>
+        <ul>
+            <li>blacklist_table.sql is for using a database with the 
+              <a href="http://wiki.sk89q.com/wiki/${project.name}/Blacklist">blacklist feature</a>.</li>
+            <li>region_storage.sql is for using a database with the
+                <a href="http://wiki.sk89q.com/wiki/${project.name}/Regions">region protection feature</a>.</li>
+            <li>region_storage_update_20110325.sql is for updating your region protection
+                database (if you're using it) if your database was made before March 25, 2011.</li>
+        </ul>
+        
+        <h3>${project.name} doesn't seem to work.</h3>
+        <p>
+            Two common mistakes include forgetting to install WorldEdit
+            (${project.name} needs it), or making
+            a syntax error in one of ${project.name}'s configuration files (this is very
+            fatal unfortunately, and can be caused by a single character typed in the wrong place). Try 
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">asking in IRC</a>
+            to see whether anyone can help you.
+        </p>
+        
+        <h3>How do I protect my spawn, or another area?</h3>
+        <p>
+            Read the <a href="http://wiki.sk89q.com/wiki/${project.name}/Regions/Tutorial">area protection tutorial</a>
+            on our wiki. For more detailed information, be sure to read about
+            <a href="http://wiki.sk89q.com/wiki/WorldGuard/Regions">region protection on the wiki</a>. Note
+            that if you can't build in spawn, don't forget that Minecraft comes with its own
+            limited spawn protection that you have to disable (see below).
+        </p>
+        
+        <h3>I or others don't have permission to build.</h3>
+        <p>
+            Unless you copied configuration files from an older installation of 
+            ${project.name}, your problem is either caused by another plugin, or by not
+            disabling the built-in spawn protection of the Minecraft server.
+        </p>
+        
+        <h3>No one can build in a region I made!</h3>
+        <p>
+            Make sure that:
+        </p>
+        <ul>
+            <li>You didn't change the 'build' flag, because protection is on by default
+                when a new region is made. Setting the build flag to 'deny' means that
+                no one can modify the things inside the region.</li>
+            <li>That you added the player as an owner or member of the region. If you are using
+                a group (g:groupName), you may have to give the group the permission of
+                group.groupName for ${project.name} to recognize it.</li>
+            <li>That you disabled spawn protection. The Minecraft server has an automatic
+                spawn protection feature where only 'ops' can build in a definable
+                radius around spawn (by default, it is 16 blocks). If you are on Minecraft
+                1.4 or newer, edit "spawn-protection" in server.properties; otherwise, modify bukkit.yml
+                and change the spawn-radius setting.</li>
+            <li>That it's not another plugin causing you trouble. The error messages of ${project.name} are of
+                a dark red shade. If the color of the "no permission" message is not
+                that color, it is not ${project.name}.</li>
+        </ul>
+        
+        <h3>Everyone can build in a region I made!</h3>
+        <p>
+            Make sure that:
+        </p>
+        <ul>
+            <li>You didn't change the 'build' flag, because protection is on by default
+                when a new region is made. Setting the build flag to 'allow' means that
+                anyone can modify the things inside the region.</li>
+            <li>That it's not caused by another plugin. If players are getting a dark red
+                permission denied message, but they can still build, another plugin
+                is likely causing the conflict.</li>
+        </ul>
+        
+        <h3>Where do I report bugs or suggest ideas?</h3>
+        <p>
+            Make sure you are using the latest version of ${project.name}, try asking in
+            IRC first (see "Need help?" above) if it's a problem, and if you think you've
+            found a bug or have a great suggestion to provide, please
+            report it to <a href="http://youtrack.sk89q.com/issues/WORLDGUARD">our issue tracker</a>.
+        </p>
+        
+        <p>
+            Still need help?
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
+        </p>
+    </div>
+    <div class="section">
+        <h2>Contributing</h2>
+        <p>
+            Did you know that ${project.name} is open source? That means that you can
+            read the code and learn from it, as well as modify it and submit back
+            changes to help the community!
+        </p>
+        <ul>
+            <li><a href="https://github.com/sk89q/worldguard">View the source code</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Development">More information</a></li>
+        </ul>
+    </div>
 </div>
 </body>
 </html>
@@ -1,25 +1,35 @@
-WorldGuard
+![WorldGuard](http://static.sk89q.com/readme/worldguard.png)
 ==========

-WorldGuard protects your Minecraft server. As Minecraft's oldest surviving world protection mod, you know you're in safe hands.
+WorldGuard is a toolbox of various functions, useful for multiplayer servers, that lets you:
+
+* Protect your server from a number of problems.
+* Block fire spread, lava spread, endermen, and more.
+* Flag areas as "no PVP" or "no TNT."
+* Assign ownership to areas so only selected individuals can build.
+* Use a number of useful commands.
+
+WorldGuard is open source and is available under the GNU General Public License v3.

 Compiling
 ---------

-You need to have Maven installed (http://maven.apache.org). Once installed,
-simply run:
+The project is written for Java 6 and our build process makes use of [Maven](http://maven.apache.org). Detailed compilation information [can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#Compiling).

-    mvn clean install
-    
-Maven will automatically download dependencies for you. Note: For that to work,
-be sure to add Maven to your "PATH".
+Dependencies are automatically handled by Maven.

 Contributing
 ------------

-We happily accept contributions. The best way to do this is to fork WorldGuard
-on GitHub, add your changes, and then submit a pull request. We'll look at it,
-make comments, and merge it into WorldGuard if everything works out.
+We happily accept contributions, especially through pull requests on GitHub. Submissions 
+must be licensed under the GNU General Public License v3.

-By submitting code, you agree to place to license your code under the 
-GNU General Public License v3.
+Please read CONTRIBUTING.md for important guidelines to follow.
+
+Links
+-----
+
+* [IRC channel](http://skq.me/irc/irc.esper.net/sk89q/) (#sk89q on irc.esper.net)
+* [Issue tracker](http://youtrack.sk89q.com/issues/WORLDGUARD)
+* [Continuous integration](http://build.sk89q.com) [![Build Status](https://secure.travis-ci.org/sk89q/worldguard.png)](http://travis-ci.org/sk89q/worldguard)
+* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard)
@@ -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 
@@ -1,77 +1,87 @@
-<!--
-  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.5.3</version>
+  <version>5.6</version>
  <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers</description>
-
+  <description>WorldGuard protects your Minecraft servers.</description>
+  <licenses>
+    <license>
+      <name>GNU General Public License 2.0</name>
+      <url>LICENSE.txt</url>
+      <distribution>repo</distribution>
+      <comments>License on all contributions</comments>
+    </license>
+  </licenses>
  <scm>
    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
    <url>https://github.com/sk89q/worldguard</url>
+    <tag>master</tag>
    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
  </scm>
-
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
  <repositories>
-      <!-- Repository for zml's stuff -->
+    <repository>
+      <id>sk89q-repo</id>
+      <url>http://maven.sk89q.com/repo/</url>
+    </repository>
    <repository>
      <id>zml-repo</id>
      <url>http://files.zachsthings.com/repo</url>
    </repository>
-    <!-- Repository for 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.4-SNAPSHOT</version>
+      <version>5.4.4</version>
+      <scope>compile</scope>
    </dependency>
-
-    <!-- Bukkit -->
    <dependency>
      <groupId>org.bukkit</groupId>
      <artifactId>bukkit</artifactId>
-      <version>1.2.5-R4.0</version>
+      <version>1.4.2-R0.2-SNAPSHOT</version>
+      <scope>compile</scope>
    </dependency>
-
-    <!-- CommandBook -->
    <dependency>
      <groupId>com.sk89q</groupId>
      <artifactId>commandbook</artifactId>
-      <version>2.0</version>
+      <version>2.1</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.zachsthings.libcomponents</groupId>
+          <artifactId>libcomponents-bukkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.spout</groupId>
+          <artifactId>spoutapi</artifactId>
+        </exclusion>
+      </exclusions>
    </dependency>
-
-    <!-- Additional libraries -->
    <dependency>
      <groupId>com.nijikokun</groupId>
      <artifactId>iconomy</artifactId>
      <version>5.0</version>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.khelekore</groupId>
      <artifactId>prtree</artifactId>
-      <version>1.4</version>
+      <version>1.5.0</version>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>net.sf.opencsv</groupId>
      <artifactId>opencsv</artifactId>
      <version>2.0</version>
+      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
@@ -80,11 +90,24 @@
      <scope>test</scope>
    </dependency>
  </dependencies>
-
+  <distributionManagement>
+    <site>
+      <id>sk89q-docs-upload</id>
+      <url>ftp://sk89q-maven-deploy/worldguard/</url>
+    </site>
+  </distributionManagement>
  <build>
+    <defaultGoal>install</defaultGoal>
    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-ftp</artifactId>
+         <version>1.0-beta-6</version>
+      </extension>
+    </extensions>

-    <!-- Resources -->
    <resources>
      <resource>
        <targetPath>.</targetPath>
@@ -107,7 +130,6 @@
    </resources>

    <plugins>
-      <!-- Compile plugin -->
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
@@ -117,8 +139,7 @@
          <target>1.6</target>
        </configuration>
      </plugin>
-
-      <!-- JAR creation plugin -->
+      
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
@@ -136,9 +157,7 @@
          </archive>
        </configuration>
      </plugin>
-
-      <!-- Shade -->
-      <!-- We want to bundle in some dependencies -->
+      
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-shade-plugin</artifactId>
@@ -151,17 +170,16 @@
            </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>
@@ -178,8 +196,7 @@
          </execution>
        </executions>
      </plugin>
-
-      <!-- Release -->
+      
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-release-plugin</artifactId>
@@ -190,20 +207,34 @@
          <tagNameFormat>@{project.version}</tagNameFormat>
        </configuration>
      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <!-- Javadocs -->
-      <!-- TODO: Get Doclava working -->
+      
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
+        <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>
-  </reporting>
+  </build>
 </project>
@@ -28,8 +28,9 @@
        <include>LICENSE.txt</include>
        <include>NOTICE.txt</include>
        <include>CHANGELOG.txt</include>
-        <include>blacklist_table.sql</include>
-        <include>region_storage.sql</include>
+        <include>contrib/blacklist_table.sql</include>
+        <include>contrib/region_storage.sql</include>
+        <include>contrib/region_storage_update_20110325.sql</include>
      </includes>
    </fileSet>
  </fileSets>
@@ -82,11 +82,9 @@ public abstract class LocalPlayer {
    
    @Override
    public boolean equals(Object obj) {
-        if (!(obj instanceof LocalPlayer)) {
-            return false;
-        }
-        
-        return ((LocalPlayer)obj).getName().equals(getName());
+
+        return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName());
+
    }
    
    @Override
@@ -19,6 +19,7 @@

 package com.sk89q.worldguard.blacklist;

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

@@ -105,9 +106,7 @@ public class BlacklistEntry {
     */
    public void setIgnorePermissions(String[] ignorePermissions) {
        Set<String> ignorePermissionsSet = new HashSet<String>();
-        for (String perm : ignorePermissions) {
-            ignorePermissionsSet.add(perm);
-        }
+        Collections.addAll(ignorePermissionsSet, ignorePermissions);
        this.ignorePermissions = ignorePermissionsSet;
    }

@@ -19,29 +19,20 @@

 package com.sk89q.worldguard.bukkit;

-import java.util.List;
-
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.blocks.ItemID;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.entity.Tameable;
-import org.bukkit.entity.FallingSand;
-
+import org.bukkit.entity.*;
 import org.bukkit.inventory.ItemStack;

-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockType;
+import java.util.List;

 public class BukkitUtil {

@@ -140,20 +131,16 @@ public class BukkitUtil {
    /**
     * Checks if the given block is water
     *
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     * @return
+     * @param world the world
+     * @param ox x
+     * @param oy y
+     * @param oz z
+     * @return true if it's water
     */
    public static boolean isBlockWater(World world, int ox, int oy, int oz) {
        Block block = world.getBlockAt(ox, oy, oz);
        int id = block.getTypeId();
-        if (id == 8 || id == 9) {
-            return true;
-        } else {
-            return false;
-        }
+        return id == 8 || id == 9;
    }

    /**
@@ -242,7 +229,7 @@ public class BukkitUtil {
     * Returns whether an entity should be removed for the halt activity mode.
     *
     * @param entity
-     * @return
+     * @return true if it's to be removed
     */
    public static boolean isIntensiveEntity(Entity entity) {
        return entity instanceof Item
@@ -253,4 +240,37 @@ public class BukkitUtil {
                    && !(entity instanceof Tameable)
                    && !(entity instanceof Player));
    }
+
+    /**
+     * Returns whether our running CraftBukkit already supports
+     * the HangingEvent instead of the PaintingEvent
+     *
+     * @return true if the hanging event is supported
+     */
+    public static boolean hasHangingEvent() {
+        Class<?> tmp = null;
+        try {
+            tmp = Class.forName("org.bukkit.event.hanging.HangingEvent");
+        } catch (ClassNotFoundException ignored) { }
+        return (tmp != null);
+    }
+
+    /**
+     * Search an enum for a value, and return the first one found. Return null if the
+     * enum entry is not found.
+     *
+     * @param enumType enum class
+     * @param values values to test
+     * @return a value in the enum or null
+     */
+    public static <T extends Enum<T>> T tryEnum(Class<T> enumType, String ... values) {
+        for (String val : values) {
+            try {
+                return Enum.valueOf(enumType, val);
+            } catch (IllegalArgumentException e) {
+            }
+        }
+
+        return null;
+    }
 }
@@ -24,6 +24,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;

 import com.sk89q.commandbook.CommandBook;
 import com.sk89q.commandbook.GodComponent;
@@ -73,7 +75,7 @@ public class ConfigurationManager {
    /**
     * Holds configurations for different worlds.
     */
-    private Map<String, WorldConfiguration> worlds;
+    private ConcurrentMap<String, WorldConfiguration> worlds;

    /**
     * The global configuration for use when loading worlds
@@ -94,6 +96,7 @@ public class ConfigurationManager {
    private boolean hasCommandBookGodMode = false;

    public boolean useRegionsScheduler;
+    public boolean useRegionsCreatureSpawnEvent;
    public boolean activityHaltToggle = false;
    public boolean autoGodMode;
    public boolean usePlayerMove;
@@ -114,7 +117,7 @@ public class ConfigurationManager {
     */
    public ConfigurationManager(WorldGuardPlugin plugin) {
        this.plugin = plugin;
-        this.worlds = new HashMap<String, WorldConfiguration>();
+        this.worlds = new ConcurrentHashMap<String, WorldConfiguration>();
    }

    /**
@@ -137,12 +140,14 @@ 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);
-        
+
        hostKeys = new HashMap<String, String>();
        Object hostKeysRaw = config.getProperty("host-keys");
        if (hostKeysRaw == null || !(hostKeysRaw instanceof Map)) {
@@ -190,10 +195,14 @@ public class ConfigurationManager {
    public WorldConfiguration get(World world) {
        String worldName = world.getName();
        WorldConfiguration config = worlds.get(worldName);
+        WorldConfiguration newConfig = null;

-        if (config == null) {
-            config = new WorldConfiguration(plugin, worldName, this.config);
-            worlds.put(worldName, config);
+        while (config == null) {
+            if (newConfig == null) {
+                newConfig = new WorldConfiguration(plugin, worldName, this.config);
+            }
+            worlds.putIfAbsent(world.getName(), newConfig);
+            config = worlds.get(world.getName());
        }

        return config;
@@ -166,7 +166,7 @@ public class ReportWriter {
    }
    
    private void appendPluginInformation(Plugin[] plugins) {
-        appendHeader("Plugins");
+        appendHeader("Plugins (" + plugins.length + ")");
        
        LogListBlock log = new LogListBlock();
        
@@ -19,22 +19,8 @@

 package com.sk89q.worldguard.bukkit;

-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
 import 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 com.sk89q.worldguard.blacklist.Blacklist;
 import com.sk89q.worldguard.blacklist.BlacklistLogger;
 import com.sk89q.worldguard.blacklist.loggers.ConsoleLoggerHandler;
@@ -42,6 +28,15 @@ import com.sk89q.worldguard.blacklist.loggers.DatabaseLoggerHandler;
 import com.sk89q.worldguard.blacklist.loggers.FileLoggerHandler;
 import com.sk89q.worldguard.chest.ChestProtection;
 import com.sk89q.worldguard.chest.SignChestProtection;
+import org.bukkit.block.Block;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.*;
+import java.util.logging.Level;

 /**
 * Holds the configuration for individual worlds.
@@ -94,10 +89,15 @@ 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 blockFireballExplosions;
    public boolean blockFireballBlockDamage;
    public boolean blockEntityPaintingDestroy;
+    public boolean blockEntityItemFrameDestroy;
    public boolean blockPluginSpawning;
    public boolean disableContactDamage;
    public boolean disableFallDamage;
@@ -113,7 +113,7 @@ public class WorldConfiguration {
    public boolean disableMobDamage;
    public boolean useRegions;
    public boolean highFreqFlags;
-    public int regionWand = 287;
+    public int regionWand;
    public Set<EntityType> blockCreatureSpawn;
    // public boolean useiConomy;
    // public boolean buyOnClaim;
@@ -310,12 +310,17 @@ 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);
        blockFireballExplosions = getBoolean("mobs.block-fireball-explosions", false);
        blockFireballBlockDamage = getBoolean("mobs.block-fireball-block-damage", false);
        antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
        disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
        blockEntityPaintingDestroy = getBoolean("mobs.block-painting-destroy", false);
+        blockEntityItemFrameDestroy = getBoolean("mobs.block-item-frame-destroy", false);
        blockPluginSpawning = getBoolean("mobs.block-plugin-spawning", true);

        disableFallDamage = getBoolean("player-damage.disable-fall-damage", false);
@@ -358,7 +363,7 @@ public class WorldConfiguration {
        useRegions = getBoolean("regions.enable", true);
        regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
        highFreqFlags = getBoolean("regions.high-frequency-flags", false);
-        regionWand = getInt("regions.wand", 287);
+        regionWand = getInt("regions.wand", 334);
        maxClaimVolume = getInt("regions.max-claim-volume", 30000);
        claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);

@@ -502,10 +507,8 @@ public class WorldConfiguration {
    }

    public boolean isChestProtected(Block block) {
-        if (!signChestProtection) {
-            return false;
-        }
-        return chestProtection.isProtected(block, null);
+
+        return signChestProtection && chestProtection.isProtected(block, null);
    }

    public boolean isChestProtectedPlacement(Block block, Player player) {
@@ -333,7 +333,7 @@ public class WorldGuardBlockListener implements Listener {
            if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
                LocalPlayer localPlayer = plugin.wrapPlayer(player);

-                if (cause == IgniteCause.FLINT_AND_STEEL) {
+                if (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL) {
                    if (!set.canBuild(localPlayer)) {
                        event.setCancelled(true);
                        return;
@@ -21,10 +21,7 @@ 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.worldedit.blocks.ItemID;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.protection.GlobalRegionManager;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -33,15 +30,14 @@ 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.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.Wolf;
@@ -55,6 +51,7 @@ import org.bukkit.event.entity.EntityCombustEvent;
 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;
@@ -63,16 +60,15 @@ 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.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.PotionSplashEvent;
-import org.bukkit.event.painting.PaintingBreakByEntityEvent;
-import org.bukkit.event.painting.PaintingBreakEvent;
-import org.bukkit.event.painting.PaintingPlaceEvent;
 import org.bukkit.inventory.ItemStack;
+
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldguard.LocalPlayer;
 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;
@@ -85,6 +81,9 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
 public class WorldGuardEntityListener implements Listener {

    private WorldGuardPlugin plugin;
+    private EntityType fireballType;
+    private EntityType witherType;
+    private EntityType witherSkullType;

    /**
     * Construct the object;
@@ -93,6 +92,10 @@ public class WorldGuardEntityListener implements Listener {
     */
    public WorldGuardEntityListener(WorldGuardPlugin plugin) {
        this.plugin = plugin;
+
+        fireballType = BukkitUtil.tryEnum(EntityType.class, "LARGE_FIREBALL", "FIREBALL");
+        witherType = BukkitUtil.tryEnum(EntityType.class, "WITHER");
+        witherSkullType = BukkitUtil.tryEnum(EntityType.class, "WITHER_SKULL");
    }

    /**
@@ -181,7 +184,8 @@ public class WorldGuardEntityListener implements Listener {
    }

    private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
-        if (event.getCause() == DamageCause.PROJECTILE) {
+
+        if (event.getDamager() instanceof Projectile) {
            onEntityDamageByProjectile(event);
            return;
        }
@@ -243,10 +247,10 @@ public class WorldGuardEntityListener implements Listener {
                    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 (!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);
                    }
                }
            }
@@ -279,10 +283,10 @@ public class WorldGuardEntityListener implements Listener {
                    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;
+                        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)) {
@@ -294,8 +298,7 @@ public class WorldGuardEntityListener implements Listener {
                }
            }

-            if (attacker != null && attacker instanceof LivingEntity
-                    && !(attacker instanceof Player)) {
+            if (attacker != null && attacker instanceof LivingEntity && !(attacker instanceof Player)) {
                if (attacker instanceof Creeper && wcfg.blockCreeperExplosions) {
                    event.setCancelled(true);
                    return;
@@ -339,25 +342,14 @@ public class WorldGuardEntityListener implements Listener {
            ConfigurationManager cfg = plugin.getGlobalStateManager();
            WorldConfiguration wcfg = cfg.get(player.getWorld());

+            // Check Invincible
            if (isInvincible(player)) {
                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 && attacker instanceof Skeleton) {
+            // Check Mob
+            if (attacker != null && attacker instanceof LivingEntity && !(attacker instanceof Player)) {
                if (wcfg.disableMobDamage) {
                    event.setCancelled(true);
                    return;
@@ -372,6 +364,22 @@ public class WorldGuardEntityListener implements Listener {
                    }
                }
            }
+
+            // Check Player
+            if (event.getDamager() instanceof EnderPearl) 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(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);
+                    }
+                }
+            }
        }

    }
@@ -488,6 +496,30 @@ public class WorldGuardEntityListener implements Listener {
            return;
        }

+        if (ent.getType() == witherType) {
+            if (wcfg.blockWitherBlockDamage) {
+                event.blockList().clear();
+                return;
+            }
+
+            if (wcfg.blockWitherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (ent.getType() == witherSkullType) {
+            if (wcfg.blockWitherSkullBlockDamage) {
+                event.blockList().clear();
+                return;
+            }
+
+            if (wcfg.blockWitherSkullExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
        if (ent instanceof Creeper) {
            if (wcfg.blockCreeperBlockDamage) {
                event.blockList().clear();
@@ -518,14 +550,12 @@ public class WorldGuardEntityListener implements Listener {
            }

            if (wcfg.useRegions) {
-                if (wcfg.useRegions) {
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);

-                    for (Block block : event.blockList()) {
-                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
-                            event.blockList().clear();
-                            return;
-                        }
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
+                        event.blockList().clear();
+                        return;
                    }
                }
            }
@@ -590,6 +620,7 @@ 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) {
@@ -597,7 +628,37 @@ public class WorldGuardEntityListener implements Listener {
            event.setCancelled(true);
            return;
        }
-
+        
+        if (event.getEntityType() == witherType) {
+            if (wcfg.blockWitherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+        else if (event.getEntityType() == witherSkullType) {
+            if (wcfg.blockWitherSkullExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+        else if (event.getEntityType() == fireballType) {
+            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) {
+            if (wcfg.blockTNTExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+        }
    }

    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -624,7 +685,7 @@ public class WorldGuardEntityListener implements Listener {

        Location eventLoc = event.getLocation();

-        if (wcfg.useRegions) {
+        if (wcfg.useRegions && cfg.useRegionsCreatureSpawnEvent) {
            Vector pt = toVector(eventLoc);
            RegionManager mgr = plugin.getGlobalRegionManager().get(eventLoc.getWorld());
            // @TODO get victims' stacktraces and find out why it's null anyway
@@ -664,88 +725,6 @@ 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;
-        Painting painting = event.getPainting();
-        World world = painting.getWorld();
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (event.getRemover() instanceof Player) {
-            Player player = (Player) event.getRemover();
-
-
-            if (wcfg.getBlacklist() != null) {
-                if (!wcfg.getBlacklist().check(
-                        new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
-                                toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if (wcfg.useRegions) {
-                if (!plugin.getGlobalRegionManager().canBuild(player, painting.getLocation())) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        } else {
-            if (event.getRemover() instanceof Creeper) {
-                if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-                if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.CREEPER_EXPLOSION, painting.getLocation())) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if (wcfg.blockEntityPaintingDestroy) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_PAINTING_DESTROY, painting.getLocation())) {
-                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()), ItemID.PAINTING), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getLocation())) {
-                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onEntityRegainHealth(EntityRegainHealthEvent event) {

@@ -806,6 +785,14 @@ public class WorldGuardEntityListener implements Listener {
                    }
                }
            }
+        } else if (ent.getType() == witherType) {
+            ConfigurationManager cfg = plugin.getGlobalStateManager();
+            WorldConfiguration wcfg = cfg.get(ent.getWorld());
+            
+            if (wcfg.blockWitherBlockDamage || wcfg.blockWitherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
        }
    }

@@ -873,11 +860,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) {
+    public void tryCancelPVPEvent(final Player attackingPlayer, final Player defendingPlayer, EntityDamageByEntityEvent event, boolean aggressorTriggered) {
        final DisallowedPVPEvent disallowedPVPEvent = new DisallowedPVPEvent(attackingPlayer, defendingPlayer, event);
        plugin.getServer().getPluginManager().callEvent(disallowedPVPEvent);
        if (!disallowedPVPEvent.isCancelled()) {
-            attackingPlayer.sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
+            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.");
            event.setCancelled(true);
        }
    }
@@ -0,0 +1,196 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Hanging;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.Painting;
+import org.bukkit.entity.Player;
+import org.bukkit.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.HangingPlaceEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+import com.sk89q.worldedit.blocks.ItemID;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+
+/**
+ * Listener for painting related events.
+ *
+ * @author BangL <henno.rickowski@gmail.com>
+ */
+public class WorldGuardHangingListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardHangingListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onHangingingBreak(HangingBreakEvent breakEvent) {
+        if (!(breakEvent instanceof HangingBreakByEntityEvent)) {
+            return;
+        }
+
+        HangingBreakByEntityEvent event = (HangingBreakByEntityEvent) breakEvent;
+        Hanging hanging = event.getEntity();
+        World world = hanging.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (event.getRemover() instanceof Player) {
+            Player player = (Player) event.getRemover();
+
+            if (wcfg.getBlacklist() != null) {
+                if (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 (event.getRemover() instanceof Creeper) {
+                if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.CREEPER_EXPLOSION, hanging.getLocation())) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (hanging instanceof Painting
+                    && (wcfg.blockEntityPaintingDestroy
+                    || (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_PAINTING_DESTROY, hanging.getLocation())))) {
+                event.setCancelled(true);
+            } else if (hanging instanceof ItemFrame
+                    && (wcfg.blockEntityItemFrameDestroy
+                    || (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, hanging.getLocation())))) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @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.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityInteract(PlayerInteractEntityEvent event) {
+        Player player = event.getPlayer();
+        Entity entity = event.getRightClicked();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (wcfg.useRegions && (entity instanceof 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);
+            }
+        }
+    }
+}
@@ -0,0 +1,174 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Warning;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Painting;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.painting.PaintingBreakByEntityEvent;
+import org.bukkit.event.painting.PaintingBreakEvent;
+import org.bukkit.event.painting.PaintingPlaceEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+
+import com.sk89q.worldedit.blocks.ItemID;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+
+/**
+ * Listener for painting related events.
+ *
+ * @author sk89q
+ * @deprecated Use {@link com.sk89q.worldguard.bukkit.WorldGuardHangingListener} instead.
+ */
+@Deprecated
+@Warning(reason="This listener has been replaced by WorldGuardHangingListener")
+public class WorldGuardPaintingListener implements Listener {
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin The plugin instance
+     */
+    public WorldGuardPaintingListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPaintingBreak(PaintingBreakEvent breakEvent) {
+        if (!(breakEvent instanceof PaintingBreakByEntityEvent)) {
+            return;
+        }
+
+        PaintingBreakByEntityEvent event = (PaintingBreakByEntityEvent) breakEvent;
+        Painting painting = event.getPainting();
+        World world = painting.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (event.getRemover() instanceof Player) {
+            Player player = (Player) event.getRemover();
+
+            if (wcfg.getBlacklist() != null) {
+                if (!wcfg.getBlacklist().check(
+                            new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                                    toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (wcfg.useRegions) {
+                if (!plugin.getGlobalRegionManager().canBuild(player, painting.getLocation())) {
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        } else {
+            if (event.getRemover() instanceof Creeper) {
+                if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.CREEPER_EXPLOSION, painting.getLocation())) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (wcfg.blockEntityPaintingDestroy
+                    || (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_PAINTING_DESTROY, painting.getLocation()))) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPaintingPlace(PaintingPlaceEvent event) {
+        Block placedOn = event.getBlock();
+        Player player = event.getPlayer();
+        World world = placedOn.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.getBlacklist() != null) {
+
+            if (!wcfg.getBlacklist().check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onEntityInteract(PlayerInteractEntityEvent event) {
+        Player player = event.getPlayer();
+        Entity entity = event.getRightClicked();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (wcfg.useRegions && entity instanceof Painting) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, entity.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+            
+            if (entity instanceof Painting
+                    && ((!plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.ENTITY_PAINTING_DESTROY, entity.getLocation())))) {
+                event.setCancelled(true);
+            }
+        }
+    }
+}
@@ -37,10 +37,10 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerBedEnterEvent;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;
@@ -304,7 +304,7 @@ public class WorldGuardPlayerListener implements Listener {
    }

    @EventHandler(ignoreCancelled = true)
-    public void onPlayerChat(PlayerChatEvent event) {
+    public void onPlayerChat(AsyncPlayerChatEvent event) {
        Player player = event.getPlayer();
        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld());
        if (wcfg.useRegions) {
@@ -329,7 +329,7 @@ public class WorldGuardPlayerListener implements Listener {
    public void onPlayerLogin(PlayerLoginEvent event) {
        Player player = event.getPlayer();
        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        
+
        String hostKey = cfg.hostKeys.get(player.getName().toLowerCase());
        if (hostKey != null) {
            String hostname = event.getHostname();
@@ -337,7 +337,7 @@ public class WorldGuardPlayerListener implements Listener {
            if (colonIndex != -1) {
                hostname = hostname.substring(0, colonIndex);
            }
-            
+
            if (!hostname.equals(hostKey)) {
                event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
                        "You did not join with the valid host key!");
@@ -667,7 +667,8 @@ public class WorldGuardPlayerListener implements Listener {

            if (type == BlockID.CAKE_BLOCK) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)) {
+                        && !set.canBuild(localPlayer)
+                        && !set.allows(DefaultFlag.USE, localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
                    event.setUseInteractedBlock(Result.DENY);
                    event.setCancelled(true);
@@ -19,6 +19,8 @@

 package com.sk89q.worldguard.bukkit;

+import static com.sk89q.worldguard.bukkit.BukkitUtil.hasHangingEvent;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -160,6 +162,11 @@ public class WorldGuardPlugin extends JavaPlugin {
        (new WorldGuardWeatherListener(this)).registerEvents();
        (new WorldGuardVehicleListener(this)).registerEvents();
        (new WorldGuardServerListener(this)).registerEvents();
+        if (hasHangingEvent()) {
+            (new WorldGuardHangingListener(this)).registerEvents();
+        } else {
+            (new WorldGuardPaintingListener(this)).registerEvents();
+        }
        configuration.updateCommandBookGodMode();

        if (getServer().getPluginManager().isPluginEnabled("CommandBook")) {
@@ -278,14 +278,14 @@ public class GeneralCommands {
                            item.getEnchantments().equals(item2.getEnchantments())) {
                        // This stack won't fit in the parent stack
                        if (item2.getAmount() > needed) {
-                            item.setAmount(64);
+                            item.setAmount(max);
                            item2.setAmount(item2.getAmount() - needed);
                            break;
                        // This stack will
                        } else {
                            items[j] = null;
                            item.setAmount(item.getAmount() + item2.getAmount());
-                            needed = 64 - item.getAmount();
+                            needed = max - item.getAmount();
                        }

                        affected++;
@@ -19,23 +19,7 @@

 package com.sk89q.worldguard.bukkit.commands;

-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.sk89q.minecraft.util.commands.Command;
-import com.sk89q.minecraft.util.commands.CommandContext;
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.minecraft.util.commands.CommandPermissionsException;
+import com.sk89q.minecraft.util.commands.*;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Location;
 import com.sk89q.worldedit.Vector;
@@ -49,20 +33,25 @@ import com.sk89q.worldguard.bukkit.WorldConfiguration;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.RegionDBUtil;
+import com.sk89q.worldguard.protection.databases.migrators.AbstractDatabaseMigrator;
+import com.sk89q.worldguard.protection.databases.migrators.MigrationException;
+import com.sk89q.worldguard.protection.databases.migrators.MigratorKey;
+import com.sk89q.worldguard.protection.flags.*;
 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 com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
-import com.sk89q.worldguard.protection.databases.migrators.AbstractDatabaseMigrator;
-import com.sk89q.worldguard.protection.databases.migrators.MigrationException;
-import com.sk89q.worldguard.protection.databases.migrators.MigratorKey;
-import com.sk89q.worldguard.protection.databases.RegionDBUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;

 public class RegionCommands {
    private final WorldGuardPlugin plugin;
@@ -489,17 +478,27 @@ public class RegionCommands {
        boolean hasFlags = false;
        final StringBuilder s = new StringBuilder(ChatColor.BLUE + "Flags: ");
        for (Flag<?> flag : DefaultFlag.getFlags()) {
-            Object val = region.getFlag(flag);
+            Object val = region.getFlag(flag), group = null;

            if (val == null) {
                continue;
            }

-            if (s.length() > 0) {
+            if (hasFlags) {
                s.append(", ");
            }

-            s.append(flag.getName() + ": " + String.valueOf(val));
+            RegionGroupFlag groupFlag = flag.getRegionGroupFlag();
+            if (groupFlag != null) {
+                group = region.getFlag(groupFlag);
+            }
+
+            if(group == null) {
+                s.append(flag.getName()).append(": ").append(String.valueOf(val));
+            } else {
+                s.append(flag.getName()).append(" -g ").append(String.valueOf(group)).append(": ").append(String.valueOf(val));
+            }
+
            hasFlags = true;
        }
        if (hasFlags) {
@@ -661,6 +660,7 @@ public class RegionCommands {
        String id = args.getString(0);
        String flagName = args.getString(1);
        String value = null;
+        RegionGroup groupValue = null;

        if (args.argsLength() >= 3) {
            value = args.getJoinedStrings(2);
@@ -753,38 +753,63 @@ public class RegionCommands {

        if (args.hasFlag('g')) {
            String group = args.getFlag('g');
-            if (foundFlag.getRegionGroupFlag() == null) {
+            RegionGroupFlag groupFlag = foundFlag.getRegionGroupFlag();
+            if (groupFlag == null) {
                throw new CommandException("Region flag '" + foundFlag.getName()
                        + "' does not have a group flag!");
            }

+            // Parse the [-g group] separately so entire command can abort if parsing
+            // the [value] part throws an error.
            try {
-                setFlag(region, foundFlag.getRegionGroupFlag(), sender, group);
+                groupValue = groupFlag.parseInput(plugin, sender, group);
+            } catch (InvalidFlagFormat e) {
+                throw new CommandException(e.getMessage());
+            }
+
+        }
+
+        if (value != null) {
+            // Set the flag if [value] was given even if [-g group] was given as well
+            try {
+                setFlag(region, foundFlag, sender, value);
            } catch (InvalidFlagFormat e) {
                throw new CommandException(e.getMessage());
            }

            sender.sendMessage(ChatColor.YELLOW
-                    + "Region group flag for '" + foundFlag.getName() + "' set.");
-        } else {
-            if (value != null) {
-                try {
-                    setFlag(region, foundFlag, sender, value);
-                } catch (InvalidFlagFormat e) {
-                    throw new CommandException(e.getMessage());
-                }
+                    + "Region flag '" + foundFlag.getName() + "' set.");
+        }

+        if (value == null && !args.hasFlag('g')) {
+            // Clear the flag only if neither [value] nor [-g group] was given
+            region.setFlag(foundFlag, null);
+
+            // Also clear the associated group flag if one exists
+            RegionGroupFlag groupFlag = foundFlag.getRegionGroupFlag();
+            if (groupFlag != null) {
+                region.setFlag(groupFlag, null);
+            }
+
+            sender.sendMessage(ChatColor.YELLOW
+                    + "Region flag '" + foundFlag.getName() + "' cleared.");
+        }
+
+        if (groupValue != null) {
+            RegionGroupFlag groupFlag = foundFlag.getRegionGroupFlag();
+
+            // If group set to the default, then clear the group flag
+            if (groupValue == groupFlag.getDefault()) {
+                region.setFlag(groupFlag, null);
                sender.sendMessage(ChatColor.YELLOW
-                        + "Region flag '" + foundFlag.getName() + "' set.");
+                        + "Region group flag for '" + foundFlag.getName() + "' reset to default.");
            } else {
-                // Clear the flag
-                region.setFlag(foundFlag, null);
-
+                region.setFlag(groupFlag, groupValue);
                sender.sendMessage(ChatColor.YELLOW
-                        + "Region flag '" + foundFlag.getName() + "' cleared.");
+                        + "Region group flag for '" + foundFlag.getName() + "' set.");
            }
        }
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -955,6 +980,7 @@ public class RegionCommands {
    
    @Command(aliases = {"load", "reload"}, usage = "[world]",
            desc = "Reload regions from file", max = 1)
+    @CommandPermissions({"worldguard.region.load"})
    public void load(CommandContext args, CommandSender sender) throws CommandException {
        
        World world = null;
@@ -993,6 +1019,7 @@ public class RegionCommands {
    
    @Command(aliases = {"save", "write"}, usage = "[world]",
            desc = "Re-save regions to file", max = 1)
+    @CommandPermissions({"worldguard.region.save"})
    public void save(CommandContext args, CommandSender sender) throws CommandException {
        
        World world = null;
@@ -115,10 +115,7 @@ public class SignChestProtection implements ChestProtection {
    
    private boolean isProtectedSignAndChestBinary(Block block, Player player) {
        Boolean res = isProtectedSignAndChest(block, player);
-        if (res == null || !res) {
-            return false;
-        }
-        return true;
+        return !(res == null || !res);
    }

    public boolean isAdjacentChestProtected(Block searchBlock, Player player) {
@@ -18,23 +18,13 @@
 */
 package com.sk89q.worldguard.protection;

-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
-import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.flags.*;
 import com.sk89q.worldguard.protection.flags.StateFlag.State;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;

+import java.util.*;
+
 /**
 * Represents a set of regions for a particular point or area and the rules
 * that are represented by that set. An instance of this can be used to
@@ -216,16 +206,12 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
        Set<ProtectedRegion> needsClear = new HashSet<ProtectedRegion>();
        Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();

-        Iterator<ProtectedRegion> it = applicable.iterator();
-        
-        while (it.hasNext()) {
-            ProtectedRegion region = it.next();
-
+        for (ProtectedRegion region : applicable) {
            // Ignore lower priority regions
            if (hasFlagDefined && region.getPriority() < lastPriority) {
                break;
            }
-            
+
            lastPriority = region.getPriority();

            // Ignore non-build regions
@@ -244,7 +230,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
                    continue;
                }
            }
-            
+
            State v = region.getFlag(flag);

            // Allow DENY to override everything
@@ -337,11 +323,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
        Map<ProtectedRegion, V> needsClear = new HashMap<ProtectedRegion, V>();
        Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();

-        Iterator<ProtectedRegion> it = applicable.iterator();
-
-        while (it.hasNext()) {
-            ProtectedRegion region = it.next();
-
+        for (ProtectedRegion region : applicable) {
            // Ignore lower priority regions
            if (found && region.getPriority() < lastPriority) {
                break;
@@ -360,11 +342,11 @@ 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;
            }

@@ -23,6 +23,7 @@ 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;
@@ -41,6 +42,7 @@ 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.FlatRegionManager;
+import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;

 /**
@@ -65,7 +67,7 @@ public class GlobalRegionManager {
    /**
     * Map of managers per-world.
     */
-    private HashMap<String, RegionManager> managers;
+    private ConcurrentHashMap<String, RegionManager> managers;

    /**
     * Stores the list of modification dates for the world files. This allows
@@ -81,7 +83,7 @@ public class GlobalRegionManager {
    public GlobalRegionManager(WorldGuardPlugin plugin) {
        this.plugin = plugin;
        config = plugin.getGlobalStateManager();
-        managers = new HashMap<String, RegionManager>();
+        managers = new ConcurrentHashMap<String, RegionManager>();
        lastModified = new HashMap<String, Long>();
    }

@@ -125,19 +127,26 @@ 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 load(World world) {
+    public RegionManager create(World world) {
        String name = world.getName();
+        boolean sql = config.useSqlDatabase;
        ProtectionDatabase database;
        File file = null;
-        
+
        try {
-            if (!config.useSqlDatabase) {
+            if (!sql) {
                file = getPath(name);
                database = new YAMLDatabase(file, plugin.getLogger());

@@ -148,9 +157,7 @@ public class GlobalRegionManager {
            }

            // Create a manager
-            RegionManager manager = new FlatRegionManager(database);
-
-            managers.put(name, manager);
+            RegionManager manager = new PRTreeRegionManager(database);
            manager.load();

            plugin.getLogger().info(manager.getRegions().size()
@@ -159,7 +166,7 @@ public class GlobalRegionManager {
            return manager;
        } catch (ProtectionDatabaseException e) {
            String logStr = "Failed to load regions from ";
-            if (config.useSqlDatabase) {
+            if (sql) {
                logStr += "SQL Database <" + config.sqlDsn + "> ";
            } else {
                logStr += "file \"" + file + "\" ";
@@ -224,9 +231,14 @@ public class GlobalRegionManager {
     */
    public RegionManager get(World world) {
        RegionManager manager = managers.get(world.getName());
+        RegionManager newManager = null;

-        if (manager == null) {
-            manager = load(world);
+        while (manager == null) {
+            if (newManager == null) {
+                newManager = create(world);
+            }
+            managers.putIfAbsent(world.getName(), newManager);
+            manager = managers.get(world.getName());
        }

        return manager;
@@ -353,7 +365,7 @@ public class GlobalRegionManager {
            return true;
        }

-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+        RegionManager mgr = get(world);
        return mgr.getApplicableRegions(toVector(loc)).allows(flag, player);
    }
 }
@@ -182,7 +182,7 @@ public class CSVDatabase extends AbstractProtectionDatabase {
        } finally {
            try {
                reader.close();
-            } catch (IOException e) {
+            } catch (IOException ignored) {
            }
        }

@@ -20,20 +20,6 @@
 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;
@@ -46,10 +32,23 @@ 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;
@@ -60,17 +59,16 @@ 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;
-        this.world = world;
+        String world1 = 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(
@@ -89,7 +87,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                    "WHERE `name` = ? LIMIT 0,1"
            );

-            worldStmt.setString(1, this.world);
+            worldStmt.setString(1, world1);
            ResultSet worldResult = worldStmt.executeQuery();

            if (worldResult.first()) {
@@ -122,6 +120,15 @@ 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 {
@@ -132,7 +139,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
    		} 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 
+                // does not ensure that the connection is marked as closed unless
                // the close() method has been called.
    			if ("08S01".equals(ex.getSQLState())) {
    				conn.close();
@@ -148,7 +155,7 @@ 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` " +
@@ -163,8 +170,8 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            while (flagsResultSet.next()) {
                regionFlags.put(
                        flagsResultSet.getString("flag"),
-                        flagsResultSet.getObject("value")
-                );
+                        sqlUnmarshal(flagsResultSet.getString("value"))
+                        );
            }

            // @TODO: Make this better
@@ -453,6 +460,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        poly2dRegions = regions;
    }

+    @Override
    public void load() throws ProtectionDatabaseException {
        try {
            connect();
@@ -463,7 +471,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;
@@ -533,15 +541,15 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                    Statement.RETURN_GENERATED_KEYS
            );

-            for(int i=0, len=usernames.length; i<len; i++) {
-                if (!users.containsKey(usernames[i])) {
-                    insertUserStatement.setString(1, usernames[i]);
+            for (String username : usernames) {
+                if (!users.containsKey(username)) {
+                    insertUserStatement.setString(1, username);
                    insertUserStatement.execute();
                    ResultSet generatedKeys = insertUserStatement.getGeneratedKeys();
                    if (generatedKeys.first()) {
-                        users.put(usernames[i], generatedKeys.getInt(1));
+                        users.put(username, generatedKeys.getInt(1));
                    } else {
-                        logger.warning("Could not get the database id for user " + usernames[i]);
+                        logger.warning("Could not get the database id for user " + username);
                    }
                }
            }
@@ -597,15 +605,15 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                    Statement.RETURN_GENERATED_KEYS
            );

-            for(int i=0, len=groupnames.length; i<len; i++) {
-                if (!groups.containsKey(groupnames[i])) {
-                    insertGroupStatement.setString(1, groupnames[i]);
+            for (String groupname : groupnames) {
+                if (!groups.containsKey(groupname)) {
+                    insertGroupStatement.setString(1, groupname);
                    insertGroupStatement.execute();
                    ResultSet generatedKeys = insertGroupStatement.getGeneratedKeys();
                    if (generatedKeys.first()) {
-                        groups.put(groupnames[i], generatedKeys.getInt(1));
+                        groups.put(groupname, generatedKeys.getInt(1));
                    } else {
-                        logger.warning("Could not get the database id for user " + groupnames[i]);
+                        logger.warning("Could not get the database id for user " + groupname);
                    }
                }
            }
@@ -625,12 +633,13 @@ 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();
@@ -739,7 +748,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        for (Map.Entry<Flag<?>, Object> entry : region.getFlags().entrySet()) {
            if (entry.getValue() == null) continue;

-            Object flag = marshalFlag(entry.getKey(), entry.getValue());
+            Object flag = sqlMarshal(marshalFlag(entry.getKey(), entry.getValue()));

            PreparedStatement insertFlagStatement = this.conn.prepareStatement(
                    "INSERT INTO `region_flag` ( " +
@@ -785,9 +794,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                "VALUES (?, " + this.worldDbId + ",  ?, ?)"
        );

-        Map<String,Integer> players = getUserIds(domain.getPlayers().toArray(new String[0]));
+        Set<String> var = domain.getPlayers();

-        for (Integer player : players.values()) {
+        for (Integer player : getUserIds(var.toArray(new String[var.size()])).values()) {
            insertUsersForRegion.setString(1, region.getId().toLowerCase());
            insertUsersForRegion.setInt(2, player);
            insertUsersForRegion.setBoolean(3, owners);
@@ -812,9 +821,8 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                "VALUES (?, " + this.worldDbId + ",  ?, ?)"
        );

-        Map<String,Integer> groups = getGroupIds(domain.getGroups().toArray(new String[0]));
-
-        for (Integer group : groups.values()) {
+        Set<String> groupVar = domain.getGroups();
+        for (Integer group : getGroupIds(groupVar.toArray(new String[groupVar.size()])).values()) {
            insertGroupsForRegion.setString(1, region.getId().toLowerCase());
            insertGroupsForRegion.setInt(2, group);
            insertGroupsForRegion.setBoolean(3, owners);
@@ -924,8 +932,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                ") VALUES (null, ?, " + this.worldDbId + ", ?, ?)"
        );

+        String lowerId = region.getId();
        for (BlockVector2D point : region.getPoints()) {
-            insertPoly2dPointStatement.setString(1, region.getId().toLowerCase());
+            insertPoly2dPointStatement.setString(1, lowerId);
            insertPoly2dPointStatement.setInt(2, point.getBlockZ());
            insertPoly2dPointStatement.setInt(3, point.getBlockX());

@@ -1007,11 +1016,25 @@ 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);
+    }
 }
@@ -19,6 +19,14 @@

 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;
@@ -29,14 +37,6 @@ 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((Exception) e);
+            throw new MigrationException(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((Exception) e);
+            throw new MigrationException(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((Exception) e);
+            throw new MigrationException(e);
        } catch (ProtectionDatabaseException e) {
-            throw new MigrationException((Exception) e);
+            throw new MigrationException(e);
        }
    }
 }
@@ -19,12 +19,6 @@

 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;
@@ -32,6 +26,12 @@ 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((Exception) e);
+            throw new MigrationException(e);
        } catch (ProtectionDatabaseException e) {
-            throw new MigrationException((Exception) e);
+            throw new MigrationException(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((Exception) e);
+            throw new MigrationException(e);
        }
    }

@@ -66,6 +66,7 @@ public final class DefaultFlag {
    public static final StateFlag EXIT = new StateFlag("exit", true);
    public static final StateFlag ITEM_DROP = new StateFlag("item-drop", 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);
@@ -94,7 +95,8 @@ public final class DefaultFlag {
        MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY, EXP_DROPS,
        CREEPER_EXPLOSION, ENDERDRAGON_BLOCK_DAMAGE, GHAST_FIREBALL, ENDER_BUILD,
        GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
-        EXIT, ENTRY, LIGHTNING, ENTITY_PAINTING_DESTROY, ITEM_DROP,
+        EXIT, ENTRY, LIGHTNING, ENTITY_PAINTING_DESTROY,
+        ENTITY_ITEM_FRAME_DESTROY, ITEM_DROP,
        HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
        FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT, GAME_MODE,
@@ -82,7 +82,7 @@ public class LocationFlag extends Flag<Location> {
                            ),
                            yaw, pitch
                    );
-                } catch (NumberFormatException e) {
+                } catch (NumberFormatException ignored) {
                }
            }

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

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

-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
@@ -32,6 +25,8 @@ import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
 import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;

+import java.util.*;
+
 /**
 * A very simple implementation of the region manager that uses a flat list
 * and iterates through the list to identify applicable regions. This method
@@ -78,9 +73,7 @@ public class FlatRegionManager extends RegionManager {

        if (region != null) {
            List<String> removeRegions = new ArrayList<String>();
-            Iterator<ProtectedRegion> iter = regions.values().iterator();
-            while (iter.hasNext()) {
-                ProtectedRegion curRegion = iter.next();
+            for (ProtectedRegion curRegion : regions.values()) {
                if (curRegion.getParent() == region) {
                    removeRegions.add(curRegion.getId().toLowerCase());
                }
@@ -18,22 +18,18 @@
 */
 package com.sk89q.worldguard.protection.managers;

-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.khelekore.prtree.MBRConverter;
-import org.khelekore.prtree.PRTree;
-
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.databases.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 {

@@ -55,13 +51,11 @@ 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) throws ProtectionDatabaseException {
+    public PRTreeRegionManager(ProtectionDatabase regionLoader) {
        super(regionLoader);
        regions = new TreeMap<String, ProtectedRegion>();
        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
-        this.load();
    }

    @Override
@@ -107,21 +101,32 @@ 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>();

-        int x = pt.getBlockX();
-        int z = pt.getBlockZ();
+        // Floor the vector to ensure we get accurate points
+        pt = pt.floor();

-        for (ProtectedRegion region : tree.find(x, z, x, z)) {
-            if (region.contains(pt)) {
+        List<ProtectedRegion> appRegions = new ArrayList<ProtectedRegion>();
+        MBR pointMBR = new SimpleMBR(pt.getX(), pt.getX(), pt.getY(), pt.getY(), pt.getZ(), pt.getZ());
+
+        for (ProtectedRegion region : tree.find(pointMBR)) {
+            if (region.contains(pt) && !appRegions.contains(region)) {
                appRegions.add(region);
+
+                ProtectedRegion parent = region.getParent();
+
+                while (parent != null) {
+                    if (!appRegions.contains(parent)) {
+                        appRegions.add(parent);
+                    }
+
+                    parent = parent.getParent();
+                }
            }
        }

@@ -147,14 +152,26 @@ 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());

-        int x = pt.getBlockX();
-        int z = pt.getBlockZ();
-
-        for (ProtectedRegion region : tree.find(x, z, x, z)) {
-            if (region.contains(pt)) {
+        for (ProtectedRegion region : tree.find(pointMBR)) {
+            if (region.contains(pt) && !applicable.contains(region.getId())) {
                applicable.add(region.getId());
+
+                ProtectedRegion parent = region.getParent();
+
+                while (parent != null) {
+                    if (!applicable.contains(parent.getId())) {
+                        applicable.add(parent.getId());
+                    }
+
+                    parent = parent.getParent();
+                }
            }
        }

@@ -200,4 +217,4 @@ public class PRTreeRegionManager extends RegionManager {

        return count;
    }
-}
+}
@@ -19,12 +19,6 @@

 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;
@@ -33,6 +27,12 @@ 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.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.
 *
@@ -541,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 (int i = 0; i < pts1.size(); i++ ) {
-            for (int j = 0; j < pts2.size(); j++) {
+        for (BlockVector2D aPts1 : pts1) {
+            for (BlockVector2D aPts2 : pts2) {

                Line2D line1 = new Line2D.Double(
                        lastPt1.getBlockX(),
                        lastPt1.getBlockZ(),
-                        pts1.get(i).getBlockX(),
-                        pts1.get(i).getBlockZ());
+                        aPts1.getBlockX(),
+                        aPts1.getBlockZ());

                if (line1.intersectsLine(
-                                lastPt2.getBlockX(),
-                                lastPt2.getBlockZ(),
-                                pts2.get(j).getBlockX(),
-                                pts2.get(j).getBlockZ())) {
+                        lastPt2.getBlockX(),
+                        lastPt2.getBlockZ(),
+                        aPts2.getBlockX(),
+                        aPts2.getBlockZ())) {
                    return true;
                }
-                lastPt2 = pts2.get(j);
+                lastPt2 = aPts2;
            }
-            lastPt1 = pts1.get(i);
+            lastPt1 = aPts1;
        }
        return false;
    }
@@ -22,19 +22,35 @@ package com.sk89q.worldguard.protection.regions;
 import org.khelekore.prtree.MBRConverter;

 public class ProtectedRegionMBRConverter implements MBRConverter<ProtectedRegion> {
-    public double getMinX(ProtectedRegion t) {
-        return t.getMinimumPoint().getBlockX();
+
+    @Override
+    public int getDimensions() {
+        return 3;
    }

-    public double getMinY(ProtectedRegion t) {
-        return t.getMinimumPoint().getBlockZ();
+    @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 getMaxX(ProtectedRegion t) {
-        return t.getMaximumPoint().getBlockX();
-    }
-
-    public double getMaxY(ProtectedRegion t) {
-        return t.getMaximumPoint().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;
    }
 }
@@ -84,7 +84,7 @@ public class PastebinPoster {
                    in = conn.getInputStream();
                    BufferedReader reader = new BufferedReader(new InputStreamReader(in));
                    String line;
-                    StringBuffer response = new StringBuffer(); 
+                    StringBuilder response = new StringBuilder();
                    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 e) {
+                    } catch (IOException ignored) {
                    }
                }
                if (out != null) {
                    try {
                        out.close();
-                    } catch (IOException e) {
+                    } catch (IOException ignored) {
                    }
                }
            }
@@ -0,0 +1,47 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+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.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;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class FlatRegionManagerTest extends RegionOverlapTest {
+    protected RegionManager createRegionManager() throws Exception {
+        return new FlatRegionManager(null);
+    }
+}
@@ -0,0 +1,29 @@
+// $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);
+    }
+}
@@ -0,0 +1,29 @@
+// $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);
+    }
+}
@@ -0,0 +1,47 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.protection;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+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.StateFlag;
+import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
+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;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class PRTreeRegionManagerTest extends RegionOverlapTest {
+    protected RegionManager createRegionManager() throws Exception {
+        return new PRTreeRegionManager(null);
+    }
+}
@@ -0,0 +1,29 @@
+// $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);
+    }
+}
@@ -0,0 +1,29 @@
+// $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);
+    }
+}
@@ -40,7 +40,7 @@ import java.util.HashSet;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

-public class RegionOverlapTest {
+public abstract class RegionOverlapTest {
    static String COURTYARD_ID = "courtyard";
    static String FOUNTAIN_ID = "fountain";
    static String NO_FIRE_ID = "nofire";
@@ -57,12 +57,14 @@ public class RegionOverlapTest {
    ProtectedRegion fountain;
    TestPlayer player1;
    TestPlayer player2;
+    
+    protected abstract RegionManager createRegionManager() throws Exception;

    @Before
    public void setUp() throws Exception {
        setUpGlobalRegion();
-
-        manager = new FlatRegionManager(null);
+        
+        manager = createRegionManager();

        setUpPlayers();
        setUpCourtyardRegion();
@@ -34,7 +34,7 @@ import com.sk89q.worldguard.protection.regions.*;
 import org.junit.Test;
 import static org.junit.Assert.*;

-public class RegionPriorityTest {
+public abstract class RegionPriorityTest {
    static String COURTYARD_ID = "courtyard";
    static String FOUNTAIN_ID = "fountain";
    static String NO_FIRE_ID = "nofire";
@@ -50,12 +50,14 @@ public class RegionPriorityTest {
    ProtectedRegion fountain;
    TestPlayer player1;
    TestPlayer player2;
+    
+    protected abstract RegionManager createRegionManager() throws Exception;

    @Before
    public void setUp() throws Exception {
        setUpGlobalRegion();
        
-        manager = new FlatRegionManager(null);
+        manager = createRegionManager();

        setUpPlayers();
        setUpCourtyardRegion();
Author	SHA1	Message	Date
sk89q	9bcc6b9605	[maven-release-plugin] prepare release 5.6	2012-11-03 12:37:52 -07:00
sk89q	282c3a864e	Updated CHANGELOG.txt for 5.6.	2012-11-03 12:15:43 -07:00
sk89q	eb083a8934	Updated README.html to mention the moved spawn-protection setting, added more explanations.	2012-11-03 12:15:43 -07:00
sk89q	0fc71ff79e	Note the issue tracker in README.html.	2012-11-03 12:15:43 -07:00
sk89q	68a7455496	Added backwards compatibility for versions below MC1.4.	2012-11-03 12:15:43 -07:00
Dark Arc	fcfc3acbb8	Improved Performance of some operations Replaced quite a few whiles and fors with for-eachs giving a performance gain. Also fixed a few issues with the MySQLDatabase and made several other minor improvements.	2012-11-03 00:19:40 -04:00
sk89q	aa53c0aa6a	We have a new issue tracker.	2012-11-02 18:15:02 -07:00
Dark Arc	f098905a92	Fixes WORLDGUARD-2205 Mob Damage from projectiles is now properly blocked in regions where applicable.	2012-11-02 21:07:38 -04:00
Dark Arc	eec78092b5	Allow damage to be less than 1 This resolves problems with mods that use fake damage events to check with WorldGuard what's going on.	2012-11-02 20:57:24 -04:00
sk89q	34fa5eceb8	Fixed WORLDGUARD-2255, where region.getId() was lowercase'd each pass of a for loop in MySQLDatabase.updatePoly2dPoints().	2012-11-02 14:13:53 -07:00
Dark Arc	c32d2dd6f8	Fixes WORLDGUARD-2254 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.	2012-11-02 17:06:35 -04:00
Dark Arc	da80d3536a	Fixes WORLDGUARD-2253 Players who are not in god mode will once again receive damage in PVP areas from Ender Pearls.	2012-11-02 17:06:33 -04:00
sk89q	e9361022d2	Protected against using (right-clicking) paintings and item frames.	2012-11-02 13:41:53 -07:00
sk89q	dd0c1a5ab5	Fixed Withers still breaking blocks if they smash their bodies into them. Fixes WORLDGUARD-2245.	2012-11-02 12:20:59 -07:00
Wojciech Stryjewski	bb9dff7b8c	Deleting a region flag also deletes group flag The group flags set with /region flag -g have no effect if the normal flag is not also set, nor will they be displayed with /region info once the normal flag is deleted. However, if a group flag was to remain set in the database, the next time a user sets the normal flag, they might be surprised to suddenly see the corresponding group set as well. Since the -g group is presented to the user as an attribute of the normal flag, rather than a standalone flag, the group flag should be deleted along with the normal flag.	2012-11-01 22:43:24 -07:00
Wojciech Stryjewski	7e419c116e	Allow /region flag to set group and value at once The usage for "/region flag" implies both can be set at once: /region flag <id> <flag> [-g group] [value] However if the [-g group] [value] portions are specified, only the group is set and the value is silently ignored. With this commit, both values can be set at once. All other behavior of the "flag" command is preserved. If only the [-g group] part is given, then only the group flag changes and the regular flag's value is unaffected. If neither part is given, then the flag is cleared.	2012-11-01 22:43:23 -07:00
Wojciech Stryjewski	2cbc2f5226	Allow removing of -g group flags with /region flag The @Command parser requires that a value follow the -g option when used in /refion flag. Therefore, it's not possible to remove the -g flag by omitting it's value, as it is possible with the regular flags. Rather, if the group flag is set to what would be the default region group for the normal flag, then the group flag is actually removed and the user sees a "Region group flagfor '...' reset to default." message.	2012-11-01 22:43:23 -07:00
Wojciech Stryjewski	68b5e3e0a8	Improve /region info output for -g group flags If a region group flag has been set with the -g option to /region flag the /region info command will not show it at all because these group flags are not in the DefaultFlag.getFlags() array. With this code change, if a group flag has been set on "entry" for example, it might be shown as "Flags: entry -g OWNERS: ALLOW".	2012-11-01 22:43:23 -07:00
BangL	1502ec12a9	Added support for the hanging events, an item frame destroy region flag, and a mobs.block-item-frame-destroy setting. Now also using Bukkit 1.4.2-R0.2-SNAPSHOT and WorldEdit 5.4.4-SNAPSHOT.	2012-11-01 22:35:15 -07:00
sk89q	6d09b18479	Check for both LARGE_FIREBALL and FIREBALL for the EntityType in the entity listener. This is to counteract a breaking Bukkit change.	2012-10-30 09:24:10 -07:00
Dark Arc	08ce207636	Fixed bugs in the PRTreeRegionManager class: * Point would not be returned if the player was at point which exceeded the flat decimal maximum of a region. * The getAplicableRegionIDs method would not return the parents of a region. * All test would fail	2012-10-29 12:14:11 -07:00
sk89q	f199b977eb	Added more tests for the PRTreeRegionManager to fail.	2012-10-29 12:14:10 -07:00
sk89q	5715e2c835	WorldGuard has good unit tests for regions, why not use them for PRTreeRegionManager? LET'S WATCH THE WORLD BURN.	2012-10-29 12:14:10 -07:00
sk89q	b8642b7ca3	Tiny change to PRTree version to make it load a Java6 compile.	2012-10-29 12:14:10 -07:00
Wizjany	2c4d4708d8	Added parent region checking to PRTree manager as per Dark_Arc's specifications.	2012-10-29 12:14:10 -07:00
Darth Android	0edb6e6157	Include the PRTree library in generated artifacts	2012-10-29 12:14:10 -07:00
Darth Android	4f394b5668	Update PRTree library to v1.5 Updated PRTreeRegionManager code to support 3D points and regions Changed region manager to PRTreeRegionManager	2012-10-29 12:14:09 -07:00
Glitchfinder	9834c30e3a	Adding and fixing support for new and existing explosion types.	2012-10-28 20:23:36 -07:00
sk89q	f3f1b0870f	Changed default region wand to leather (#334 ).	2012-10-28 14:12:10 -07:00
sk89q	915d314c18	Removed <modules> that magically appeared thanks to Eclipse.	2012-10-28 14:07:41 -07:00
sk89q	02b3ae6aa5	Added mobs.block-wither-block-damage.	2012-10-28 14:01:17 -07:00
sk89q	f725e73653	Move to WG 5.6-SNAPSHOT and Bukkit 1.4.2-R0.1-SNAPSHOT.	2012-10-28 14:01:17 -07:00
sk89q	c5858ef202	Removed <packaging> from pom.xml.	2012-10-28 13:56:46 -07:00
sk89q	ba2fd2ca2e	Brought README.md and CONTRIBUTING.md inline with latest updates.	2012-10-28 13:54:06 -07:00
Wojciech Stryjewski	1075d36748	Fix spurious comma in "Flags:" /region info output When the "/region info" command displays any flags in the region, it always prints an extra leading comma character after the "Flags:" prompt.	2012-10-24 12:48:38 -05:00
sk89q	3ee3799e55	I'm OCD like that. Changed WG->${project.name} in readme, added license ver. to README.md.	2012-10-24 00:29:20 -07:00
sk89q	6654b0a67a	More readme cleanup.	2012-10-24 00:29:20 -07:00
sk89q	9577c93edb	Better place for README.md logo URL.	2012-10-24 00:29:20 -07:00
sk89q	7cd67281bc	Move extraneous files to contrib/, added region_storage_update_20110325.sql to assembly.	2012-10-24 00:29:20 -07:00
sk89q	d21c226183	Modernized README.html.	2012-10-24 00:29:19 -07:00
sk89q	4322236b9e	Updated the ancient README.html.	2012-10-24 00:29:19 -07:00
sk89q	05e408ee65	Updated README.md.	2012-10-24 00:29:19 -07:00
sk89q	3d1012ba94	Cleaned up pom.xml and updated CommandBook to 2.1.	2012-10-24 00:29:19 -07:00
sk89q	94937e41ef	Changed the region MySQL database to marshal and unmarshal values using YAML, which should fix the notable problems regarding non-string flag data types.	2012-10-24 00:28:43 -07:00
sk89q	3957aa83fc	Say hi to travis-ci.	2012-10-24 00:28:43 -07:00
Rutr	8aa79d1c4c	Fixed detection damager(when attac by magic) http://redmine.sk89q.com/issues/901	2012-10-19 09:02:19 +02:00
sk89q	578eeff0e1	[maven-release-plugin] prepare for next development iteration	2012-10-07 10:47:07 -07:00
sk89q	5f2f1c67f5	[maven-release-plugin] prepare release 5.5.4	2012-10-07 10:46:51 -07:00
sk89q	c92b9c3d97	Updated CHANGELOG.txt.	2012-10-07 10:40:00 -07:00
sk89q	0951d00da3	Fixed permissions for region loading/saving.	2012-10-06 21:47:37 -07:00
zml2008	6df9c3660b	Merge pull request #201 from eric-wieser/patch-1 Did `wcfg.useRegions` really need to be checked twice?	2012-09-16 12:31:17 -07:00
Alexander	19be2bf96e	Updated fireball item blocking	2012-08-23 12:41:36 +02:00
Fletch to 99	e10ed6ac7a	Report the amount of plugins loaded	2012-08-12 16:56:22 -03:00
sk89q	479ebf4d89	Copying and pasting is bad. Fixed references of worldedit -> worldguard in new pom.xml changes.	2012-08-11 00:28:02 -07:00
sk89q	1f1e36e9f7	Updated pom.xml for license, distributionManagement, maven-site-plugin.	2012-08-11 00:26:06 -07:00
TomyLobo	27e634ae03	Fixed a warning.	2012-08-11 04:37:49 +02:00
unknown	e60b20b37b	Add 'use' flag to cakes	2012-08-10 22:33:55 +02:00
zml2008	684214ff6a	Update for async player chat stupidity	2012-08-04 19:56:48 -07:00
sk89q	ba5be6071f	Added regions.use-creature-spawn-event configuration setting.	2012-07-23 13:45:04 -07:00
TomyLobo	6c8d13690e	Fixed eggs, snowballs and the likes being dupable with /stack.	2012-07-16 16:08:04 +02:00
TomyLobo	3e0b2ef3e4	Upped Bukkit dependency version to 1.2.4-R4.1.	2012-07-14 00:16:45 +02:00
sk89q	c5304d2775	[maven-release-plugin] prepare for next development iteration	2012-07-07 10:55:58 -07:00
Eric Wieser	acb1d18654	Did `wcfg.useRegions` really need to be checked twice?	2012-04-28 18:18:51 +02:00