Implemented a PvM Flag

Merge pull request #313 from TheCutter/master
Added runtime CraftBukkit dependencies.
2014-07-06 18:14:58 -04:00 · 2014-07-06 15:09:51 -07:00 · 2014-07-06 15:03:22 -07:00 · 2014-06-26 17:47:14 -07:00 · 2014-06-23 19:14:47 +02:00 · 2014-06-22 14:13:45 -04:00
43 changed files with 3758 additions and 2143 deletions
@@ -4,3 +4,10 @@
 target

 .DS_Store
+*.iml
+.idea
+
+/bin
+/dependency-reduced-pom.xml
+*-private.sh
+
@@ -1,3 +1,93 @@
+5.9
+- Added a config option to allow explosion flags to only prevent block damage
+- Added allow-tamed-spawns setting, on by default. This will stop WorldGuard
+    from culling tamed animals.
+- Added config option and flag to prevent soil from drying naturally.
+- Added formatting codes, &k/l/m/n/o and &x (reset).
+- Added snow-fall-blocks option to config to restrict snow fall to certain blocks
+- Allow players to add newlines (\n) via command, not just manually in yml.
+- Allow the console to load/save all region managers with one command.
+- Changed entity report format slightly.
+- Check bypass perms for item-drop flag.
+- Check for entities and projectiles removing items from frames too.
+- Fix being able to use bonemeal to turn tall grass into double plants.
+- Fix number of arguments for migratedb command.
+- Fixed addowner/addmember commands adding command artifacts. Specifically, 
+    "-w <world>" will no longer be added when using it.
+- Fixed milking cows in protected areas due to changes in Bukkit.
+- Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order.
+- Fixed snowman trails being treated as snow fall.
+- Make /rg list default to own regions if the player doesn't have permission otherwise.
+- Protected items in item frames in protected regions.
+- Resolved an issue where explosions of type OTHER_EXPLOSION were ignoring the world 
+    configuration settings.
+- Send item-use blacklist event when right-clicking entities.
+- Transformed the BlockFadeEvent handler into a switch.
+
+5.8:
+- BREAKING CHANGE: This version has been built for versions of Bukkit for MC 1.6.1 and
+  newer. Do not try to use this version of WG on an older Bukkit version.
+- Added support for Minecraft 1.6+. Actual support of new 1.6 additions is dependant on
+    Bukkit. Please use a newer build of Bukkit if, for example, you seem to be unable to
+    add "Horses" to your lists of entities.
+- Added mobs.disable-snowman-trails to disable the trails left by walking snowmen.
+- Added -a flag to /region removeowner and /region removemember to remove all objects.
+- Teleporting is now handled by entry/exit flags. If this is causing people to get
+    entirely stuck inside entry/exit deny regions, set the new setting
+    'use-player-teleports' to 'false' in your configuration.
+- Updated formatting for region commands, especially /region info.
+- Changed permissions checking for /region commands to be more consistent, checking for
+    region IDs as a sub-node. This means that if some permissions for some region
+    commands no longer work, add '.*' to the end of permission lines for WG in your
+    permission plugin.
+
+5.7.5:
+- Refixed a few issues from 5.7.4.
+
+5.7.4:
+- BREAKING CHANGE: Removed the cyan "**" in front of greeting
+  and farewell messages to allow more customizability. You can
+  re-add them by adding "&c**" to the flag.
+- Fixed an issue enderpearling inside exit/entry deny regions.
+- Added checks to players teleporting in and out of exit/entry regions. 
+- Fix bad matching in blocked and allowed command flags.
+- Fixed heal flag bugs when player max health was increased. 
+- Add fishing to xp blocker.
+- Applied other-explosion flag to entity damage as well.
+- Fixed an issue with interaction that should allow blacklisting item use actions with no block involved (eg fishing rods, potions) 
+- Fix witherskull/fireball settings not being differentiated in one case 
+- Allow cow milking in no-build areas
+- Fix infinite durability breaking items instantly.
+
+5.7.3:
+- Fixed the error caused by Bukkit's change of the TNT minecart API.
+
+5.7.2:
+- Updated to MineCraft 1.5.
+- Added TNT Minecart support. They are handled with the same flags/settings as TNT.
+- Added mining and smelting xp handling to the xp drops flag and setting.
+- Fixed a few edge cases for placing items on region borders.
+- Legacy: Fixed issue with //stack not respecting item metadata.
+
+5.7.1:
+- Added a vine growth config option and flag.
+- Added support for many commands to be used from console.
+  Usage is with -w flag and a world name e.g.
+  /rg addmem <id> <player> -w <worldname>
+  /rg flag <id> <flag> -w <worldname> <flagvalue>
+- Fixed bug that blocks placing plants in flower pots.
+- Fixed permissions check for /rg tp
+- Fixed enderchests not being accessible (they are now part of the USE flag)
+- Fixed an issue with slabs being placable in protected regions. This was
+  also fixed in CraftBukkit but has been left in for users running other versions.
+- Fixed wither skulls being handled with other fireballs, despite having their own settings.
+- Fixed item frames being placable on region borders.
+- Fixed a bug that made explosions more ineffective than they should have been.
+- Fixed bonemeal usage in protected regions.
+- Fixed special minecarts being placable in protected regions.
+- Fixed bugs being placable on region borders.
+- Fixed wolves bypassing pvp flags.
+
 5.7:
 - Fixed thread sync issue with FlagStateManager.
 - Fixed dragon egg region protection not working in certain cases.
@@ -23,8 +113,6 @@
    use enderchests, use wooden buttons, and put plants in flower pots.
 - Added mobs.block-zombie-door-destruction setting to stop zombies from
    breaking down doors while difficulty is set to hard.
- Added a texture-pack flag that sends players a texture pack url when in
-    certain regions.

 Thank you to thvortex, Dilandau, tophathacker, and Dark_arc for their contributions this release.

@@ -523,4 +611,4 @@ EduardBaer, TomyLobo, and halvors
 - Added block lag fix.

 1.0
- Initial release.
+- Initial release.
@@ -34,5 +34,5 @@ Links
 * [Mailing list](https://groups.google.com/d/forum/sk-dev-discuss)
 * [IRC channel](http://skq.me/irc/irc.esper.net/sk89q/) (#sk89q on irc.esper.net)
 * [Issue tracker](http://youtrack.sk89q.com/issues/WORLDGUARD)
-* [Continuous integration](http://build.sk89q.com) [![Build Status](https://secure.travis-ci.org/sk89q/worldguard.png)](http://travis-ci.org/sk89q/worldguard)
-* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard)
+* [Continuous integration](http://builds.enginehub.org) [![Build Status](https://secure.travis-ci.org/sk89q/worldguard.png)](http://travis-ci.org/sk89q/worldguard)
+* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard)
@@ -1,240 +1,347 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.sk89q</groupId>
-  <artifactId>worldguard</artifactId>
-  <version>5.7</version>
-  <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers.</description>
-  <licenses>
-    <license>
-      <name>GNU General Public License 2.0</name>
-      <url>LICENSE.txt</url>
-      <distribution>repo</distribution>
-      <comments>License on all contributions</comments>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
-    <url>https://github.com/sk89q/worldguard</url>
-    <tag>master</tag>
-    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
-  </scm>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <repositories>
-    <repository>
-      <id>sk89q-repo</id>
-      <url>http://maven.sk89q.com/repo/</url>
-    </repository>
-    <repository>
-      <id>zml-repo</id>
-      <url>http://files.zachsthings.com/repo</url>
-    </repository>
-    <repository>
-      <id>bukkit-repo</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
-    </repository>
-  </repositories>
-  <dependencies>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>5.4.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.4.5-R1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>commandbook</artifactId>
-      <version>2.1</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.zachsthings.libcomponents</groupId>
-          <artifactId>libcomponents-bukkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.spout</groupId>
-          <artifactId>spoutapi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.nijikokun</groupId>
-      <artifactId>iconomy</artifactId>
-      <version>5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.khelekore</groupId>
-      <artifactId>prtree</artifactId>
-      <version>1.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.opencsv</groupId>
-      <artifactId>opencsv</artifactId>
-      <version>2.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <site>
-      <id>sk89q-docs-upload</id>
-      <url>ftp://sk89q-maven-deploy/worldguard/</url>
-    </site>
-  </distributionManagement>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-    
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-ftp</artifactId>
-         <version>1.0-beta-6</version>
-      </extension>
-    </extensions>
-
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>plugin.yml</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath>defaults/</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>config.yml</include>
-          <include>config_world.yml</include>
-          <include>blacklist.txt</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>true</addMavenDescriptor>
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-            <manifestEntries>
-              <Class-Path>WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>net.sf.opencsv:opencsv</include>
-                  <include>org.khelekore:prtree</include>
-                </includes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <configuration>
-          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
-        </configuration>
-        <executions>
-          <execution>
-            <id>release</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.2.2</version>
-        <configuration>
-          <preparationGoals>assembly:assembly</preparationGoals>
-          <goals>assembly:assembly</goals>
-          <tagNameFormat>@{project.version}</tagNameFormat>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <reportPlugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.5</version>
-            <reportSets>
-              <reportSet>
-                <reports>
-                  <report>license</report>
-                  <report>index</report>
-                </reports>
-              </reportSet>
-            </reportSets>
-          </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.8.1</version>
-            </plugin>
-          </reportPlugins>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.sk89q</groupId>
+  <artifactId>worldguard</artifactId>
+  <version>5.9.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  
+  <!-- Project information -->
+  <name>WorldGuard</name>
+  <description>WorldGuard protects your Minecraft servers.</description>
+  <licenses>
+    <license>
+      <name>GNU General Public License 2.0</name>
+      <url>LICENSE.txt</url>
+      <distribution>repo</distribution>
+      <comments>License on all contributions</comments>
+    </license>
+  </licenses>
+  
+  <issueManagement>
+    <system>YouTrack</system>
+    <url>http://youtrack.sk89q.com</url>
+  </issueManagement>
+  
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>http://build.sk89q.com</url>
+  </ciManagement>
+  
+  <scm>
+    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
+    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
+    <url>https://github.com/sk89q/worldguard</url>
+    <tag>master</tag>
+  </scm>
+  
+  <mailingLists>
+    <mailingList>
+      <name>Developer Discussion</name>
+      <archive>https://groups.google.com/d/forum/sk-dev-discuss</archive>
+    </mailingList>
+  </mailingLists>
+  
+  <distributionManagement>
+    <site>
+      <id>sk89q-docs-upload</id>
+      <url>ftp://sk89q-maven-deploy/worldguard/</url>
+    </site>
+    <repository>
+      <id>maven.sk89q.com</id>
+      <url>http://maven.sk89q.com/artifactory/libs-release-local</url>
+    </repository>
+    <snapshotRepository>
+      <id>maven.sk89q.com-snapshot</id>
+      <url>http://maven.sk89q.com/artifactory/libs-snapshot-local</url>
+    </snapshotRepository>
+  </distributionManagement>
+  
+  <properties> <!-- Fix encoding warnings -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <repositories>
+    <repository>
+      <id>sk89q-repo</id>
+      <url>http://maven.sk89q.com/repo/</url>
+    </repository>
+    <repository>
+      <id>zml-repo</id>
+      <url>http://files.zachsthings.com/repo</url>
+    </repository>
+    <repository>
+      <id>bukkit-repo</id>
+      <url>http://repo.bukkit.org/content/groups/public</url>
+    </repository>
+  </repositories>
+  
+  <dependencies>
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>worldedit</artifactId>
+      <version>5.5.8</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+
+    <!-- Used for running CraftBukkit from within your IDE
+         These are runtime-only dependencies -->
+    <dependency>
+      <groupId>org.sk89q.bukkit</groupId>
+      <artifactId>bukkit-classloader-check</artifactId>
+      <version>1.7.2-R0.3</version>
+      <scope>runtime</scope>
+      <type>jar</type>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.7.2-R0.3</version>
+      <scope>runtime</scope>
+      <type>jar</type>
+      <optional>true</optional>
+    </dependency>
+    <!-- End runtime only -->
+
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.7.2-R0.3</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>commandbook</artifactId>
+      <version>2.3</version>
+      <scope>compile</scope>
+      <type>jar</type>
+      <exclusions>
+        <exclusion>
+          <groupId>com.zachsthings.libcomponents</groupId>
+          <artifactId>libcomponents-bukkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.spout</groupId>
+          <artifactId>spoutapi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.nijikokun</groupId>
+      <artifactId>iconomy</artifactId>
+      <version>5.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.khelekore</groupId>
+      <artifactId>prtree</artifactId>
+      <version>1.5.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>net.sf.opencsv</groupId>
+      <artifactId>opencsv</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+      <type>jar</type>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    
+    <extensions> <!-- Used for uploading the docs -->
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-ftp</artifactId>
+         <version>1.0-beta-6</version>
+      </extension>
+    </extensions>
+
+    <resources>
+      <resource>
+        <targetPath>.</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+        <includes>
+          <include>plugin.yml</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>defaults/</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+        <includes>
+          <include>config.yml</include>
+          <include>config_world.yml</include>
+          <include>blacklist.txt</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>true</addMavenDescriptor>
+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Class-Path>WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>net.sf.opencsv:opencsv</include>
+                  <include>org.khelekore:prtree</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
+        </configuration>
+        <executions>
+          <execution>
+            <id>release</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.4.1</version>
+        <configuration>
+          <preparationGoals>assembly:assembly</preparationGoals>
+          <goals>assembly:assembly</goals>
+          <tagNameFormat>@{project.version}</tagNameFormat>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <version>2.5</version>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>license</report>
+                    <report>index</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+            
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.8.1</version>
+            </plugin>
+          </reportPlugins>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- Attach javadocs and source .jars -->
+    <profile>
+      <id>attach-docs</id>
+      
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.8.1</version>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
@@ -0,0 +1,46 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.command.CommandSender;
+import org.enginehub.util.PermissionModel;
+
+abstract class AbstractPermissionModel implements PermissionModel {
+    
+    private final WorldGuardPlugin plugin;
+    private final CommandSender sender;
+
+    public AbstractPermissionModel(WorldGuardPlugin plugin, CommandSender sender) {
+        this.plugin = plugin;
+        this.sender = sender;
+    }
+    
+    protected WorldGuardPlugin getPlugin() {
+        return plugin;
+    }
+
+    public CommandSender getSender() {
+        return sender;
+    }
+
+    protected boolean hasPluginPermission(String permission) {
+        return plugin.hasPermission(getSender(), "worldguard." + permission);
+    }
+
+}
@@ -29,7 +29,14 @@ import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.ExperienceOrb;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import java.util.List;

@@ -242,6 +249,14 @@ public class BukkitUtil {
        str = str.replace("&2", ChatColor.GRAY.toString());
        str = str.replace("&w", ChatColor.WHITE.toString());

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

@@ -255,26 +270,12 @@ public class BukkitUtil {
        return entity instanceof Item
                || entity instanceof TNTPrimed
                || entity instanceof ExperienceOrb
-                || entity instanceof FallingSand
+                || entity instanceof FallingBlock
                || (entity instanceof LivingEntity
                    && !(entity instanceof Tameable)
                    && !(entity instanceof Player));
    }

-    /**
-     * Returns whether our running CraftBukkit already supports
-     * the HangingEvent instead of the PaintingEvent
-     *
-     * @return true if the hanging event is supported
-     */
-    public static boolean hasHangingEvent() {
-        Class<?> tmp = null;
-        try {
-            tmp = Class.forName("org.bukkit.event.hanging.HangingEvent");
-        } catch (ClassNotFoundException ignored) { }
-        return (tmp != null);
-    }
-
    /**
     * Search an enum for a value, and return the first one found. Return null if the
     * enum entry is not found.
@@ -99,6 +99,7 @@ public class ConfigurationManager {
    public boolean activityHaltToggle = false;
    public boolean autoGodMode;
    public boolean usePlayerMove;
+    public boolean usePlayerTeleports;
    public boolean deopOnJoin;
    public boolean blockInGameOp;
    public Map<String, String> hostKeys = new HashMap<String, String>();
@@ -144,6 +145,7 @@ public class ConfigurationManager {
        autoGodMode = config.getBoolean("auto-invincible", config.getBoolean("auto-invincible-permission", false));
        config.removeProperty("auto-invincible-permission");
        usePlayerMove = config.getBoolean("use-player-move-event", true);
+        usePlayerTeleports = config.getBoolean("use-player-teleports", true);

        deopOnJoin = config.getBoolean("security.deop-everyone-on-join", false);
        blockInGameOp = config.getBoolean("security.block-in-game-op-command", false);
@@ -59,7 +59,8 @@ public class FlagStateManager implements Runnable {
    /**
     * Run the task.
     */
-    public void run() {
+    @Override
+	public void run() {
        Player[] players = plugin.getServer().getOnlinePlayers();
        ConfigurationManager config = plugin.getGlobalStateManager();

@@ -112,14 +113,22 @@ public class FlagStateManager implements Runnable {

        Integer healAmount = applicable.getFlag(DefaultFlag.HEAL_AMOUNT);
        Integer healDelay = applicable.getFlag(DefaultFlag.HEAL_DELAY);
-        Integer minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
-        Integer maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);
+        Double minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
+        Double maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);

        if (healAmount == null || healDelay == null || healAmount == 0 || healDelay < 0) {
            return;
        }
-        if (minHealth == null) minHealth = 0;
-        if (maxHealth == null) maxHealth = 20;
+        if (minHealth == null) {
+			minHealth = 0.0;
+		}
+        if (maxHealth == null) {
+			maxHealth = player.getMaxHealth();
+		}
+
+        // Apply a cap to prevent possible exceptions
+        minHealth = Math.min(player.getMaxHealth(), minHealth);
+        maxHealth = Math.min(player.getMaxHealth(), maxHealth);

        if (player.getHealth() >= maxHealth && healAmount > 0) {
            return;
@@ -155,8 +164,16 @@ public class FlagStateManager implements Runnable {
        if (feedAmount == null || feedDelay == null || feedAmount == 0 || feedDelay < 0) {
            return;
        }
-        if (minHunger == null) minHunger = 0;
-        if (maxHunger == null) maxHunger = 20;
+        if (minHunger == null) {
+			minHunger = 0;
+		}
+        if (maxHunger == null) {
+			maxHunger = 20;
+		}
+
+        // Apply a cap to prevent possible exceptions
+        minHunger = Math.min(20, minHunger);
+        maxHunger = Math.min(20, maxHunger);

        if (player.getFoodLevel() >= maxHunger && feedAmount > 0) {
            return;
@@ -164,10 +181,12 @@ public class FlagStateManager implements Runnable {

        if (feedDelay <= 0) {
            player.setFoodLevel(feedAmount > 0 ? maxHunger : minHunger);
+            player.setSaturation(player.getFoodLevel());
            state.lastFeed = now;
        } else if (now - state.lastFeed > feedDelay * 1000) {
            // clamp health between minimum and maximum
            player.setFoodLevel(Math.min(maxHunger, Math.max(minHunger, player.getFoodLevel() + feedAmount)));
+            player.setSaturation(player.getFoodLevel());
            state.lastFeed = now;
        }
    }
@@ -0,0 +1,145 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+/**
+ * Used for querying region-related permissions.
+ */
+public class RegionPermissionModel extends AbstractPermissionModel {
+    
+    public RegionPermissionModel(WorldGuardPlugin plugin, CommandSender sender) {
+        super(plugin, sender);
+    }
+    
+    public boolean mayForceLoadRegions() {
+        return hasPluginPermission("region.load");
+    }
+    
+    public boolean mayForceSaveRegions() {
+        return hasPluginPermission("region.save");
+    }
+    
+    public boolean mayMigrateRegionStore() {
+        return hasPluginPermission("region.migratedb");
+    }
+    
+    public boolean mayDefine() {
+        return hasPluginPermission("region.define");
+    }
+    
+    public boolean mayRedefine(ProtectedRegion region) {
+        return hasPatternPermission("redefine", region);
+    }
+    
+    public boolean mayClaim() {
+        return hasPluginPermission("region.claim");
+    }
+    
+    public boolean mayClaimRegionsUnbounded() {
+        return hasPluginPermission("region.unlimited");
+    }
+    
+    public boolean mayDelete(ProtectedRegion region) {
+        return hasPatternPermission("remove", region);
+    }
+    
+    public boolean maySetPriority(ProtectedRegion region) {
+        return hasPatternPermission("setpriority", region);
+    }
+    
+    public boolean maySetParent(ProtectedRegion child, ProtectedRegion parent) {
+        return hasPatternPermission("setparent", child) &&
+                (parent == null ||
+                hasPatternPermission("setparent", parent));
+    }
+    
+    public boolean maySelect(ProtectedRegion region) {
+        return hasPatternPermission("select", region);
+    }
+    
+    public boolean mayLookup(ProtectedRegion region) {
+        return hasPatternPermission("info", region);
+    }
+    
+    public boolean mayTeleportTo(ProtectedRegion region) {
+        return hasPatternPermission("teleport", region);
+    }
+    
+    public boolean mayList() {
+        return hasPluginPermission("region.list");
+    }
+    
+    public boolean mayList(String targetPlayer) {
+        if (targetPlayer == null) {
+            return mayList();
+        }
+        
+        if (targetPlayer.equalsIgnoreCase(getSender().getName())) {
+            return hasPluginPermission("region.list.own");
+        } else {
+            return mayList();
+        }
+    }
+    
+    public boolean maySetFlag(ProtectedRegion region) {
+        return hasPatternPermission("flag.regions", region);
+    }
+    
+    public boolean maySetFlag(ProtectedRegion region, Flag<?> flag) {
+        // This is a WTF permission
+        return hasPatternPermission(
+                "flag.flags." + flag.getName().toLowerCase(), region);
+    }
+    
+    /**
+     * Checks to see if the given sender has permission to modify the given region
+     * using the region permission pattern.
+     * 
+     * @param perm the name of the node
+     * @param region the region
+     */
+    private boolean hasPatternPermission(String perm, ProtectedRegion region) {
+        if (!(getSender() instanceof Player)) {
+            return true; // Non-players (i.e. console, command blocks, etc.) have full power
+        }
+        
+        LocalPlayer localPlayer = getPlugin().wrapPlayer((Player) getSender());
+        String idLower = region.getId().toLowerCase();
+        String effectivePerm;
+        
+        if (region.isOwner(localPlayer)) {
+            return hasPluginPermission("region." + perm + ".own." + idLower) ||
+                    hasPluginPermission("region." + perm + ".member." + idLower);
+        } else if (region.isMember(localPlayer)) {
+            return hasPluginPermission("region." + perm + ".member." + idLower);
+        } else {
+            effectivePerm = "region." + perm + "." + idLower;
+        }
+
+        return hasPluginPermission(effectivePerm);
+    }
+
+}
@@ -122,9 +122,15 @@ public class ReportWriter {
        Class<? extends ConfigurationManager> cls = config.getClass();
        for (Field field : cls.getFields()) {
            try {
-                if (field.getName().equalsIgnoreCase("CONFIG_HEADER")) continue;
+                String name = field.getName();
+                // store these elsewhere maybe?
+                if (name.equals("CONFIG_HEADER")
+                    || name.equals("hostKeys")
+                    || name.equals("sqlPassword")) {
+                        continue;
+                }
                Object val = field.get(config);
-                configLog.put(field.getName(), val);
+                configLog.put(name, val);
            } catch (IllegalArgumentException e) {
                e.printStackTrace();
            } catch (IllegalAccessException ignore) {
@@ -231,7 +237,7 @@ public class ReportWriter {
            for (Map.Entry<Class<? extends Entity>, Integer> entry
                    : entityCounts.entrySet()) {
                entitiesLog.put(entry.getKey().getSimpleName(),
-                        "%d [%f]",
+                        "%d [%f/chunk]",
                        entry.getValue(),
                        (float) (entry.getValue() / (double) loadedChunkCount));
            }
@@ -18,7 +18,6 @@

 package com.sk89q.worldguard.bukkit;

-import org.bukkit.Bukkit;
 import org.bukkit.World;

 import com.sk89q.worldguard.protection.managers.RegionManager;
@@ -27,7 +26,6 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
 * Helper class to get a reference to WorldGuard and its components.
 */
 public class WGBukkit {
-    private static WorldGuardPlugin cachedPlugin = null;

    private WGBukkit() {
    }
@@ -43,17 +41,16 @@ public class WGBukkit {
     * @return the WorldGuard plugin or null
     */
    public static WorldGuardPlugin getPlugin() {
-        if (cachedPlugin == null) {
-            cachedPlugin = (WorldGuardPlugin) Bukkit.getServer().getPluginManager().getPlugin("WorldGuard");
-        }
-        return cachedPlugin;
+        return WorldGuardPlugin.inst();
    }

    /**
     * Set cache to null for reload WorldGuardPlugin
+     * @deprecated instance is now stored directly in {@link WorldGuardPlugin}
     */
+    @Deprecated
    public static void cleanCache() {
-        cachedPlugin = null;
+        // do nothing - plugin instance is stored in plugin class now
    }

    /**
@@ -67,7 +64,7 @@ public class WGBukkit {
        if (getPlugin() == null) {
            return null;
        }
-        return cachedPlugin.getRegionManager(world);
+        return WorldGuardPlugin.inst().getRegionManager(world);
    }

 }
@@ -75,6 +75,7 @@ public class WorldConfiguration {
    private ChestProtection chestProtection = new SignChestProtection();

    /* Configuration data start */
+    public boolean summaryOnStart;
    public boolean opPermissions;
    public boolean fireSpreadDisableToggle;
    public boolean itemDurability;
@@ -129,6 +130,7 @@ public class WorldConfiguration {
    public boolean highFreqFlags;
    public int regionWand;
    public Set<EntityType> blockCreatureSpawn;
+    public boolean allowTamedSpawns;
    // public boolean useiConomy;
    // public boolean buyOnClaim;
    // public double buyOnClaimPrice;
@@ -158,13 +160,19 @@ public class WorldConfiguration {
    public boolean disableLeafDecay;
    public boolean disableGrassGrowth;
    public boolean disableMyceliumSpread;
+    public boolean disableVineGrowth;
    public boolean disableEndermanGriefing;
+    public boolean disableSnowmanTrails;
+    public boolean disableSoilDehydration;
+    public Set<Integer> allowedSnowFallOver;
    public boolean regionInvinciblityRemovesMobs;
+    public boolean explosionFlagCancellation;
    public boolean disableDeathMessages;
    public boolean disableObsidianGenerators;

    private Map<String, Integer> maxRegionCounts;

+
    /* Configuration data end */

    /**
@@ -189,7 +197,9 @@ public class WorldConfiguration {
        config = new YAMLProcessor(configFile, true, YAMLFormat.EXTENDED);
        loadConfiguration();

-        plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
+        if (summaryOnStart) {
+            plugin.getLogger().info("Loaded configuration for world '" + worldName + "'");
+        }
    }

    private boolean getBoolean(String node, boolean def) {
@@ -295,6 +305,7 @@ public class WorldConfiguration {
            e.printStackTrace();
        }

+        summaryOnStart = getBoolean("summary-on-start", true);
        opPermissions = getBoolean("op-permissions", true);

        itemDurability = getBoolean("protection.item-durability", true);
@@ -347,7 +358,9 @@ public class WorldConfiguration {
        blockFireballExplosions = getBoolean("mobs.block-fireball-explosions", false);
        blockFireballBlockDamage = getBoolean("mobs.block-fireball-block-damage", false);
        antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
+        allowTamedSpawns = getBoolean("mobs.allow-tamed-spawns", true);
        disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
+        disableSnowmanTrails = getBoolean("mobs.disable-snowman-trails", false);
        blockEntityPaintingDestroy = getBoolean("mobs.block-painting-destroy", false);
        blockEntityItemFrameDestroy = getBoolean("mobs.block-item-frame-destroy", false);
        blockPluginSpawning = getBoolean("mobs.block-plugin-spawning", true);
@@ -392,9 +405,13 @@ public class WorldConfiguration {
        disableLeafDecay = getBoolean("dynamics.disable-leaf-decay", false);
        disableGrassGrowth = getBoolean("dynamics.disable-grass-growth", false);
        disableMyceliumSpread = getBoolean("dynamics.disable-mycelium-spread", false);
+        disableVineGrowth = getBoolean("dynamics.disable-vine-growth", false);
+        disableSoilDehydration = getBoolean("dynamics.disable-soil-dehydration", false);
+        allowedSnowFallOver = new HashSet<Integer>(getIntList("dynamics.snow-fall-blocks", null));

        useRegions = getBoolean("regions.enable", true);
        regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
+        explosionFlagCancellation = getBoolean("regions.explosion-flags-block-entity-damage", true);
        highFreqFlags = getBoolean("regions.high-frequency-flags", false);
        regionWand = getInt("regions.wand", 334);
        maxClaimVolume = getInt("regions.max-claim-volume", 30000);
@@ -464,7 +481,9 @@ public class WorldConfiguration {
                this.blacklist = null;
            } else {
                this.blacklist = blist;
-                plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
+                if (summaryOnStart) {
+                    plugin.getLogger().log(Level.INFO, "Blacklist loaded.");
+                }

                BlacklistLogger blacklistLogger = blist.getLogger();

@@ -490,7 +509,7 @@ public class WorldConfiguration {
        }

        // Print an overview of settings
-        if (getBoolean("summary-on-start", true)) {
+        if (summaryOnStart) {
            plugin.getLogger().log(Level.INFO, blockTNTExplosions
                    ? "(" + worldName + ") TNT ignition is blocked."
                    : "(" + worldName + ") TNT ignition is PERMITTED.");
@@ -575,7 +594,9 @@ public class WorldConfiguration {
        for (String group : plugin.getGroups(player)) {
            if (maxRegionCounts.containsKey(group)) {
                int groupMax = maxRegionCounts.get(group);
-                if (max < groupMax) max = groupMax;
+                if (max < groupMax) {
+                    max = groupMax;
+                }
            }
        }
        if (max <= -1) {
@@ -18,7 +18,7 @@
 */
 package com.sk89q.worldguard.bukkit;

-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.*;

 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -26,6 +26,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Snowman;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -33,6 +34,7 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockBurnEvent;
 import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.block.BlockDispenseEvent;
+import org.bukkit.event.block.BlockExpEvent;
 import org.bukkit.event.block.BlockFadeEvent;
 import org.bukkit.event.block.BlockFormEvent;
 import org.bukkit.event.block.BlockFromToEvent;
@@ -44,6 +46,7 @@ import org.bukkit.event.block.BlockPistonRetractEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.block.BlockRedstoneEvent;
 import org.bukkit.event.block.BlockSpreadEvent;
+import org.bukkit.event.block.EntityBlockFormEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.inventory.ItemStack;
@@ -139,7 +142,7 @@ public class WorldGuardBlockListener implements Listener {
            if (held.getTypeId() > 0
                    && !(ItemType.usesDamageValue(held.getTypeId())
                    || BlockType.usesData(held.getTypeId()))) {
-                held.setDurability((short) -1);
+                held.setDurability((short) 0);
                player.setItemInHand(held);
            }
        }
@@ -263,8 +266,9 @@ public class WorldGuardBlockListener implements Listener {
        }

        if (wcfg.disableObsidianGenerators && (isAir || isLava)
-                && blockTo.getTypeId() == 55) {
-            blockTo.setTypeId(0);
+                && (blockTo.getTypeId() == BlockID.REDSTONE_WIRE
+                    || blockTo.getTypeId() == BlockID.TRIPWIRE)) {
+            blockTo.setTypeId(BlockID.AIR);
            return;
        }
    }
@@ -338,12 +342,11 @@ public class WorldGuardBlockListener implements Listener {
            if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
                LocalPlayer localPlayer = plugin.wrapPlayer(player);

+                // this is preliminarily handled in the player listener under handleBlockRightClick
+                // why it's handled here too, no one knows
                if (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL) {
-                    if (!set.canBuild(localPlayer)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                    if (!set.allows(DefaultFlag.LIGHTER, localPlayer)
+                    if (!set.allows(DefaultFlag.LIGHTER)
+                            && !set.canBuild(localPlayer)
                            && !plugin.hasPermission(player, "worldguard.override.lighter")) {
                        event.setCancelled(true);
                        return;
@@ -683,6 +686,16 @@ public class WorldGuardBlockListener implements Listener {

        int type = event.getNewState().getTypeId();

+        if (event instanceof EntityBlockFormEvent) {
+            if (((EntityBlockFormEvent) event).getEntity() instanceof Snowman) {
+                if (wcfg.disableSnowmanTrails) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            return;
+        }
+
        if (type == BlockID.ICE) {
            if (wcfg.disableIceFormation) {
                event.setCancelled(true);
@@ -700,6 +713,14 @@ public class WorldGuardBlockListener implements Listener {
                event.setCancelled(true);
                return;
            }
+            if (wcfg.allowedSnowFallOver.size() > 0) {
+                int targetId = event.getBlock().getRelative(0, -1, 0).getTypeId();
+
+                if (!wcfg.allowedSnowFallOver.contains(targetId)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
                    DefaultFlag.SNOW_FALL, event.getBlock().getLocation())) {
                event.setCancelled(true);
@@ -760,6 +781,20 @@ public class WorldGuardBlockListener implements Listener {
                return;
            }
        }
+
+        if (fromType == BlockID.VINE) {
+            if (wcfg.disableVineGrowth) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions
+                    && !plugin.getGlobalRegionManager().allows(
+                            DefaultFlag.VINE_GROWTH, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
    }

    /*
@@ -771,31 +806,46 @@ public class WorldGuardBlockListener implements Listener {
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());

-        int type = event.getBlock().getTypeId();
-
-        if (type == BlockID.ICE) {
+        switch (event.getBlock().getTypeId()) {
+        case BlockID.ICE:
            if (wcfg.disableIceMelting) {
                event.setCancelled(true);
                return;
            }
+
            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
                    DefaultFlag.ICE_MELT, event.getBlock().getLocation())) {
                event.setCancelled(true);
                return;
            }
-        }
+            break;

-        if (type == BlockID.SNOW) {
+        case BlockID.SNOW:
            if (wcfg.disableSnowMelting) {
                event.setCancelled(true);
                return;
            }
+
            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
                    DefaultFlag.SNOW_MELT, event.getBlock().getLocation())) {
                event.setCancelled(true);
                return;
            }
+            break;
+
+        case BlockID.SOIL:
+            if (wcfg.disableSoilDehydration) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.SOIL_DRY, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+            break;
        }
+
    }

    /*
@@ -858,4 +908,18 @@ public class WorldGuardBlockListener implements Listener {
            }
        }
    }
+
+    /*
+     * Called when a block yields exp
+     */
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockExp(BlockExpEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getBlock().getLocation())) {
+            event.setExpToDrop(0);
+        }
+    }
+
 }
@@ -20,11 +20,11 @@ package com.sk89q.worldguard.bukkit;

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

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

 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Creature;
@@ -35,13 +35,18 @@ import org.bukkit.entity.Enderman;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Fireball;
+import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Slime;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.ThrownPotion;
+import org.bukkit.entity.Wither;
+import org.bukkit.entity.WitherSkull;
 import org.bukkit.entity.Wolf;
+import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -60,6 +65,7 @@ import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityInteractEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.ExpBottleEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PigZapEvent;
@@ -67,6 +73,7 @@ import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
+import org.bukkit.projectiles.ProjectileSource;

 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BlockID;
@@ -86,9 +93,6 @@ 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;
@@ -97,10 +101,6 @@ 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");
    }

    /**
@@ -119,12 +119,24 @@ public class WorldGuardEntityListener implements Listener {
        WorldConfiguration wcfg = cfg.get(entity.getWorld());

        if (block.getTypeId() == BlockID.SOIL) {
-            if (entity instanceof Creature && wcfg.disableCreatureCropTrampling) {
+            if (/* entity instanceof Creature && // catch for any entity (not thrown for players) */
+                wcfg.disableCreatureCropTrampling) {
                event.setCancelled(true);
            }
        }
    }

+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onExpBottle(ExpBottleEvent event) {
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
+
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getEntity().getLocation())) {
+            event.setExperience(0);
+            // event.setShowEffect(false); // don't want to cancel the bottle entirely I suppose, just the exp
+        }
+    }
+
    @EventHandler(priority = EventPriority.HIGH)
    public void onEntityDeath(EntityDeathEvent event) {
        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
@@ -181,7 +193,21 @@ public class WorldGuardEntityListener implements Listener {
                return;
            }

-            if (wcfg.disableExplosionDamage && type == DamageCause.BLOCK_EXPLOSION) {
+            if (type == DamageCause.BLOCK_EXPLOSION
+                    && (wcfg.disableExplosionDamage || wcfg.blockOtherExplosions
+                            || (wcfg.explosionFlagCancellation
+                                && !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, player.getLocation())))) {
+                event.setCancelled(true);
+                return;
+            }
+        } else {
+
+            // for whatever reason, plugin-caused explosions with a null entity count as block explosions and aren't
+            // handled anywhere else
+            if (type == DamageCause.BLOCK_EXPLOSION
+                    && (wcfg.blockOtherExplosions
+                            || (wcfg.explosionFlagCancellation
+                                && !plugin.getGlobalRegionManager().allows(DefaultFlag.OTHER_EXPLOSION, defender.getLocation())))) {
                event.setCancelled(true);
                return;
            }
@@ -200,6 +226,7 @@ public class WorldGuardEntityListener implements Listener {

        if (attacker instanceof Player) {
            Player player = (Player) attacker;
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            ConfigurationManager cfg = plugin.getGlobalStateManager();
            WorldConfiguration wcfg = cfg.get(player.getWorld());
@@ -216,6 +243,36 @@ public class WorldGuardEntityListener implements Listener {
                    }
                }
            }
+
+            // Bukkit doesn't consider Slimes to be Creatures for whatever reason
+            if (defender instanceof Creature || defender instanceof Slime) {
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    Vector pt2 = toVector(attacker.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+
+                    // Accumulate all entities that aren't allowed to be attacked here
+                    Set<EntityType> entityTypes = new HashSet<EntityType>();
+                    Set<EntityType> es = mgr.getApplicableRegions(pt).getFlag(DefaultFlag.DENY_PVM, localPlayer);
+                    Set<EntityType> es2 = mgr.getApplicableRegions(pt2).getFlag(DefaultFlag.DENY_PVM, localPlayer);
+
+                    if (es != null) entityTypes.addAll(es);
+                    if (es2 != null) entityTypes.addAll(es2);
+
+                    if (entityTypes.contains(defender.getType())) {
+                        player.sendMessage(ChatColor.DARK_RED + "You may not attack that mob here.");
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        }
+
+        if (defender instanceof ItemFrame) {
+            if (checkItemFrameProtection(attacker, (ItemFrame) defender)) {
+                event.setCancelled(true);
+                return;
+            }
        }

        if (defender instanceof Player) {
@@ -251,28 +308,41 @@ public class WorldGuardEntityListener implements Listener {
            }

            if (attacker != null) {
-                if (attacker instanceof Player) {
-                    if (wcfg.useRegions) {
-                        Vector pt = toVector(defender.getLocation());
-                        Vector pt2 = toVector(attacker.getLocation());
-                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    Vector pt2 = toVector(attacker.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());

+                    if (attacker instanceof Player) {
                        if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
                            tryCancelPVPEvent((Player) attacker, player, event, true);
                        } else if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP ,localPlayer)) {
                            tryCancelPVPEvent((Player) attacker, player, event, false);
                        }
+                    } else {
+                        // Accumulate all entities that aren't allowed to be attacked here
+                        Set<EntityType> entityTypes = new HashSet<EntityType>();
+                        Set<EntityType> es = mgr.getApplicableRegions(pt).getFlag(DefaultFlag.DENY_PVM, localPlayer);
+                        Set<EntityType> es2 = mgr.getApplicableRegions(pt2).getFlag(DefaultFlag.DENY_PVM, localPlayer);
+
+                        if (es != null) entityTypes.addAll(es);
+                        if (es2 != null) entityTypes.addAll(es2);
+
+                        if (entityTypes.contains(attacker.getType())) {
+                            event.setCancelled(true);
+                            return;
+                        }
                    }
                }

-                if (attacker instanceof TNTPrimed) {
+                if (attacker instanceof TNTPrimed || attacker instanceof ExplosiveMinecart) {

                    // The check for explosion damage should be handled already... But... What ever...
                    if (wcfg.blockTNTExplosions) {
                        event.setCancelled(true);
                        return;
                    }
-                    if (wcfg.useRegions) {
+                    if (wcfg.useRegions && wcfg.explosionFlagCancellation) {
                        Vector pt = toVector(defender.getLocation());
                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
@@ -284,9 +354,16 @@ public class WorldGuardEntityListener implements Listener {
                }

                if (attacker instanceof Fireball) {
-                    if (wcfg.blockFireballExplosions) {
-                        event.setCancelled(true);
-                        return;
+                    if (attacker instanceof WitherSkull) {
+                        if (wcfg.blockWitherSkullExplosions) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    } else {
+                        if (wcfg.blockFireballExplosions) {
+                            event.setCancelled(true);
+                            return;
+                        }
                    }
                    if (wcfg.useRegions) {
                        Fireball fireball = (Fireball) attacker;
@@ -294,14 +371,14 @@ public class WorldGuardEntityListener implements Listener {
                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
                        if (fireball.getShooter() instanceof Player) {
-                            Vector pt2 = toVector(fireball.getShooter().getLocation());
+                            Vector pt2 = toVector(((Player) fireball.getShooter()).getLocation());
                            if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) fireball.getShooter()))) {
                                tryCancelPVPEvent((Player) fireball.getShooter(), player, event, true);
                            } else if (!set.allows(DefaultFlag.PVP, localPlayer)) {
                                tryCancelPVPEvent((Player) fireball.getShooter(), player, event, false);
                            }
                        } else {
-                            if (!set.allows(DefaultFlag.GHAST_FIREBALL, localPlayer)) {
+                            if (!set.allows(DefaultFlag.GHAST_FIREBALL, localPlayer) && wcfg.explosionFlagCancellation) {
                                event.setCancelled(true);
                                return;
                            }
@@ -326,19 +403,36 @@ public class WorldGuardEntityListener implements Listener {
                        RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
                        ApplicableRegionSet set = mgr.getApplicableRegions(pt);

-                        if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
+                        if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer) && !(attacker instanceof Tameable)) {
                            event.setCancelled(true);
                            return;
                        }

                        if (attacker instanceof Creeper) {
-                            if (!set.allows(DefaultFlag.CREEPER_EXPLOSION, localPlayer)) {
+                            if (!set.allows(DefaultFlag.CREEPER_EXPLOSION, localPlayer) && wcfg.explosionFlagCancellation) {
                                event.setCancelled(true);
                                return;
                            }
                        }
+                        if (attacker instanceof Tameable) {
+                            if (((Tameable) attacker).getOwner() == null) {
+                                if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
+                                    event.setCancelled(true);
+                                    return;
+                                }
+                            }
+                            if (!(((Tameable) attacker).getOwner() instanceof Player)) {
+                                return;
+                            }
+                            Player beastMaster = (Player) ((Tameable) attacker).getOwner();
+                            Vector pt2 = toVector(attacker.getLocation());
+                            if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer(beastMaster))) {
+                                tryCancelPVPEvent(beastMaster, player, event, true);
+                            } else if (!set.allows(DefaultFlag.PVP, localPlayer)) {
+                                tryCancelPVPEvent(beastMaster, player, event, false);
+                            }
+                        }
                    }
-
                }
            }
        }
@@ -346,7 +440,50 @@ public class WorldGuardEntityListener implements Listener {

    private void onEntityDamageByProjectile(EntityDamageByEntityEvent event) {
        Entity defender = event.getEntity();
-        Entity attacker = ((Projectile) event.getDamager()).getShooter();
+        Entity attacker;
+        ProjectileSource source = ((Projectile) event.getDamager()).getShooter();
+        if (source instanceof LivingEntity) {
+            attacker = (LivingEntity) source;
+        } else {
+            return;
+        }
+
+        if (attacker instanceof Player) {
+            Player player = (Player) attacker;
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            ConfigurationManager cfg = plugin.getGlobalStateManager();
+            WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+            if (event.getDamager() instanceof EnderPearl && attacker.equals(defender)) return;
+            if (wcfg.useRegions) {
+                Vector pt = toVector(defender.getLocation());
+                Vector pt2 = toVector(attacker.getLocation());
+                RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+
+                if (defender instanceof Player) {
+                    if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
+                        tryCancelPVPEvent((Player) attacker, player, event, true);
+                    } else if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP, localPlayer)) {
+                        tryCancelPVPEvent((Player) attacker, player, event, false);
+                    }
+                } else {
+                    // Accumulate all entities that aren't allowed to be attacked here
+                    Set<EntityType> entityTypes = new HashSet<EntityType>();
+                    Set<EntityType> es = mgr.getApplicableRegions(pt).getFlag(DefaultFlag.DENY_PVM, localPlayer);
+                    Set<EntityType> es2 = mgr.getApplicableRegions(pt2).getFlag(DefaultFlag.DENY_PVM, localPlayer);
+
+                    if (es != null) entityTypes.addAll(es);
+                    if (es2 != null) entityTypes.addAll(es2);
+
+                    if (entityTypes.contains(defender.getType())) {
+                        player.sendMessage(ChatColor.DARK_RED + "You may not attack that mob here.");
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        }

        if (defender instanceof Player) {
            Player player = (Player) defender;
@@ -362,38 +499,41 @@ public class WorldGuardEntityListener implements Listener {
            }

            // Check Mob
-            if (attacker != null && attacker instanceof LivingEntity && !(attacker instanceof Player)) {
+            if (!(attacker instanceof Player)) {
                if (wcfg.disableMobDamage) {
                    event.setCancelled(true);
                    return;
                }
+
                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.MOB_DAMAGE, localPlayer)) {
                        event.setCancelled(true);
                        return;
                    }
-                }
-            }

-            // Check Player
-            // if (event.getDamager() instanceof EnderPearl || event.getDamager() instanceof Snowball) return;
-            if (attacker != null && attacker instanceof Player) {
-                if (event.getDamager() instanceof EnderPearl && attacker == player) return;
-                if (wcfg.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    Vector pt2 = toVector(attacker.getLocation());
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                    // Accumulate all entities that aren't allowed to be attacked here
+                    Set<EntityType> entityTypes = new HashSet<EntityType>();
+                    Set<EntityType> es = mgr.getApplicableRegions(pt).getFlag(DefaultFlag.DENY_PVM, localPlayer);
+                    Set<EntityType> es2 = mgr.getApplicableRegions(pt2).getFlag(DefaultFlag.DENY_PVM, localPlayer);

-                    if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer((Player) attacker))) {
-                        tryCancelPVPEvent((Player) attacker, player, event, true);
-                    } else if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP, localPlayer)) {
-                        tryCancelPVPEvent((Player) attacker, player, event, false);
+                    if (es != null) entityTypes.addAll(es);
+                    if (es2 != null) entityTypes.addAll(es2);
+
+                    if (entityTypes.contains(attacker.getType())) {
+                        event.setCancelled(true);
+                        return;
                    }
                }
            }
+        } else if (defender instanceof ItemFrame) {
+            if (checkItemFrameProtection(attacker, (ItemFrame) defender)) {
+                event.setCancelled(true);
+                return;
+            }
        }

    }
@@ -482,7 +622,7 @@ public class WorldGuardEntityListener implements Listener {
                return;
            }

-           if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
+            if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
                BukkitUtil.findFreePosition(player);
                event.setCancelled(true);
                return;
@@ -531,128 +671,109 @@ public class WorldGuardEntityListener implements Listener {
            return;
        }

-        // Not all explosions come from an entity
-        if (ent != null) {
-            if (ent.getType() == witherType) {
-                if (wcfg.blockWitherBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.blockWitherExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
+        if (ent instanceof Creeper) {
+            if (wcfg.blockCreeperExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockCreeperBlockDamage) {
+                event.blockList().clear();
+                return;
            }

-            if (ent.getType() == witherSkullType) {
-                if (wcfg.blockWitherSkullBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);

+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.CREEPER_EXPLOSION)) {
+                        event.blockList().clear();
+                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof EnderDragon) {
+            if (wcfg.blockEnderDragonBlockDamage) {
+                event.blockList().clear();
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
+                        event.blockList().clear();
+                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof TNTPrimed || ent instanceof ExplosiveMinecart) {
+            if (wcfg.blockTNTExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockTNTBlockDamage) {
+                event.blockList().clear();
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.TNT)) {
+                        event.blockList().clear();
+                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof Fireball) {
+            if (ent instanceof WitherSkull) {
                if (wcfg.blockWitherSkullExplosions) {
                    event.setCancelled(true);
                    return;
                }
-            }
-
-            if (ent instanceof Creeper) {
-                if (wcfg.blockCreeperBlockDamage) {
+                if (wcfg.blockWitherSkullBlockDamage) {
                    event.blockList().clear();
-                    event.setCancelled(true);
                    return;
                }
-
-                if (wcfg.blockCreeperExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    if (wcfg.useRegions) {
-                        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                        for (Block block : event.blockList()) {
-                            if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.CREEPER_EXPLOSION)) {
-                                event.blockList().clear();
-                                event.setCancelled(true);
-                                return;
-                            }
-                        }
-                    }
-                }
-            } else if (ent instanceof EnderDragon) {
-                if (wcfg.blockEnderDragonBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                    for (Block block : event.blockList()) {
-                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.ENDERDRAGON_BLOCK_DAMAGE)) {
-                            event.blockList().clear();
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                }
-            } else if (ent instanceof TNTPrimed) {
-                if (wcfg.blockTNTBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.blockTNTExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                    for (Block block : event.blockList()) {
-                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.TNT)) {
-                            event.blockList().clear();
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                }
-            } else if (ent instanceof Fireball) {
-                if (wcfg.blockFireballBlockDamage) {
-                    event.blockList().clear();
-                    event.setCancelled(true);
-                    return;
-                }
-
+            } else {
                if (wcfg.blockFireballExplosions) {
                    event.setCancelled(true);
                    return;
                }
+                if (wcfg.blockFireballBlockDamage) {
+                    event.blockList().clear();
+                    return;
+                }
+            }
+            // allow wither skull blocking since there is no dedicated flag atm
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);

-                if (wcfg.useRegions) {
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                    for (Block block : event.blockList()) {
-                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.GHAST_FIREBALL)) {
-                            event.blockList().clear();
-                            event.setCancelled(true);
-                            return;
-                        }
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.GHAST_FIREBALL)) {
+                        event.blockList().clear();
+                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
+                        return;
                    }
                }
            }
-        } else {
-            // null entity, caused by another plugin or so
-            if (wcfg.blockOtherExplosions) {
+        } else if (ent instanceof Wither) {
+            if (wcfg.blockWitherExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.blockWitherBlockDamage) {
                event.blockList().clear();
+                return;
+            }
+        } else {
+            // unhandled entity
+            if (wcfg.blockOtherExplosions) {
                event.setCancelled(true);
                return;
            }
@@ -661,12 +782,14 @@ public class WorldGuardEntityListener implements Listener {
                for (Block block : event.blockList()) {
                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.OTHER_EXPLOSION)) {
                        event.blockList().clear();
+                        if (wcfg.explosionFlagCancellation) event.setCancelled(true);
                        return;
                    }
                }
            }
        }

+
        if (wcfg.signChestProtection) {
            for (Block block : event.blockList()) {
                if (wcfg.isChestProtected(block)) {
@@ -693,31 +816,28 @@ public class WorldGuardEntityListener implements Listener {
            return;
        }

-        if (event.getEntityType() == witherType) {
+        if (event.getEntityType() == EntityType.WITHER) {
            if (wcfg.blockWitherExplosions) {
                event.setCancelled(true);
                return;
            }
-        }
-        else if (event.getEntityType() == witherSkullType) {
+        } else if (event.getEntityType() == EntityType.WITHER_SKULL) {
            if (wcfg.blockWitherSkullExplosions) {
                event.setCancelled(true);
                return;
            }
-        }
-        else if (event.getEntityType() == fireballType) {
+        } else if (event.getEntityType() == EntityType.FIREBALL) {
            if (wcfg.blockFireballExplosions) {
                event.setCancelled(true);
                return;
            }
-        }
-        else if (event.getEntityType() == EntityType.CREEPER) {
+        } else if (event.getEntityType() == EntityType.CREEPER) {
            if (wcfg.blockCreeperExplosions) {
                event.setCancelled(true);
                return;
            }
-        }
-        else if (event.getEntityType() == EntityType.PRIMED_TNT) {
+        } else if (event.getEntityType() == EntityType.PRIMED_TNT
+                || event.getEntityType() == EntityType.MINECART_TNT) {
            if (wcfg.blockTNTExplosions) {
                event.setCancelled(true);
                return;
@@ -737,8 +857,15 @@ public class WorldGuardEntityListener implements Listener {
        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());

        // allow spawning of creatures from plugins
-        if (!wcfg.blockPluginSpawning && event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.CUSTOM)
+        if (!wcfg.blockPluginSpawning && event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.CUSTOM) {
            return;
+        }
+
+        if (wcfg.allowTamedSpawns
+                && event.getEntity() instanceof Tameable // nullsafe check
+                && ((Tameable) event.getEntity()).isTamed()) {
+            return;
+        }

        EntityType entityType = event.getEntityType();

@@ -783,7 +910,7 @@ public class WorldGuardEntityListener implements Listener {

        switch (event.getEntityType()) {
            case ENDER_DRAGON:
-                if (wcfg.blockEnderDragonBlockDamage) event.setCancelled(true);
+                if (wcfg.blockEnderDragonPortalCreation) event.setCancelled(true);
                break;
        }
    }
@@ -829,7 +956,7 @@ public class WorldGuardEntityListener implements Listener {
     * @param event Relevant event details
     */
    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onEndermanPickup(EntityChangeBlockEvent event) {
+    public void onEntityChangeBlock(EntityChangeBlockEvent event) {
        Entity ent = event.getEntity();
        Block block = event.getBlock();
        Location location = block.getLocation();
@@ -837,37 +964,18 @@ public class WorldGuardEntityListener implements Listener {
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(ent.getWorld());
        if (ent instanceof Enderman) {
-            if (event.getTo() == Material.AIR) {
-                // pickup
+            if (wcfg.disableEndermanGriefing) {
+                event.setCancelled(true);
+                return;
+            }

-                if (wcfg.disableEndermanGriefing) {
+            if (wcfg.useRegions) {
+                if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
                    event.setCancelled(true);
                    return;
                }
-
-                if (wcfg.useRegions) {
-                    if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            } else {
-                // place
-
-                if (wcfg.disableEndermanGriefing) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (wcfg.useRegions) {
-                    if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, location)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
            }
-        } else if (ent.getType() == witherType) {
-
+        } else if (ent.getType() == EntityType.WITHER) {
            if (wcfg.blockWitherBlockDamage || wcfg.blockWitherExplosions) {
                event.setCancelled(true);
                return;
@@ -978,4 +1086,41 @@ public class WorldGuardEntityListener implements Listener {
            event.setCancelled(true);
        }
    }
+
+    /**
+     * Checks regions and config settings to protect items from being knocked
+     * out of item frames.
+     * @param attacker attacking entity
+     * @param defender item frame being damaged
+     * @return true if the event should be cancelled
+     */
+    private boolean checkItemFrameProtection(Entity attacker, ItemFrame defender) {
+        World world = attacker.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+        if (wcfg.useRegions) {
+        // bukkit throws this event when a player attempts to remove an item from a frame
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            if (attacker instanceof Player) {
+                Player player = (Player) attacker;
+                LocalPlayer localPlayer = plugin.wrapPlayer(player);
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !mgr.getApplicableRegions(defender.getLocation())
+                                .canBuild(localPlayer)) {
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    return true;
+                }
+            } else {
+                if (!plugin.getGlobalRegionManager().allows(
+                        DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, defender.getLocation())) {
+                    return true;
+                }
+            }
+        }
+        if (wcfg.blockEntityItemFrameDestroy && !(attacker instanceof Player)) {
+            return true;
+        }
+        return false;
+    }
+
 }
@@ -28,8 +28,10 @@ import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Hanging;
 import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -38,6 +40,7 @@ import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause;
 import org.bukkit.event.hanging.HangingPlaceEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.projectiles.ProjectileSource;

 import com.sk89q.worldedit.blocks.ItemID;
 import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
@@ -79,6 +82,11 @@ public class WorldGuardHangingListener implements Listener {
        if (event instanceof HangingBreakByEntityEvent) {
            HangingBreakByEntityEvent entityEvent = (HangingBreakByEntityEvent) event;
            Entity removerEntity = entityEvent.getRemover();
+            if (removerEntity instanceof Projectile) {
+                Projectile projectile = (Projectile) removerEntity;
+                ProjectileSource remover = projectile.getShooter(); 
+                removerEntity = (remover instanceof LivingEntity ? (LivingEntity) remover : null);
+            }

            if (removerEntity instanceof Player) {
                Player player = (Player) removerEntity;
@@ -118,6 +126,8 @@ public class WorldGuardHangingListener implements Listener {
                    }
                }

+                // this now covers dispensers as well, if removerEntity is null above,
+                // due to a non-LivingEntity ProjectileSource
                if (hanging instanceof Painting
                        && (wcfg.blockEntityPaintingDestroy
                        || (wcfg.useRegions
@@ -169,7 +179,7 @@ public class WorldGuardHangingListener implements Listener {
        }

        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getLocation())) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getRelative(event.getBlockFace()))) {
                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
                event.setCancelled(true);
                return;
@@ -1,174 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-
-import org.bukkit.ChatColor;
-import org.bukkit.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);
-            }
-        }
-    }
-}
@@ -45,7 +45,9 @@ import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.player.PlayerBucketFillEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -107,6 +109,173 @@ public class WorldGuardPlayerListener implements Listener {
        }
    }

+    // unsure if anyone actually started using this yet, but just in case...
+    @Deprecated
+    public static boolean checkMove(WorldGuardPlugin plugin, Player player, World world, Location from, Location to) {
+        return checkMove(plugin, player, from, to); // drop world since it used to be mishandled
+    }
+
+    /**
+     * Handles movement related events, including changing gamemode, sending
+     * greeting/farewell messages, etc.
+     * A reference to WorldGuardPlugin is required to keep this method static
+     * although WGBukkit.getPlugin() may be used.
+     * @return true if the movement should not be allowed
+     */
+    public static boolean checkMove(WorldGuardPlugin plugin, Player player, Location from, Location to) {
+        PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+
+        //Flush states in multiworld scenario
+        if (state.lastWorld != null && !state.lastWorld.equals(to.getWorld())) {
+            plugin.getFlagStateManager().forget(player);
+            state = plugin.getFlagStateManager().getState(player);
+        }
+
+        World world = from.getWorld();
+        World toWorld = to.getWorld();
+
+        LocalPlayer localPlayer = plugin.wrapPlayer(player);
+        boolean hasBypass = plugin.getGlobalRegionManager().hasBypass(player, world);
+        boolean hasRemoteBypass = plugin.getGlobalRegionManager().hasBypass(player, toWorld);
+
+        RegionManager mgr = plugin.getGlobalRegionManager().get(toWorld);
+        Vector pt = new Vector(to.getBlockX(), to.getBlockY(), to.getBlockZ());
+        ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+        /*
+        // check if region is full
+        // get the lowest number of allowed members in any region
+        boolean regionFull = false;
+        String maxPlayerMessage = null;
+        if (!hasBypass) {
+            for (ProtectedRegion region : set) {
+                if (region instanceof GlobalProtectedRegion) {
+                    continue; // global region can't have a max
+                }
+                // get the max for just this region
+                Integer maxPlayers = region.getFlag(DefaultFlag.MAX_PLAYERS);
+                if (maxPlayers == null) {
+                    continue;
+                }
+                int occupantCount = 0;
+                for(Player occupant : world.getPlayers()) {
+                    // each player in this region counts as one toward the max of just this region
+                    // A person with bypass doesn't count as an occupant of the region
+                    if (!occupant.equals(player) && !plugin.getGlobalRegionManager().hasBypass(occupant, world)) {
+                        if (region.contains(BukkitUtil.toVector(occupant.getLocation()))) {
+                            if (++occupantCount >= maxPlayers) {
+                                regionFull = true;
+                                maxPlayerMessage = region.getFlag(DefaultFlag.MAX_PLAYERS_MESSAGE);
+                                // At least one region in the set is full, we are going to use this message because it
+                                // was the first one we detected as full. In reality we should check them all and then
+                                // resolve the message from full regions, but that is probably a lot laggier (and this
+                                // is already pretty laggy. In practice, we can't really control which one we get first
+                                // right here.
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        */
+
+        boolean entryAllowed = set.allows(DefaultFlag.ENTRY, localPlayer);
+        if (!hasRemoteBypass && (!entryAllowed /*|| regionFull*/)) {
+            String message = /*maxPlayerMessage != null ? maxPlayerMessage :*/ "You are not permitted to enter this area.";
+
+            player.sendMessage(ChatColor.DARK_RED + message);
+            return true;
+        }
+
+        // Have to set this state
+        if (state.lastExitAllowed == null) {
+            state.lastExitAllowed = plugin.getGlobalRegionManager().get(world)
+                        .getApplicableRegions(toVector(from))
+                        .allows(DefaultFlag.EXIT, localPlayer);
+        }
+
+        boolean exitAllowed = set.allows(DefaultFlag.EXIT, localPlayer);
+        if (!hasBypass && exitAllowed && !state.lastExitAllowed) {
+            player.sendMessage(ChatColor.DARK_RED + "You are not permitted to leave this area.");
+            return true;
+        }
+
+//        WorldGuardRegionMoveEvent event = new WorldGuardRegionMoveEvent(plugin, player, state, set, from, to);
+//        Bukkit.getPluginManager().callEvent(event);
+
+        String greeting = set.getFlag(DefaultFlag.GREET_MESSAGE);//, localPlayer);
+        String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE);//, localPlayer);
+        Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER);//, localPlayer);
+        Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE);//, localPlayer);
+        GameMode gameMode = set.getFlag(DefaultFlag.GAME_MODE);
+
+        if (state.lastFarewell != null && (farewell == null
+                || !state.lastFarewell.equals(farewell))) {
+            String replacedFarewell = plugin.replaceMacros(
+                    player, BukkitUtil.replaceColorMacros(state.lastFarewell));
+            player.sendMessage(replacedFarewell.replaceAll("\\\\n", "\n").split("\\n"));
+        }
+
+        if (greeting != null && (state.lastGreeting == null
+                || !state.lastGreeting.equals(greeting))) {
+            String replacedGreeting = plugin.replaceMacros(
+                    player, BukkitUtil.replaceColorMacros(greeting));
+            player.sendMessage(replacedGreeting.replaceAll("\\\\n", "\n").split("\\n"));
+        }
+
+        if ((notifyLeave == null || !notifyLeave)
+                && state.notifiedForLeave != null && state.notifiedForLeave) {
+            plugin.broadcastNotification(ChatColor.GRAY + "WG: "
+                    + ChatColor.LIGHT_PURPLE + player.getName()
+                    + ChatColor.GOLD + " left NOTIFY region");
+        }
+
+        if (notifyEnter != null && notifyEnter && (state.notifiedForEnter == null
+                || !state.notifiedForEnter)) {
+            StringBuilder regionList = new StringBuilder();
+
+            for (ProtectedRegion region : set) {
+                if (regionList.length() != 0) {
+                    regionList.append(", ");
+                }
+                regionList.append(region.getId());
+            }
+
+            plugin.broadcastNotification(ChatColor.GRAY + "WG: "
+                    + ChatColor.LIGHT_PURPLE + player.getName()
+                    + ChatColor.GOLD + " entered NOTIFY region: "
+                    + ChatColor.WHITE
+                    + regionList);
+        }
+
+        if (!hasBypass && gameMode != null) {
+            if (player.getGameMode() != gameMode) {
+                state.lastGameMode = player.getGameMode();
+                player.setGameMode(gameMode);
+            } else if (state.lastGameMode == null) {
+                state.lastGameMode = player.getServer().getDefaultGameMode();
+            }
+        } else {
+            if (state.lastGameMode != null) {
+                GameMode mode = state.lastGameMode;
+                state.lastGameMode = null;
+                player.setGameMode(mode);
+            }
+        }
+
+        state.lastGreeting = greeting;
+        state.lastFarewell = farewell;
+        state.notifiedForEnter = notifyEnter;
+        state.notifiedForLeave = notifyLeave;
+        state.lastExitAllowed = exitAllowed;
+        state.lastWorld = to.getWorld();
+        state.lastBlockX = to.getBlockX();
+        state.lastBlockY = to.getBlockY();
+        state.lastBlockZ = to.getBlockZ();
+        return false;
+    }
+
    class PlayerMoveHandler implements Listener {
        @EventHandler(priority = EventPriority.HIGH)
        public void onPlayerMove(PlayerMoveEvent event) {
@@ -124,164 +293,14 @@ public class WorldGuardPlayerListener implements Listener {
                if (event.getFrom().getBlockX() != event.getTo().getBlockX()
                        || event.getFrom().getBlockY() != event.getTo().getBlockY()
                        || event.getFrom().getBlockZ() != event.getTo().getBlockZ()) {
-                    PlayerFlagState state = plugin.getFlagStateManager().getState(player);
-
-                    //Flush states in multiworld scenario
-                    if (state.lastWorld != null && !state.lastWorld.equals(world)) {
-                        plugin.getFlagStateManager().forget(player);
-                        state = plugin.getFlagStateManager().getState(player);
-                    }
-
-                    LocalPlayer localPlayer = plugin.wrapPlayer(player);
-                    boolean hasBypass = plugin.getGlobalRegionManager().hasBypass(player, world);
-
-                    RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-                    Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
-                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-                    /*
-                    // check if region is full
-                    // get the lowest number of allowed members in any region
-                    boolean regionFull = false;
-                    String maxPlayerMessage = null;
-                    if (!hasBypass) {
-                        for (ProtectedRegion region : set) {
-                            if (region instanceof GlobalProtectedRegion) {
-                                continue; // global region can't have a max
-                            }
-                            // get the max for just this region
-                            Integer maxPlayers = region.getFlag(DefaultFlag.MAX_PLAYERS);
-                            if (maxPlayers == null) {
-                                continue;
-                            }
-                            int occupantCount = 0;
-                            for(Player occupant : world.getPlayers()) {
-                                // each player in this region counts as one toward the max of just this region
-                                // A person with bypass doesn't count as an occupant of the region
-                                if (!occupant.equals(player) && !plugin.getGlobalRegionManager().hasBypass(occupant, world)) {
-                                    if (region.contains(BukkitUtil.toVector(occupant.getLocation()))) {
-                                        if (++occupantCount >= maxPlayers) {
-                                            regionFull = true;
-                                            maxPlayerMessage = region.getFlag(DefaultFlag.MAX_PLAYERS_MESSAGE);
-                                            // At least one region in the set is full, we are going to use this message because it
-                                            // was the first one we detected as full. In reality we should check them all and then
-                                            // resolve the message from full regions, but that is probably a lot laggier (and this
-                                            // is already pretty laggy. In practice, we can't really control which one we get first
-                                            // right here.
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    */
-
-                    boolean entryAllowed = set.allows(DefaultFlag.ENTRY, localPlayer);
-                    if (!hasBypass && (!entryAllowed /*|| regionFull*/)) {
-                        String message = /*maxPlayerMessage != null ? maxPlayerMessage :*/ "You are not permitted to enter this area.";
-
-                        player.sendMessage(ChatColor.DARK_RED + message);
-
+                    boolean result = checkMove(plugin, player, event.getFrom(), event.getTo());
+                    if (result) {
                        Location newLoc = event.getFrom();
                        newLoc.setX(newLoc.getBlockX() + 0.5);
                        newLoc.setY(newLoc.getBlockY());
                        newLoc.setZ(newLoc.getBlockZ() + 0.5);
                        event.setTo(newLoc);
-                        return;
                    }
-
-                    // Have to set this state
-                    if (state.lastExitAllowed == null) {
-                        state.lastExitAllowed = mgr.getApplicableRegions(toVector(event.getFrom()))
-                                .allows(DefaultFlag.EXIT, localPlayer);
-                    }
-
-                    boolean exitAllowed = set.allows(DefaultFlag.EXIT, localPlayer);
-                    if (!hasBypass && exitAllowed && !state.lastExitAllowed) {
-                        player.sendMessage(ChatColor.DARK_RED + "You are not permitted to leave this area.");
-
-                        Location newLoc = event.getFrom();
-                        newLoc.setX(newLoc.getBlockX() + 0.5);
-                        newLoc.setY(newLoc.getBlockY());
-                        newLoc.setZ(newLoc.getBlockZ() + 0.5);
-                        event.setTo(newLoc);
-                        return;
-                    }
-
-                    String greeting = set.getFlag(DefaultFlag.GREET_MESSAGE);//, localPlayer);
-                    String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE);//, localPlayer);
-                    Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER);//, localPlayer);
-                    Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE);//, localPlayer);
-                    GameMode gameMode = set.getFlag(DefaultFlag.GAME_MODE);
-
-                    if (state.lastFarewell != null && (farewell == null
-                            || !state.lastFarewell.equals(farewell))) {
-                        String replacedFarewell = plugin.replaceMacros(
-                                player, BukkitUtil.replaceColorMacros(state.lastFarewell));
-                        for (String line : replacedFarewell.split("\n")) {
-                            player.sendMessage(ChatColor.AQUA + " ** " + line);
-                        }
-                    }
-
-                    if (greeting != null && (state.lastGreeting == null
-                            || !state.lastGreeting.equals(greeting))) {
-                        String replacedGreeting = plugin.replaceMacros(
-                                player, BukkitUtil.replaceColorMacros(greeting));
-                        for (String line : replacedGreeting.split("\n")) {
-                            player.sendMessage(ChatColor.AQUA + " ** " + line);
-                        }
-                    }
-
-                    if ((notifyLeave == null || !notifyLeave)
-                            && state.notifiedForLeave != null && state.notifiedForLeave) {
-                        plugin.broadcastNotification(ChatColor.GRAY + "WG: "
-                                + ChatColor.LIGHT_PURPLE + player.getName()
-                                + ChatColor.GOLD + " left NOTIFY region");
-                    }
-
-                    if (notifyEnter != null && notifyEnter && (state.notifiedForEnter == null
-                            || !state.notifiedForEnter)) {
-                        StringBuilder regionList = new StringBuilder();
-
-                        for (ProtectedRegion region : set) {
-                            if (regionList.length() != 0) {
-                                regionList.append(", ");
-                            }
-                            regionList.append(region.getId());
-                        }
-
-                        plugin.broadcastNotification(ChatColor.GRAY + "WG: "
-                                + ChatColor.LIGHT_PURPLE + player.getName()
-                                + ChatColor.GOLD + " entered NOTIFY region: "
-                                + ChatColor.WHITE
-                                + regionList);
-                    }
-
-                    if (!hasBypass && gameMode != null) {
-                        if (player.getGameMode() != gameMode) {
-                            state.lastGameMode = player.getGameMode();
-                            player.setGameMode(gameMode);
-                        } else if (state.lastGameMode == null) {
-                            state.lastGameMode = player.getServer().getDefaultGameMode();
-                        }
-                    } else {
-                        if (state.lastGameMode != null) {
-                            GameMode mode = state.lastGameMode;
-                            state.lastGameMode = null;
-                            player.setGameMode(mode);
-                        }
-                    }
-
-                    state.lastGreeting = greeting;
-                    state.lastFarewell = farewell;
-                    state.notifiedForEnter = notifyEnter;
-                    state.notifiedForLeave = notifyLeave;
-                    state.lastExitAllowed = exitAllowed;
-                    state.lastWorld = event.getTo().getWorld();
-                    state.lastBlockX = event.getTo().getBlockX();
-                    state.lastBlockY = event.getTo().getBlockY();
-                    state.lastBlockZ = event.getTo().getBlockZ();
                }
            }
        }
@@ -297,8 +316,6 @@ public class WorldGuardPlayerListener implements Listener {
            if (plugin.getFlagStateManager().getState(player).lastGameMode != null
                    && gameMode != null && event.getNewGameMode() != gameMode) {
                event.setCancelled(true);
-                player.sendMessage(ChatColor.RED + "Your game mode is locked to "
-                        + gameMode + "in this region!");
            }
        }
    }
@@ -446,6 +463,27 @@ public class WorldGuardPlayerListener implements Listener {
        plugin.forgetPlayer(player);
    }

+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
+        // TODO reduce duplication with right-click-air
+        Player player = event.getPlayer();
+        World world = player.getWorld();
+        ItemStack item = player.getItemInHand();
+
+        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()),
+                    item.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
    @EventHandler(priority = EventPriority.HIGH)
    public void onPlayerInteract(PlayerInteractEvent event) {
        Player player = event.getPlayer();
@@ -570,7 +608,8 @@ public class WorldGuardPlayerListener implements Listener {

            if (block.getRelative(event.getBlockFace()).getTypeId() == BlockID.FIRE) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)) {
+                        && !mgr.getApplicableRegions(block.getRelative(event.getBlockFace())
+                                .getLocation()).canBuild(localPlayer)) {
                    event.setUseInteractedBlock(Result.DENY);
                    event.setCancelled(true);
                    return;
@@ -600,10 +639,6 @@ public class WorldGuardPlayerListener implements Listener {
     * @param event Thrown event
     */
    private void handleAirRightClick(PlayerInteractEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
        Player player = event.getPlayer();
        World world = player.getWorld();
        ItemStack item = player.getItemInHand();
@@ -664,7 +699,9 @@ public class WorldGuardPlayerListener implements Listener {
        if (wcfg.useRegions) {
            Vector pt = toVector(block);
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            Block placedIn = block.getRelative(event.getBlockFace());
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            ApplicableRegionSet placedInSet = mgr.getApplicableRegions(placedIn.getLocation());
            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            if (item.getTypeId() == wcfg.regionWand && plugin.hasPermission(player, "worldguard.region.wand")) {
@@ -690,19 +727,122 @@ public class WorldGuardPlayerListener implements Listener {
            }

            if (item.getTypeId() == BlockID.TNT) {
-                Block placedOn = block.getRelative(event.getBlockFace());
+                // workaround for a bug that allowed tnt to trigger instantly if placed
+                // next to redstone, without plugins getting the block place event
+                // (not sure if this actually still happens)
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !plugin.getGlobalRegionManager().allows(
-                        DefaultFlag.TNT, placedOn.getLocation(), localPlayer)) {
+                        && !placedInSet.allows(DefaultFlag.TNT, localPlayer)) {
                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
                }
            }

+            // hacky workaround for craftbukkit bug
+            // has since been fixed, but leaving for legacy
+            if (item.getTypeId() == BlockID.STEP
+                    || item.getTypeId() == BlockID.WOODEN_STEP) {
+                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)) {
+                    boolean cancel = false;
+                    if ((block.getTypeId() == item.getTypeId()) 
+                        && !set.canBuild(localPlayer)) {
+                    // if we are on a step already, the new block will end up in the same block as the interact
+                        cancel = true;
+                    } else if (!placedInSet.canBuild(localPlayer)) {
+                    // if we are on another block, the half-slab in hand will be pushed to the adjacent block
+                        cancel = true;
+                    }
+                    if (cancel) {
+                        player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+
+            if (item.getTypeId() == ItemID.BED_ITEM) {
+                // this is mojang-level code, it had better give us the right direction
+                double yaw = (player.getLocation().getYaw() * 4.0F / 360.0F) + 0.5D;
+                int i = (int) yaw;
+                int i1 = (yaw < i ? i - 1 : i) & 3;
+                byte b0 = 0;
+                byte b1 = 0;
+                if (i1 == 0) {
+                    b1 = 1;
+                }
+                if (i1 == 1) {
+                    b0 = -1;
+                }
+                if (i1 == 2) {
+                    b1 = -1;
+                }
+                if (i1 == 3) {
+                    b0 = 1;
+                }
+                // end mojang-level code
+                Location headLoc = placedIn.getRelative(b0, 0, b1).getLocation();
+                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world) 
+                        && !mgr.getApplicableRegions(headLoc).canBuild(localPlayer)) {
+                    // note that normal block placement is handled later, this is just a workaround
+                    // for the location of the head block of the bed
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (block.getTypeId() == BlockID.PISTON_MOVING_PIECE) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    event.setUseInteractedBlock(Result.DENY);
+                }
+            }
+
+            if (item.getTypeId() == ItemID.WOODEN_DOOR_ITEM || item.getTypeId() == ItemID.IRON_DOOR_ITEM) {
+                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
+                        && !placedInSet.canBuild(localPlayer)) {
+                    // note that normal block placement is handled later, this is just a workaround
+                    // for the location of the top block of the door
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (item.getTypeId() == ItemID.FIRE_CHARGE || item.getTypeId() == ItemID.FLINT_AND_TINDER) {
+                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
+                        && !plugin.canBuild(player, placedIn)
+                        && !placedInSet.allows(DefaultFlag.LIGHTER)) {
+                    event.setCancelled(true);
+                    event.setUseItemInHand(Result.DENY);
+                    player.sendMessage(ChatColor.DARK_RED + "You're not allowed to use that here.");
+                    return;
+                }
+            }
+
+            if (item.getTypeId() == ItemID.EYE_OF_ENDER && block.getTypeId() == BlockID.END_PORTAL_FRAME) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    event.setCancelled(true);
+                    event.setUseItemInHand(Result.DENY);
+                    player.sendMessage(ChatColor.DARK_RED + "You're not allowed to use that here.");
+                    return;
+                }
+            }
+
            if (item.getTypeId() == ItemID.INK_SACK
                    && item.getData() != null) {
                if (item.getData().getData() == 15 // bonemeal
-                        && type == BlockID.GRASS) {
+                        && (type == BlockID.GRASS
+                        || type == BlockID.SAPLING
+                        || type == BlockID.CROPS
+                        || type == BlockID.BROWN_MUSHROOM
+                        || type == BlockID.RED_MUSHROOM
+                        || type == BlockID.PUMPKIN_STEM
+                        || type == BlockID.MELON_STEM
+                        || type == BlockID.POTATOES
+                        || type == BlockID.CARROTS
+                        || type == BlockID.COCOA_PLANT
+                        || type == BlockID.LONG_GRASS)) {
                    if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                            && !set.canBuild(localPlayer)) {
                        event.setCancelled(true);
@@ -733,10 +873,13 @@ public class WorldGuardPlayerListener implements Listener {
                        || item.getTypeId() == BlockID.CACTUS
                        || item.getTypeId() == BlockID.LONG_GRASS
                        || item.getTypeId() == BlockID.DEAD_BUSH) {
-                    event.setUseItemInHand(Result.DENY);
-                    event.setCancelled(true);
-                    player.sendMessage(ChatColor.DARK_RED + "You're not allowed to plant that here.");
-                    return;
+                    if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                            && !set.canBuild(localPlayer)) {
+                        event.setUseItemInHand(Result.DENY);
+                        event.setCancelled(true);
+                        player.sendMessage(ChatColor.DARK_RED + "You're not allowed to plant that here.");
+                        return;
+                    }
                }
            }

@@ -756,7 +899,9 @@ public class WorldGuardPlayerListener implements Listener {
                    || type == BlockID.FURNACE
                    || type == BlockID.BURNING_FURNACE
                    || type == BlockID.BREWING_STAND
-                    || type == BlockID.ENDER_CHEST) { // meh?
+                    || type == BlockID.TRAPPED_CHEST
+                    || type == BlockID.HOPPER
+                    || type == BlockID.DROPPER) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)
                        && !set.allows(DefaultFlag.CHEST_ACCESS, localPlayer)) {
@@ -794,8 +939,11 @@ public class WorldGuardPlayerListener implements Listener {
                    || type == BlockID.BREWING_STAND
                    || type == BlockID.ENCHANTMENT_TABLE
                    || type == BlockID.CAULDRON
+                    || type == BlockID.ENDER_CHEST // blah
                    || type == BlockID.BEACON
-                    || type == BlockID.ANVIL) {
+                    || type == BlockID.ANVIL
+                    || type == BlockID.HOPPER
+                    || type == BlockID.DROPPER) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)
                        && !set.allows(DefaultFlag.USE, localPlayer)) {
@@ -806,6 +954,20 @@ public class WorldGuardPlayerListener implements Listener {
                }
            }

+            if (type == BlockID.REDSTONE_REPEATER_OFF
+                    || type == BlockID.REDSTONE_REPEATER_ON
+                    || type == BlockID.COMPARATOR_OFF
+                    || type == BlockID.COMPARATOR_ON) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    // using build and not use because it can potentially damage a circuit and use is more general-purposed
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
+                    event.setUseInteractedBlock(Result.DENY);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
            if (type == BlockID.CAKE_BLOCK) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)
@@ -817,10 +979,15 @@ public class WorldGuardPlayerListener implements Listener {
                }
            }

-            if (BlockType.isRailBlock(type) && item.getTypeId() == ItemID.MINECART) {
+            if (BlockType.isRailBlock(type)
+                    && (item.getTypeId() == ItemID.MINECART
+                    || item.getTypeId() == ItemID.POWERED_MINECART
+                    || item.getTypeId() == ItemID.STORAGE_MINECART
+                    || item.getTypeId() == ItemID.TNT_MINECART
+                    || item.getTypeId() == ItemID.HOPPER_MINECART)) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)
-                        && !set.allows(DefaultFlag.PLACE_VEHICLE, localPlayer)) {
+                        && !placedInSet.canBuild(localPlayer)
+                        && !placedInSet.allows(DefaultFlag.PLACE_VEHICLE, localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
@@ -830,8 +997,8 @@ public class WorldGuardPlayerListener implements Listener {

            if (item.getTypeId() == ItemID.WOOD_BOAT) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.canBuild(localPlayer)
-                        && !set.allows(DefaultFlag.PLACE_VEHICLE, localPlayer)) {
+                        && !placedInSet.canBuild(localPlayer)
+                        && !placedInSet.allows(DefaultFlag.PLACE_VEHICLE, localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
@@ -841,13 +1008,18 @@ public class WorldGuardPlayerListener implements Listener {
        }

        if (wcfg.getBlacklist() != null) {
-            if (player.isSneaking() // sneak + right clicking no longer activates blocks as of some recent version
+            if (player.isSneaking() // sneak + right clicking no longer opens guis as of some recent version
                    || (type != BlockID.CHEST
                    && type != BlockID.DISPENSER
                    && type != BlockID.FURNACE
                    && type != BlockID.BURNING_FURNACE
                    && type != BlockID.BREWING_STAND
-                    && type != BlockID.ENCHANTMENT_TABLE)) {
+                    && type != BlockID.ENCHANTMENT_TABLE
+                    && type != BlockID.ANVIL
+                    && type != BlockID.ENDER_CHEST
+                    && type != BlockID.TRAPPED_CHEST
+                    && type != BlockID.HOPPER
+                    && type != BlockID.DROPPER)) {
                if (!wcfg.getBlacklist().check(
                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
                                item.getTypeId()), false, false)) {
@@ -883,7 +1055,10 @@ public class WorldGuardPlayerListener implements Listener {
                || type == BlockID.FURNACE
                || type == BlockID.BURNING_FURNACE
                || type == BlockID.ENCHANTMENT_TABLE
-                || type == BlockID.BREWING_STAND)) {
+                || type == BlockID.BREWING_STAND
+                || type == BlockID.TRAPPED_CHEST
+                || type == BlockID.HOPPER
+                || type == BlockID.DROPPER)) {

            if (wcfg.isChestProtected(block, player)) {
                player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
@@ -971,7 +1146,8 @@ public class WorldGuardPlayerListener implements Listener {
            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            if (type == BlockID.STONE_PRESSURE_PLATE || type == BlockID.WOODEN_PRESSURE_PLATE
-                    || type == BlockID.TRIPWIRE) {
+                    || type == BlockID.TRIPWIRE || type == BlockID.PRESSURE_PLATE_LIGHT
+                    || type == BlockID.PRESSURE_PLATE_HEAVY) {
               if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                       && !set.canBuild(localPlayer)
                       && !set.allows(DefaultFlag.USE, localPlayer)) {
@@ -1057,7 +1233,8 @@ public class WorldGuardPlayerListener implements Listener {
        Player player = event.getPlayer();

        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ITEM_DROP, player.getLocation())) {
+            if (!plugin.getGlobalRegionManager().hasBypass(player, player.getWorld())
+                    && !plugin.getGlobalRegionManager().allows(DefaultFlag.ITEM_DROP, player.getLocation())) {
                event.setCancelled(true);
                player.sendMessage(ChatColor.RED + "You don't have permission to do that in this area.");
            }
@@ -1102,7 +1279,8 @@ public class WorldGuardPlayerListener implements Listener {
        WorldConfiguration wcfg = cfg.get(world);

        if (!plugin.getGlobalRegionManager().canBuild(
-                player, event.getBlockClicked().getRelative(event.getBlockFace()))) {
+                player, event.getBlockClicked().getRelative(event.getBlockFace()))
+                && !(event.getItemStack().getTypeId() == ItemID.MILK_BUCKET)) {
            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
            event.setCancelled(true);
            return;
@@ -1118,6 +1296,16 @@ public class WorldGuardPlayerListener implements Listener {
        }
    }

+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPlayerFish(PlayerFishEvent event) {
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getPlayer().getWorld());
+
+        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
+                event.getPlayer().getLocation())) {
+            event.setExpToDrop(0);
+        }
+    }
+
    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
        Player player = event.getPlayer();
@@ -1212,21 +1400,22 @@ public class WorldGuardPlayerListener implements Listener {
        WorldConfiguration wcfg = cfg.get(world);

        if (wcfg.useRegions) {
-            if (event.getCause() == TeleportCause.ENDER_PEARL) {
-                RegionManager mgr = plugin.getGlobalRegionManager().get(event.getFrom().getWorld());
-                Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
-                Vector ptFrom = new Vector(event.getFrom().getBlockX(), event.getFrom().getBlockY(), event.getFrom().getBlockZ());
-                ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-                ApplicableRegionSet setFrom = mgr.getApplicableRegions(ptFrom);
-                LocalPlayer localPlayer = plugin.wrapPlayer(event.getPlayer());
+            RegionManager mgr = plugin.getGlobalRegionManager().get(event.getFrom().getWorld());
+            Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
+            Vector ptFrom = new Vector(event.getFrom().getBlockX(), event.getFrom().getBlockY(), event.getFrom().getBlockZ());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            ApplicableRegionSet setFrom = mgr.getApplicableRegions(ptFrom);
+            LocalPlayer localPlayer = plugin.wrapPlayer(event.getPlayer());

-                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
-                        && !(set.allows(DefaultFlag.ENTRY, localPlayer)
-                                && setFrom.allows(DefaultFlag.EXIT, localPlayer))) {
-                    event.getPlayer().sendMessage(ChatColor.DARK_RED + "You're not allowed to go there.");
+            if (cfg.usePlayerTeleports) {
+                boolean result = checkMove(plugin, event.getPlayer(), event.getFrom(), event.getTo());
+                if (result) {
                    event.setCancelled(true);
                    return;
                }
+            }
+
+            if (event.getCause() == TeleportCause.ENDER_PEARL) {
                if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
                        && !(set.allows(DefaultFlag.ENDERPEARL, localPlayer)
                                && setFrom.allows(DefaultFlag.ENDERPEARL, localPlayer))) {
@@ -1251,32 +1440,91 @@ public class WorldGuardPlayerListener implements Listener {
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);

-            String lowerCommand = event.getMessage().toLowerCase();
+            String usedCommand = event.getMessage().toLowerCase();

            Set<String> allowedCommands = set.getFlag(DefaultFlag.ALLOWED_CMDS, localPlayer);
            Set<String> blockedCommands = set.getFlag(DefaultFlag.BLOCKED_CMDS, localPlayer);

-            String blockedCommand = "";
-            if (blockedCommands != null){
-                for (String aCommand : blockedCommands) {
-                    if (lowerCommand.startsWith(aCommand)) {
-                        blockedCommand = aCommand;
-                        break;
-                    }
-                }
-            }
-            if (allowedCommands != null) {
-                if (blockedCommand.isEmpty()) blockedCommand = lowerCommand.split(" ")[0];
-                for (String aCommand : allowedCommands) {
-                    if (lowerCommand.startsWith(aCommand)) {
-                        blockedCommand = "";
-                        break;
+            /*
+             * blocked      used        allow?
+             * x            x           no
+             * x            x y         no
+             * x y          x           yes
+             * x y          x y         no
+             * 
+             * allowed      used        allow?
+             * x            x           yes
+             * x            x y         yes
+             * x y          x           no
+             * x y          x y         yes
+             */
+            String result = "";
+            String[] usedParts = usedCommand.split(" ");
+            if (blockedCommands != null) {
+                blocked:
+                for (String blockedCommand : blockedCommands) {
+                    String[] blockedParts = blockedCommand.split(" ");
+                    for (int i = 0; i < blockedParts.length && i < usedParts.length; i++) {
+                        if (blockedParts[i].equalsIgnoreCase(usedParts[i])) {
+                            // first part matches - check if it's the whole thing
+                            if (i + 1 == blockedParts.length) {
+                                // consumed all blocked parts, block entire command
+                                result = blockedCommand;
+                                break blocked;
+                            } else {
+                                // more blocked parts to check, also check used length
+                                if (i + 1 == usedParts.length) {
+                                    // all that was used, but there is more in blocked
+                                    // allow this, check next command in flag
+                                    continue blocked;
+                                } else {
+                                    // more in both blocked and used, continue checking
+                                    continue;
+                                }
+                            }
+                        } else {
+                            // found non-matching part, stop checking this command
+                            continue blocked;
+                        }
                    }
                }
            }

-            if (!blockedCommand.isEmpty()) {
-                player.sendMessage(ChatColor.RED + blockedCommand + " is not allowed in this area.");
+            if (allowedCommands != null) {
+                allowed:
+                for (String allowedCommand : allowedCommands) {
+                    String[] allowedParts = allowedCommand.split(" ");
+                    for (int i = 0; i < allowedParts.length && i < usedParts.length; i++) {
+                        if (allowedParts[i].equalsIgnoreCase(usedParts[i])) {
+                            // this part matches - check if it's the whole thing
+                            if (i + 1 == allowedParts.length) {
+                                // consumed all allowed parts before reaching used length
+                                // this command is definitely allowed
+                                result = "";
+                                break allowed;
+                            } else {
+                                // more allowed parts to check
+                                if (i + 1 == usedParts.length) {
+                                    // all that was used, but there is more in allowed
+                                    // block for now, check next part of flag
+                                    result = usedCommand;
+                                    continue allowed;
+                                } else {
+                                    // more in both allowed and used, continue checking for match
+                                    continue;
+                                }
+                            }
+                        } else {
+                            // doesn't match at all, block it, check next flag string
+                            result = usedCommand;
+                            continue allowed;
+                        }
+                    }
+                }
+            }
+
+            if (!result.isEmpty()) {
+                player.sendMessage(ChatColor.RED + result + " is not allowed in this area.");
                event.setCancelled(true);
                return;
            }
@@ -19,8 +19,6 @@

 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;
@@ -34,9 +32,6 @@ import java.util.Set;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;

-import com.sk89q.bukkit.util.CommandsManagerRegistration;
-import com.sk89q.minecraft.util.commands.*;
-import com.sk89q.wepif.PermissionsResolverManager;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -50,6 +45,15 @@ import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;

+import com.sk89q.bukkit.util.CommandsManagerRegistration;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissionsException;
+import com.sk89q.minecraft.util.commands.CommandUsageException;
+import com.sk89q.minecraft.util.commands.CommandsManager;
+import com.sk89q.minecraft.util.commands.MissingNestedCommandException;
+import com.sk89q.minecraft.util.commands.SimpleInjector;
+import com.sk89q.minecraft.util.commands.WrappedCommandException;
+import com.sk89q.wepif.PermissionsResolverManager;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.commands.GeneralCommands;
@@ -66,6 +70,11 @@ import com.sk89q.worldguard.util.FatalConfigurationLoadingException;
 */
 public class WorldGuardPlugin extends JavaPlugin {

+    /**
+     * Current instance of this plugin.
+     */
+    private static WorldGuardPlugin inst;
+
    /**
     * Manager for commands. This automatically handles nested commands,
     * permissions checking, and a number of other fancy command things.
@@ -96,7 +105,7 @@ public class WorldGuardPlugin extends JavaPlugin {
        configuration = new ConfigurationManager(this);
        globalRegionManager = new GlobalRegionManager(this);

-        final WorldGuardPlugin plugin = this;
+        final WorldGuardPlugin plugin = inst = this;
        commands = new CommandsManager<CommandSender>() {
            @Override
            public boolean hasPermission(CommandSender player, String perm) {
@@ -105,6 +114,14 @@ public class WorldGuardPlugin extends JavaPlugin {
        };
    }

+    /**
+     * Get the current instance of WorldGuard
+     * @return WorldGuardPlugin instance
+     */
+    public static WorldGuardPlugin inst() {
+        return inst;
+    }
+
    /**
     * Called on plugin enable.
     */
@@ -138,12 +155,12 @@ public class WorldGuardPlugin extends JavaPlugin {
        LegacyWorldGuardMigration.migrateBlacklist(this);

        try {
-        	// Load the configuration
-        	configuration.load();
-        	globalRegionManager.preload();
+            // Load the configuration
+            configuration.load();
+            globalRegionManager.preload();
        } catch (FatalConfigurationLoadingException e) {
-        	e.printStackTrace();
-        	getServer().shutdown();
+            e.printStackTrace();
+            getServer().shutdown();
        }

        // Migrate regions after the regions were loaded because
@@ -164,11 +181,7 @@ 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();
-        }
+        (new WorldGuardHangingListener(this)).registerEvents();
        configuration.updateCommandBookGodMode();

        if (getServer().getPluginManager().isPluginEnabled("CommandBook")) {
@@ -18,11 +18,9 @@ import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.event.vehicle.VehicleMoveEvent;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.FlagStateManager.PlayerFlagState;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;

 public class WorldGuardVehicleListener implements Listener {

@@ -82,96 +80,16 @@ public class WorldGuardVehicleListener implements Listener {
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(world);

-        // unfortunate code duplication
        if (wcfg.useRegions) {
            // Did we move a block?
            if (event.getFrom().getBlockX() != event.getTo().getBlockX()
                    || event.getFrom().getBlockY() != event.getTo().getBlockY()
                    || event.getFrom().getBlockZ() != event.getTo().getBlockZ()) {
-                PlayerFlagState state = plugin.getFlagStateManager().getState(player);
-                LocalPlayer localPlayer = plugin.wrapPlayer(player);
-                boolean hasBypass = plugin.getGlobalRegionManager().hasBypass(player, world);
-
-                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-                Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
-                ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-                boolean entryAllowed = set.allows(DefaultFlag.ENTRY, localPlayer);
-                if (!hasBypass && !entryAllowed) {
-
+                boolean result = WorldGuardPlayerListener.checkMove(plugin, player, event.getFrom(), event.getTo());
+                if (result) {
                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
                    vehicle.teleport(event.getFrom());
-                    return;
                }
-
-                // Have to set this state
-                if (state.lastExitAllowed == null) {
-                    state.lastExitAllowed = mgr.getApplicableRegions(toVector(event.getFrom()))
-                            .allows(DefaultFlag.EXIT, localPlayer);
-                }
-
-                boolean exitAllowed = set.allows(DefaultFlag.EXIT, localPlayer);
-                if (!hasBypass && exitAllowed && !state.lastExitAllowed) {
-                    player.sendMessage(ChatColor.DARK_RED + "You are not permitted to leave this area.");
-
-                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
-                    vehicle.teleport(event.getFrom());
-                    return;
-                }
-
-                String greeting = set.getFlag(DefaultFlag.GREET_MESSAGE, localPlayer);
-                String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE, localPlayer);
-                Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER, localPlayer);
-                Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE, localPlayer);
-
-                if (state.lastFarewell != null && (farewell == null
-                        || !state.lastFarewell.equals(farewell))) {
-                    String replacedFarewell = plugin.replaceMacros(
-                            player, BukkitUtil.replaceColorMacros(state.lastFarewell));
-                    player.sendMessage(ChatColor.AQUA + " ** " + replacedFarewell);
-                }
-
-                if (greeting != null && (state.lastGreeting == null
-                        || !state.lastGreeting.equals(greeting))) {
-                    String replacedGreeting = plugin.replaceMacros(
-                            player, BukkitUtil.replaceColorMacros(greeting));
-                    player.sendMessage(ChatColor.AQUA + " ** " + replacedGreeting);
-                }
-
-                if ((notifyLeave == null || !notifyLeave)
-                        && state.notifiedForLeave != null && state.notifiedForLeave) {
-                    plugin.broadcastNotification(ChatColor.GRAY + "WG: "
-                            + ChatColor.LIGHT_PURPLE + player.getName()
-                            + ChatColor.GOLD + " left NOTIFY region");
-                }
-
-                if (notifyEnter != null && notifyEnter && (state.notifiedForEnter == null
-                        || !state.notifiedForEnter)) {
-                    StringBuilder regionList = new StringBuilder();
-
-                    for (ProtectedRegion region : set) {
-                        if (regionList.length() != 0) {
-                            regionList.append(", ");
-                        }
-                        regionList.append(region.getId());
-                    }
-
-                    plugin.broadcastNotification(ChatColor.GRAY + "WG: "
-                            + ChatColor.LIGHT_PURPLE + player.getName()
-                            + ChatColor.GOLD + " entered NOTIFY region: "
-                            + ChatColor.WHITE
-                            + regionList);
-                }
-
-                state.lastGreeting = greeting;
-                state.lastFarewell = farewell;
-                state.notifiedForEnter = notifyEnter;
-                state.notifiedForLeave = notifyLeave;
-                state.lastExitAllowed = exitAllowed;
-                state.lastWorld = event.getTo().getWorld();
-                state.lastBlockX = event.getTo().getBlockX();
-                state.lastBlockY = event.getTo().getBlockY();
-                state.lastBlockZ = event.getTo().getBlockZ();
            }
        }
    }
@@ -275,7 +275,9 @@ public class GeneralCommands {
                    if (item2.getTypeId() == item.getTypeId() &&
                            ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
                                    || item.getDurability() == item2.getDurability()) &&
-                            item.getEnchantments().equals(item2.getEnchantments())) {
+                                    ((item.getItemMeta() == null && item2.getItemMeta() == null)
+                                            || (item.getItemMeta() != null &&
+                                                item.getItemMeta().equals(item2.getItemMeta())))) {
                        // This stack won't fit in the parent stack
                        if (item2.getAmount() > needed) {
                            item.setAmount(max);
@@ -0,0 +1,58 @@
+// $Id$
+/*
+ * This file is a part of WorldGuard.
+ * Copyright (c) sk89q <http://www.sk89q.com>
+ * Copyright (c) the WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY), without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit.commands;
+
+/**
+ * Used for /rg list.
+ */
+class RegionListEntry implements Comparable<RegionListEntry> {
+    
+    private final String id;
+    private final int index;
+    boolean isOwner;
+    boolean isMember;
+
+    public RegionListEntry(String id, int index) {
+        this.id = id;
+        this.index = index;
+    }
+
+    @Override
+    public int compareTo(RegionListEntry o) {
+        if (isOwner != o.isOwner) {
+            return isOwner ? 1 : -1;
+        }
+        if (isMember != o.isMember) {
+            return isMember ? 1 : -1;
+        }
+        return id.compareTo(o.id);
+    }
+
+    @Override
+    public String toString() {
+        if (isOwner) {
+            return (index + 1) + ". +" + id;
+        } else if (isMember) {
+            return (index + 1) + ". -" + id;
+        } else {
+            return (index + 1) + ". " + id;
+        }
+    }
+    
+}
@@ -30,11 +30,11 @@ import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.RegionDBUtil;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
-import com.sk89q.worldguard.protection.databases.RegionDBUtil;

 // @TODO: A lot of code duplication here! Need to fix.

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

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
@@ -64,19 +79,21 @@ public class RegionMemberCommands {

        id = region.getId();

-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addmember.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addmember.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.addmember." + id.toLowerCase());
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addmember.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addmember.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.addmember." + id.toLowerCase());
+            }
        }

-        RegionDBUtil.addToDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
+        RegionDBUtil.addToDomain(region.getMembers(), args.getParsedPaddedSlice(1, 0), 0);

        sender.sendMessage(ChatColor.YELLOW
                + "Region '" + id + "' updated.");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -84,15 +101,30 @@ public class RegionMemberCommands {
                    + e.getMessage());
        }
    }
-    
-    @Command(aliases = {"addowner", "addowner"}, usage = "<id> <owners...>",
-            desc = "Add an owner to a region", min = 2)
+
+    @Command(aliases = {"addowner", "addowner"},
+            usage = "<id> <owners...>",
+            flags = "w:",
+            desc = "Add an owner to a region",
+            min = 2)
    public void addOwner(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
        String id = args.getString(0);

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
@@ -106,46 +138,63 @@ public class RegionMemberCommands {

        Boolean flag = region.getFlag(DefaultFlag.BUYABLE);
        DefaultDomain owners = region.getOwners();
-        if (flag != null && flag && owners != null && owners.size() == 0) {
-            if (!plugin.hasPermission(player, "worldguard.region.unlimited")) {
-                int maxRegionCount = plugin.getGlobalStateManager().get(world).getMaxRegionCount(player);
-                if (maxRegionCount >= 0 && mgr.getRegionCountOfPlayer(localPlayer)
-                        >= maxRegionCount) {
-                    throw new CommandException("You already own the maximum allowed amount of regions.");
+        if (localPlayer != null) {
+            if (flag != null && flag && owners != null && owners.size() == 0) {
+                if (!plugin.hasPermission(player, "worldguard.region.unlimited")) {
+                    int maxRegionCount = plugin.getGlobalStateManager().get(world).getMaxRegionCount(player);
+                    if (maxRegionCount >= 0 && mgr.getRegionCountOfPlayer(localPlayer)
+                            >= maxRegionCount) {
+                        throw new CommandException("You already own the maximum allowed amount of regions.");
+                    }
+                }
+                plugin.checkPermission(sender, "worldguard.region.addowner.unclaimed." + id.toLowerCase());
+            } else {
+                if (region.isOwner(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
+                } else if (region.isMember(localPlayer)) {
+                    plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
+                } else {
+                    plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
                }
            }
-            plugin.checkPermission(sender, "worldguard.region.addowner.unclaimed." + id.toLowerCase());
+        }
+
+        RegionDBUtil.addToDomain(region.getOwners(), args.getParsedPaddedSlice(1, 0), 0);
+
+        sender.sendMessage(ChatColor.YELLOW
+                + "Region '" + id + "' updated.");
+
+        try {
+            mgr.save();
+        } catch (ProtectionDatabaseException e) {
+            throw new CommandException("Failed to write regions: "
+                    + e.getMessage());
+        }
+    }
+
+    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
+            usage = "<id> <owners...>",
+            flags = "aw:",
+            desc = "Remove an owner to a region",
+            min = 1)
+    public void removeMember(CommandContext args, CommandSender sender) throws CommandException {
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
        } else {
-            if (region.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
-            } else if (region.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
+            if (player != null) {
+                world = player.getWorld();
            } else {
-                plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
+                throw new CommandException("No world specified. Use -w <worldname>.");
            }
        }

-        RegionDBUtil.addToDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-        
-        try {
-            mgr.save();
-        } catch (ProtectionDatabaseException e) {
-            throw new CommandException("Failed to write regions: "
-                    + e.getMessage());
-        }
-    }
-    
-    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"}, usage = "<id> <owners...>",
-            desc = "Remove an owner to a region", min = 2)
-    public void removeMember(CommandContext args, CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
        String id = args.getString(0);

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
@@ -157,19 +206,28 @@ public class RegionMemberCommands {

        id = region.getId();

-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removemember.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removemember.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.removemember." + id.toLowerCase());
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removemember.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removemember.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.removemember." + id.toLowerCase());
+            }
        }

-        RegionDBUtil.removeFromDomain(region.getMembers(), args.getPaddedSlice(2, 0), 0);
+        if (args.hasFlag('a')) {
+            region.getMembers().removeAll();
+        } else {
+            if (args.argsLength() < 2) {
+                throw new CommandException("List some names to remove, or use -a to remove all.");
+            }
+            RegionDBUtil.removeFromDomain(region.getMembers(), args.getParsedPaddedSlice(1, 0), 0);
+        }

        sender.sendMessage(ChatColor.YELLOW
                + "Region '" + id + "' updated.");
-        
+
        try {
            mgr.save();
        } catch (ProtectionDatabaseException e) {
@@ -177,16 +235,31 @@ public class RegionMemberCommands {
                    + e.getMessage());
        }
    }
-    
-    @Command(aliases = {"removeowner", "remowner"}, usage = "<id> <owners...>",
-            desc = "Remove an owner to a region", min = 2)
+
+    @Command(aliases = {"removeowner", "remowner"},
+            usage = "<id> <owners...>",
+            flags = "aw:",
+            desc = "Remove an owner to a region",
+            min = 1)
    public void removeOwner(CommandContext args,
            CommandSender sender) throws CommandException {
-        
-        Player player = plugin.checkPlayer(sender);
-        World world = player.getWorld();
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-        
+        final World world;
+        Player player = null;
+        LocalPlayer localPlayer = null;
+        if (sender instanceof Player) {
+            player = (Player) sender;
+            localPlayer = plugin.wrapPlayer(player);
+        }
+        if (args.hasFlag('w')) {
+            world = plugin.matchWorld(sender, args.getFlag('w'));
+        } else {
+            if (player != null) {
+                world = player.getWorld();
+            } else {
+                throw new CommandException("No world specified. Use -w <worldname>.");
+            }
+        }
+
        String id = args.getString(0);

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
@@ -198,19 +271,28 @@ public class RegionMemberCommands {

        id = region.getId();

-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removeowner.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.removeowner.member." + id.toLowerCase());
-        } else {
-            plugin.checkPermission(sender, "worldguard.region.removeowner." + id.toLowerCase());
+        if (localPlayer != null) {
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removeowner.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.removeowner.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.removeowner." + id.toLowerCase());
+            }
        }

-        RegionDBUtil.removeFromDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
+        if (args.hasFlag('a')) {
+            region.getOwners().removeAll();
+        } else {
+            if (args.argsLength() < 2) {
+                throw new CommandException("List some names to remove, or use -a to remove all.");
+            }
+            RegionDBUtil.removeFromDomain(region.getOwners(), args.getParsedPaddedSlice(1, 0), 0);
+        }

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

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

@@ -34,7 +34,6 @@ import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.worldguard.bukkit.LoggerToChatHandler;
 import com.sk89q.worldguard.bukkit.ReportWriter;
-import com.sk89q.worldguard.bukkit.WGBukkit;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.util.PastebinPoster;
 import com.sk89q.worldguard.util.PastebinPoster.PasteCallback;
@@ -73,7 +72,7 @@ public class WorldGuardCommands {
            plugin.getGlobalRegionManager().unload();
            plugin.getGlobalStateManager().load();
            plugin.getGlobalRegionManager().preload();
-            WGBukkit.cleanCache();
+            // WGBukkit.cleanCache();
            sender.sendMessage("WorldGuard configuration reloaded.");
        } catch (Throwable t) {
            sender.sendMessage("Error while reloading: "
@@ -30,8 +30,8 @@ import java.util.Set;
 import com.sk89q.worldguard.LocalPlayer;

 public class DefaultDomain implements Domain {
-    private Set<String> groups;
-    private Set<String> players;
+    private final Set<String> groups;
+    private final Set<String> players;
    
    public DefaultDomain() {
        this.groups = new LinkedHashSet<String>();
@@ -135,4 +135,9 @@ public class DefaultDomain implements Domain {
        
        return str.toString();
    }
+
+    public void removeAll() {
+        groups.clear();
+        players.clear();
+    }
 }
@@ -55,7 +55,7 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
    /**
     * Checks if a player can build in an area.
     * 
-     * @param player The player to chec
+     * @param player The player to check
     * @return build ability
     */
    public boolean canBuild(LocalPlayer player) {
@@ -353,9 +353,9 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
            lastPriority = region.getPriority();
        }
        
-        try {
+        if (!needsClear.isEmpty()) {
            return needsClear.values().iterator().next();
-        } catch (NoSuchElementException e) {
+        } else {
            if (globalRegion != null) {
                V gFlag = globalRegion.getFlag(flag);
                if (gFlag != null) return gFlag;
@@ -36,12 +36,11 @@ import com.sk89q.worldguard.bukkit.BukkitUtil;
 import com.sk89q.worldguard.bukkit.ConfigurationManager;
 import com.sk89q.worldguard.bukkit.WorldConfiguration;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
-import com.sk89q.worldguard.protection.databases.YAMLDatabase;
 import com.sk89q.worldguard.protection.databases.MySQLDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
+import com.sk89q.worldguard.protection.databases.YAMLDatabase;
 import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.FlatRegionManager;
 import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;

@@ -160,8 +159,10 @@ public class GlobalRegionManager {
            RegionManager manager = new PRTreeRegionManager(database);
            manager.load();

-            plugin.getLogger().info(manager.getRegions().size()
-                    + " regions loaded for '" + name + "'");
+            if (plugin.getGlobalStateManager().get(world).summaryOnStart) {
+                plugin.getLogger().info(manager.getRegions().size()
+                        + " regions loaded for '" + name + "'");
+            }

            return manager;
        } catch (ProtectionDatabaseException e) {
@@ -66,34 +66,40 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        String world1 = world;
        this.logger = logger;

+        PreparedStatement worldStmt = null;
+        ResultSet worldResult = null;
+        PreparedStatement insertWorldStatement = null;
        try {
            connect();

+            PreparedStatement verTest = null;
            try {
-            	// Test if the database is up to date, if not throw a critical error
-            	PreparedStatement verTest = this.conn.prepareStatement(
-            			"SELECT `world_id` FROM `region_cuboid` LIMIT 0,1;"
-            		);
-            	verTest.execute();
+                // Test if the database is up to date, if not throw a critical error
+                verTest = this.conn.prepareStatement(
+                        "SELECT `world_id` FROM `region_cuboid` LIMIT 0,1;"
+                );
+                verTest.execute();
            } catch (SQLException ex) {
-            	throw new InvalidTableFormatException(
-            			"region_storage_update_20110325.sql"
-            		);
+                throw new InvalidTableFormatException(
+                        "region_storage_update_20110325.sql"
+                );
+            } finally {
+                closeResource(verTest);
            }

-            PreparedStatement worldStmt = conn.prepareStatement(
+            worldStmt = conn.prepareStatement(
                    "SELECT `id` FROM " +
                    "`world` " +
                    "WHERE `name` = ? LIMIT 0,1"
            );

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

            if (worldResult.first()) {
                this.worldDbId = worldResult.getInt("id");
            } else {
-                PreparedStatement insertWorldStatement = this.conn.prepareStatement(
+                insertWorldStatement = this.conn.prepareStatement(
                        "INSERT INTO " +
                        "`world` " +
                        "(`id`, `name`) VALUES (null, ?)",
@@ -112,6 +118,10 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            // We havn't connected to the databases, or there was an error
            // initialising the world record, so there is no point continuing
            return;
+        } finally {
+            closeResource(worldResult);
+            closeResource(worldStmt);
+            closeResource(insertWorldStatement);
        }

        if (this.worldDbId <= 0) {
@@ -132,20 +142,20 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
    }

    private void connect() throws SQLException {
-    	if (conn != null) {
-    		// Make a dummy query to check the connnection is alive.
-    		try {
-    			conn.prepareStatement("SELECT 1;").execute();
-    		} catch (SQLException ex) {
-                // Test if the dummy query failed because the connection is dead,
+        if (conn != null) {
+            // Check if the connection is still alive/valid.
+            try {
+                conn.isValid(2);
+            } catch (SQLException ex) {
+                // Test if validation failed because the connection is dead,
                // and if it is mark the connection as closed (the MySQL Driver
                // does not ensure that the connection is marked as closed unless
                // the close() method has been called.
-    			if ("08S01".equals(ex.getSQLState())) {
-    				conn.close();
-    			}
-    		}
-    	}
+                if ("08S01".equals(ex.getSQLState())) {
+                    conn.close();
+                }
+            }
+        }
        if (conn == null || conn.isClosed()) {
            conn = DriverManager.getConnection(config.sqlDsn, config.sqlUsername, config.sqlPassword);
        }
@@ -153,8 +163,10 @@ public class MySQLDatabase extends AbstractProtectionDatabase {

    private void loadFlags(ProtectedRegion region) {
        // @TODO: Iterate _ONCE_
+        PreparedStatement flagsStatement = null;
+        ResultSet flagsResultSet = null;
        try {
-            PreparedStatement flagsStatement = this.conn.prepareStatement(
+            flagsStatement = this.conn.prepareStatement(
                    "SELECT " +
                    "`region_flag`.`flag`, " +
                    "`region_flag`.`value` " +
@@ -164,7 +176,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            );

            flagsStatement.setString(1, region.getId().toLowerCase());
-            ResultSet flagsResultSet = flagsStatement.executeQuery();
+            flagsResultSet = flagsStatement.executeQuery();

            Map<String,Object> regionFlags = new HashMap<String,Object>();
            while (flagsResultSet.next()) {
@@ -186,6 +198,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                    "Unable to load flags for region "
                    + region.getId().toLowerCase() + ": " + ex.getMessage()
            );
+        } finally {
+            closeResource(flagsResultSet);
+            closeResource(flagsStatement);
        }
    }

@@ -203,8 +218,10 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        DefaultDomain owners = new DefaultDomain();
        DefaultDomain members = new DefaultDomain();

+        ResultSet userSet = null;
+        PreparedStatement usersStatement = null;
        try {
-            PreparedStatement usersStatement = this.conn.prepareStatement(
+            usersStatement = this.conn.prepareStatement(
                    "SELECT " +
                    "`user`.`name`, " +
                    "`region_players`.`owner` " +
@@ -217,7 +234,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            );

            usersStatement.setString(1, region.getId().toLowerCase());
-            ResultSet userSet = usersStatement.executeQuery();
+            userSet = usersStatement.executeQuery();
            while(userSet.next()) {
                if (userSet.getBoolean("owner")) {
                    owners.addPlayer(userSet.getString("name"));
@@ -227,10 +244,15 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            }
        } catch (SQLException ex) {
            logger.warning("Unable to load users for region " + region.getId().toLowerCase() + ": " + ex.getMessage());
+        } finally {
+            closeResource(userSet);
+            closeResource(usersStatement);
        }

+        PreparedStatement groupsStatement = null;
+        ResultSet groupSet = null;
        try {
-            PreparedStatement groupsStatement = this.conn.prepareStatement(
+            groupsStatement = this.conn.prepareStatement(
                    "SELECT " +
                    "`group`.`name`, " +
                    "`region_groups`.`owner` " +
@@ -243,7 +265,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            );

            groupsStatement.setString(1, region.getId().toLowerCase());
-            ResultSet groupSet = groupsStatement.executeQuery();
+            groupSet = groupsStatement.executeQuery();
            while(groupSet.next()) {
                if (groupSet.getBoolean("owner")) {
                    owners.addGroup(groupSet.getString("name"));
@@ -253,6 +275,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            }
        } catch (SQLException ex) {
            logger.warning("Unable to load groups for region " + region.getId().toLowerCase() + ": " + ex.getMessage());
+        } finally {
+            closeResource(groupSet);
+            closeResource(groupsStatement);
        }

        region.setOwners(owners);
@@ -263,8 +288,10 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        Map<String,ProtectedRegion> regions =
                new HashMap<String,ProtectedRegion>();

+        PreparedStatement globalRegionStatement = null;
+        ResultSet globalResultSet = null;
        try {
-            PreparedStatement globalRegionStatement = this.conn.prepareStatement(
+            globalRegionStatement = this.conn.prepareStatement(
                    "SELECT " +
                    "`region`.`id`, " +
                    "`region`.`priority`, " +
@@ -278,7 +305,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            );

            globalRegionStatement.setInt(1, this.worldDbId);
-            ResultSet globalResultSet = globalRegionStatement.executeQuery();
+            globalResultSet = globalRegionStatement.executeQuery();

            while (globalResultSet.next()) {
                ProtectedRegion region = new GlobalProtectedRegion(globalResultSet.getString("id"));
@@ -303,6 +330,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                logger.warning("\t\tCause: " + t.getMessage());
                t = t.getCause();
            }
+        } finally {
+            closeResource(globalResultSet);
+            closeResource(globalRegionStatement);
        }

        globalRegions = regions;
@@ -312,8 +342,10 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        Map<String,ProtectedRegion> regions =
                new HashMap<String,ProtectedRegion>();

+        PreparedStatement cuboidRegionStatement = null;
+        ResultSet cuboidResultSet = null;
        try {
-            PreparedStatement cuboidRegionStatement = this.conn.prepareStatement(
+            cuboidRegionStatement = this.conn.prepareStatement(
                    "SELECT " +
                    "`region_cuboid`.`min_z`, " +
                    "`region_cuboid`.`min_y`, " +
@@ -335,7 +367,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            );

            cuboidRegionStatement.setInt(1, this.worldDbId);
-            ResultSet cuboidResultSet = cuboidRegionStatement.executeQuery();
+            cuboidResultSet = cuboidRegionStatement.executeQuery();

            while (cuboidResultSet.next()) {
                Vector pt1 = new Vector(
@@ -378,6 +410,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                logger.warning("\t\tCause: " + t.getMessage());
                t = t.getCause();
            }
+        } finally {
+            closeResource(cuboidResultSet);
+            closeResource(cuboidRegionStatement);
        }

        cuboidRegions = regions;
@@ -387,8 +422,11 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        Map<String,ProtectedRegion> regions =
                new HashMap<String,ProtectedRegion>();

+        PreparedStatement poly2dRegionStatement = null;
+        ResultSet poly2dResultSet = null;
+        PreparedStatement poly2dVectorStatement = null;
        try {
-            PreparedStatement poly2dRegionStatement = this.conn.prepareStatement(
+            poly2dRegionStatement = this.conn.prepareStatement(
                    "SELECT " +
                    "`region_poly2d`.`min_y`, " +
                    "`region_poly2d`.`max_y`, " +
@@ -406,9 +444,9 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            );

            poly2dRegionStatement.setInt(1, this.worldDbId);
-            ResultSet poly2dResultSet = poly2dRegionStatement.executeQuery();
+            poly2dResultSet = poly2dRegionStatement.executeQuery();

-            PreparedStatement poly2dVectorStatement = this.conn.prepareStatement(
+            poly2dVectorStatement = this.conn.prepareStatement(
                    "SELECT " +
                    "`region_poly2d_point`.`x`, " +
                    "`region_poly2d_point`.`z` " +
@@ -433,6 +471,14 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                            poly2dVectorResultSet.getInt("z")
                    ));
                }
+
+                if (points.size() < 3) {
+                    logger.warning(String.format("Invalid polygonal region '%s': region only has %d point(s). Ignoring.", id, points.size()));
+                    continue;
+                }
+                
+                closeResource(poly2dVectorResultSet);
+
                ProtectedRegion region = new ProtectedPolygonalRegion(id, points, minY, maxY);

                region.setPriority(poly2dResultSet.getInt("priority"));
@@ -455,6 +501,10 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                logger.warning("\t\tCause: " + t.getMessage());
                t = t.getCause();
            }
+        } finally {
+            closeResource(poly2dResultSet);
+            closeResource(poly2dRegionStatement);
+            closeResource(poly2dVectorStatement);
        }

        poly2dRegions = regions;
@@ -512,8 +562,11 @@ public class MySQLDatabase extends AbstractProtectionDatabase {

        if (usernames.length < 1) return users;

+        ResultSet findUsersResults = null;
+        PreparedStatement insertUserStatement = null;
+        PreparedStatement findUsersStatement = null;
        try {
-            PreparedStatement findUsersStatement = this.conn.prepareStatement(
+            findUsersStatement = this.conn.prepareStatement(
                    String.format(
                            "SELECT " +
                            "`user`.`id`, " +
@@ -526,13 +579,13 @@ public class MySQLDatabase extends AbstractProtectionDatabase {

            RegionDBUtil.setValues(findUsersStatement, usernames);

-            ResultSet findUsersResults = findUsersStatement.executeQuery();
+            findUsersResults = findUsersStatement.executeQuery();

            while(findUsersResults.next()) {
                users.put(findUsersResults.getString("name"), findUsersResults.getInt("id"));
            }

-            PreparedStatement insertUserStatement = this.conn.prepareStatement(
+            insertUserStatement = this.conn.prepareStatement(
                    "INSERT INTO " +
                    "`user` ( " +
                    "`id`, " +
@@ -561,6 +614,10 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                logger.warning(t.getMessage());
                t = t.getCause();
            }
+        } finally {
+            closeResource(findUsersResults);
+            closeResource(findUsersStatement);
+            closeResource(insertUserStatement);
        }

        return users;
@@ -576,8 +633,11 @@ public class MySQLDatabase extends AbstractProtectionDatabase {

        if (groupnames.length < 1) return groups;

+        PreparedStatement findGroupsStatement = null;
+        ResultSet findGroupsResults = null;
+        PreparedStatement insertGroupStatement = null;
        try {
-            PreparedStatement findGroupsStatement = this.conn.prepareStatement(
+            findGroupsStatement = this.conn.prepareStatement(
                    String.format(
                            "SELECT " +
                            "`group`.`id`, " +
@@ -590,13 +650,13 @@ public class MySQLDatabase extends AbstractProtectionDatabase {

            RegionDBUtil.setValues(findGroupsStatement, groupnames);

-            ResultSet findGroupsResults = findGroupsStatement.executeQuery();
+            findGroupsResults = findGroupsStatement.executeQuery();

            while(findGroupsResults.next()) {
                groups.put(findGroupsResults.getString("name"), findGroupsResults.getInt("id"));
            }

-            PreparedStatement insertGroupStatement = this.conn.prepareStatement(
+            insertGroupStatement = this.conn.prepareStatement(
                    "INSERT INTO " +
                    "`group` ( " +
                    "`id`, " +
@@ -619,6 +679,10 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            }
        } catch (SQLException ex) {
            logger.warning("Could not get the database id for the groups " + groupnames.toString() + ex.getMessage());
+        } finally {
+            closeResource(findGroupsResults);
+            closeResource(findGroupsStatement);
+            closeResource(insertGroupStatement);
        }

        return groups;
@@ -649,21 +713,26 @@ public class MySQLDatabase extends AbstractProtectionDatabase {

        List<String> regionsInDatabase = new ArrayList<String>();

+        PreparedStatement getAllRegionsStatement = null;
+        ResultSet getAllRegionsResult = null;
        try {
-            PreparedStatement getAllRegionsStatement = this.conn.prepareStatement(
+            getAllRegionsStatement = this.conn.prepareStatement(
                    "SELECT `region`.`id` FROM " +
                    "`region` " +
                    "WHERE `world_id` = ? "
            );

            getAllRegionsStatement.setInt(1, this.worldDbId);
-            ResultSet getAllRegionsResult = getAllRegionsStatement.executeQuery();
+            getAllRegionsResult = getAllRegionsStatement.executeQuery();

            while(getAllRegionsResult.next()) {
                regionsInDatabase.add(getAllRegionsResult.getString("id"));
            }
        } catch (SQLException ex) {
            logger.warning("Could not get region list for save comparison: " + ex.getMessage());
+        } finally {
+            closeResource(getAllRegionsResult);
+            closeResource(getAllRegionsStatement);
        }

        for (Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
@@ -701,10 +770,11 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        }

        for (Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
+            PreparedStatement setParentStatement = null;
            try {
                if (entry.getValue().getParent() == null) continue;

-                PreparedStatement setParentStatement = this.conn.prepareStatement(
+                setParentStatement = this.conn.prepareStatement(
                        "UPDATE `region` SET " +
                        "`parent` = ? " +
                        "WHERE `id` = ? AND `world_id` = " + this.worldDbId
@@ -717,12 +787,15 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            } catch (SQLException ex) {
                logger.warning("Could not save region parents " + entry.getValue().getId().toLowerCase() + ": " + ex.getMessage());
                throw new ProtectionDatabaseException(ex);
+            } finally {
+                closeResource(setParentStatement);
            }
        }

        for (String name : regionsInDatabase) {
+            PreparedStatement removeRegion = null;
            try {
-                PreparedStatement removeRegion = this.conn.prepareStatement(
+                removeRegion = this.conn.prepareStatement(
                        "DELETE FROM `region` WHERE `id` = ? "
                );

@@ -730,41 +803,53 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
                removeRegion.execute();
            } catch (SQLException ex) {
                logger.warning("Could not remove region from database " + name + ": " + ex.getMessage());
+            } finally {
+                closeResource(removeRegion);
            }
        }

    }

    private void updateFlags(ProtectedRegion region) throws SQLException {
-        PreparedStatement clearCurrentFlagStatement = this.conn.prepareStatement(
-                "DELETE FROM `region_flag` " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId
-        );
-
-        clearCurrentFlagStatement.setString(1, region.getId().toLowerCase());
-        clearCurrentFlagStatement.execute();
-
-        for (Map.Entry<Flag<?>, Object> entry : region.getFlags().entrySet()) {
-            if (entry.getValue() == null) continue;
-
-            Object flag = sqlMarshal(marshalFlag(entry.getKey(), entry.getValue()));
-
-            PreparedStatement insertFlagStatement = this.conn.prepareStatement(
-                    "INSERT INTO `region_flag` ( " +
-                    "`id`, " +
-                    "`region_id`, " +
-                    "`world_id`, " +
-                    "`flag`, " +
-                    "`value` " +
-                    ") VALUES (null, ?, " + this.worldDbId + ", ?, ?)"
+        PreparedStatement clearCurrentFlagStatement = null;
+        try {
+            clearCurrentFlagStatement = this.conn.prepareStatement(
+                    "DELETE FROM `region_flag` " +
+                    "WHERE `region_id` = ? " +
+                    "AND `world_id` = " + this.worldDbId
            );

-            insertFlagStatement.setString(1, region.getId().toLowerCase());
-            insertFlagStatement.setString(2, entry.getKey().getName());
-            insertFlagStatement.setObject(3, flag);
+            clearCurrentFlagStatement.setString(1, region.getId().toLowerCase());
+            clearCurrentFlagStatement.execute();

-            insertFlagStatement.execute();
+            for (Map.Entry<Flag<?>, Object> entry : region.getFlags().entrySet()) {
+                if (entry.getValue() == null) continue;
+
+                Object flag = sqlMarshal(marshalFlag(entry.getKey(), entry.getValue()));
+
+                PreparedStatement insertFlagStatement = null;
+                try {
+                    insertFlagStatement = this.conn.prepareStatement(
+                            "INSERT INTO `region_flag` ( " +
+                            "`id`, " +
+                            "`region_id`, " +
+                            "`world_id`, " +
+                            "`flag`, " +
+                            "`value` " +
+                            ") VALUES (null, ?, " + this.worldDbId + ", ?, ?)"
+                    );
+
+                    insertFlagStatement.setString(1, region.getId().toLowerCase());
+                    insertFlagStatement.setString(2, entry.getKey().getName());
+                    insertFlagStatement.setObject(3, flag);
+
+                    insertFlagStatement.execute();
+                } finally {
+                    closeResource(insertFlagStatement);
+                }
+            }
+        } finally {
+            closeResource(clearCurrentFlagStatement);
        }
    }

@@ -777,57 +862,69 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            domain = region.getMembers();
        }

-        PreparedStatement deleteUsersForRegion = this.conn.prepareStatement(
-                "DELETE FROM `region_players` " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId + " " +
-                "AND `owner` = ?"
-        );
+        PreparedStatement deleteUsersForRegion = null;
+        PreparedStatement insertUsersForRegion = null;
+        PreparedStatement deleteGroupsForRegion = null;
+        PreparedStatement insertGroupsForRegion = null;

-        deleteUsersForRegion.setString(1, region.getId().toLowerCase());
-        deleteUsersForRegion.setBoolean(2, owners);
-        deleteUsersForRegion.execute();
+        try {
+            deleteUsersForRegion = this.conn.prepareStatement(
+                    "DELETE FROM `region_players` " +
+                    "WHERE `region_id` = ? " +
+                    "AND `world_id` = " + this.worldDbId + " " +
+                    "AND `owner` = ?"
+            );

-        PreparedStatement insertUsersForRegion = this.conn.prepareStatement(
-                "INSERT INTO `region_players` " +
-                "(`region_id`, `world_id`, `user_id`, `owner`) " +
-                "VALUES (?, " + this.worldDbId + ",  ?, ?)"
-        );
+            deleteUsersForRegion.setString(1, region.getId().toLowerCase());
+            deleteUsersForRegion.setBoolean(2, owners);
+            deleteUsersForRegion.execute();

-        Set<String> var = domain.getPlayers();
+            insertUsersForRegion = this.conn.prepareStatement(
+                    "INSERT INTO `region_players` " +
+                    "(`region_id`, `world_id`, `user_id`, `owner`) " +
+                    "VALUES (?, " + this.worldDbId + ",  ?, ?)"
+            );

-        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);
+            Set<String> var = domain.getPlayers();

-            insertUsersForRegion.execute();
-        }
+            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);

-        PreparedStatement deleteGroupsForRegion = this.conn.prepareStatement(
-                "DELETE FROM `region_groups` " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId + " " +
-                "AND `owner` = ?"
-        );
+                insertUsersForRegion.execute();
+            }

-        deleteGroupsForRegion.setString(1, region.getId().toLowerCase());
-        deleteGroupsForRegion.setBoolean(2, owners);
-        deleteGroupsForRegion.execute();
+            deleteGroupsForRegion = this.conn.prepareStatement(
+                    "DELETE FROM `region_groups` " +
+                    "WHERE `region_id` = ? " +
+                    "AND `world_id` = " + this.worldDbId + " " +
+                    "AND `owner` = ?"
+            );

-        PreparedStatement insertGroupsForRegion = this.conn.prepareStatement(
-                "INSERT INTO `region_groups` " +
-                "(`region_id`, `world_id`, `group_id`, `owner`) " +
-                "VALUES (?, " + this.worldDbId + ",  ?, ?)"
-        );
+            deleteGroupsForRegion.setString(1, region.getId().toLowerCase());
+            deleteGroupsForRegion.setBoolean(2, owners);
+            deleteGroupsForRegion.execute();

-        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);
+            insertGroupsForRegion = this.conn.prepareStatement(
+                    "INSERT INTO `region_groups` " +
+                    "(`region_id`, `world_id`, `group_id`, `owner`) " +
+                    "VALUES (?, " + this.worldDbId + ",  ?, ?)"
+            );

-            insertGroupsForRegion.execute();
+            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);
+
+                insertGroupsForRegion.execute();
+            }
+        } finally {
+            closeResource(deleteGroupsForRegion);
+            closeResource(deleteUsersForRegion);
+            closeResource(insertGroupsForRegion);
+            closeResource(insertUsersForRegion);
        }
    }

@@ -837,22 +934,27 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
    }

    private void insertRegion(ProtectedRegion region, String type) throws SQLException {
-        PreparedStatement insertRegionStatement = this.conn.prepareStatement(
-                "INSERT INTO `region` (" +
-                "`id`, " +
-                "`world_id`, " +
-                "`type`, " +
-                "`priority`, " +
-                "`parent` " +
-                ") VALUES (?, ?, ?, ?, null)"
-        );
+        PreparedStatement insertRegionStatement = null;
+        try {
+            insertRegionStatement = this.conn.prepareStatement(
+                    "INSERT INTO `region` (" +
+                    "`id`, " +
+                    "`world_id`, " +
+                    "`type`, " +
+                    "`priority`, " +
+                    "`parent` " +
+                    ") VALUES (?, ?, ?, ?, null)"
+            );

-        insertRegionStatement.setString(1, region.getId().toLowerCase());
-        insertRegionStatement.setInt(2, this.worldDbId);
-        insertRegionStatement.setString(3, type);
-        insertRegionStatement.setInt(4, region.getPriority());
+            insertRegionStatement.setString(1, region.getId().toLowerCase());
+            insertRegionStatement.setInt(2, this.worldDbId);
+            insertRegionStatement.setString(3, type);
+            insertRegionStatement.setInt(4, region.getPriority());

-        insertRegionStatement.execute();
+            insertRegionStatement.execute();
+        } finally {
+            closeResource(insertRegionStatement);
+        }

        updateFlags(region);

@@ -863,82 +965,100 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
    private void insertRegionCuboid(ProtectedCuboidRegion region) throws SQLException {
        insertRegion(region, "cuboid");

-        PreparedStatement insertCuboidRegionStatement = this.conn.prepareStatement(
-                "INSERT INTO `region_cuboid` (" +
-                "`region_id`, " +
-                "`world_id`, " +
-                "`min_z`, " +
-                "`min_y`, " +
-                "`min_x`, " +
-                "`max_z`, " +
-                "`max_y`, " +
-                "`max_x` " +
-                ") VALUES (?, " + this.worldDbId + ", ?, ?, ?, ?, ?, ?)"
-        );
+        PreparedStatement insertCuboidRegionStatement = null;
+        try {
+            insertCuboidRegionStatement = this.conn.prepareStatement(
+                    "INSERT INTO `region_cuboid` (" +
+                    "`region_id`, " +
+                    "`world_id`, " +
+                    "`min_z`, " +
+                    "`min_y`, " +
+                    "`min_x`, " +
+                    "`max_z`, " +
+                    "`max_y`, " +
+                    "`max_x` " +
+                    ") VALUES (?, " + this.worldDbId + ", ?, ?, ?, ?, ?, ?)"
+            );

-        BlockVector min = region.getMinimumPoint();
-        BlockVector max = region.getMaximumPoint();
+            BlockVector min = region.getMinimumPoint();
+            BlockVector max = region.getMaximumPoint();

-        insertCuboidRegionStatement.setString(1, region.getId().toLowerCase());
-        insertCuboidRegionStatement.setInt(2, min.getBlockZ());
-        insertCuboidRegionStatement.setInt(3, min.getBlockY());
-        insertCuboidRegionStatement.setInt(4, min.getBlockX());
-        insertCuboidRegionStatement.setInt(5, max.getBlockZ());
-        insertCuboidRegionStatement.setInt(6, max.getBlockY());
-        insertCuboidRegionStatement.setInt(7, max.getBlockX());
+            insertCuboidRegionStatement.setString(1, region.getId().toLowerCase());
+            insertCuboidRegionStatement.setInt(2, min.getBlockZ());
+            insertCuboidRegionStatement.setInt(3, min.getBlockY());
+            insertCuboidRegionStatement.setInt(4, min.getBlockX());
+            insertCuboidRegionStatement.setInt(5, max.getBlockZ());
+            insertCuboidRegionStatement.setInt(6, max.getBlockY());
+            insertCuboidRegionStatement.setInt(7, max.getBlockX());

-        insertCuboidRegionStatement.execute();
+            insertCuboidRegionStatement.execute();
+        } finally {
+            closeResource(insertCuboidRegionStatement);
+        }
    }

    private void insertRegionPoly2D(ProtectedPolygonalRegion region) throws SQLException {
        insertRegion(region, "poly2d");

-        PreparedStatement insertPoly2dRegionStatement = this.conn.prepareStatement(
-                "INSERT INTO `region_poly2d` (" +
-                "`region_id`, " +
-                "`world_id`, " +
-                "`max_y`, " +
-                "`min_y` " +
-                ") VALUES (?, " + this.worldDbId + ", ?, ?)"
-        );
+        PreparedStatement insertPoly2dRegionStatement = null;
+        try {
+            insertPoly2dRegionStatement = this.conn.prepareStatement(
+                    "INSERT INTO `region_poly2d` (" +
+                    "`region_id`, " +
+                    "`world_id`, " +
+                    "`max_y`, " +
+                    "`min_y` " +
+                    ") VALUES (?, " + this.worldDbId + ", ?, ?)"
+            );

-        insertPoly2dRegionStatement.setString(1, region.getId().toLowerCase());
-        insertPoly2dRegionStatement.setInt(2, region.getMaximumPoint().getBlockY());
-        insertPoly2dRegionStatement.setInt(3, region.getMinimumPoint().getBlockY());
+            insertPoly2dRegionStatement.setString(1, region.getId().toLowerCase());
+            insertPoly2dRegionStatement.setInt(2, region.getMaximumPoint().getBlockY());
+            insertPoly2dRegionStatement.setInt(3, region.getMinimumPoint().getBlockY());

-        insertPoly2dRegionStatement.execute();
+            insertPoly2dRegionStatement.execute();
+        } finally {
+            closeResource(insertPoly2dRegionStatement);
+        }

        updatePoly2dPoints(region);
    }

    private void updatePoly2dPoints(ProtectedPolygonalRegion region) throws SQLException {
-        PreparedStatement clearPoly2dPointsForRegionStatement = this.conn.prepareStatement(
-                "DELETE FROM `region_poly2d_point` " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId
-        );
+        PreparedStatement clearPoly2dPointsForRegionStatement = null;
+        PreparedStatement insertPoly2dPointStatement = null;

-        clearPoly2dPointsForRegionStatement.setString(1, region.getId().toLowerCase());
+		try {
+            clearPoly2dPointsForRegionStatement = this.conn.prepareStatement(
+                    "DELETE FROM `region_poly2d_point` " +
+                    "WHERE `region_id` = ? " +
+                    "AND `world_id` = " + this.worldDbId
+            );

-        clearPoly2dPointsForRegionStatement.execute();
+            clearPoly2dPointsForRegionStatement.setString(1, region.getId().toLowerCase());

-        PreparedStatement insertPoly2dPointStatement = this.conn.prepareStatement(
-                "INSERT INTO `region_poly2d_point` (" +
-                "`id`, " +
-                "`region_id`, " +
-                "`world_id`, " +
-                "`z`, " +
-                "`x` " +
-                ") VALUES (null, ?, " + this.worldDbId + ", ?, ?)"
-        );
+            clearPoly2dPointsForRegionStatement.execute();

-        String lowerId = region.getId();
-        for (BlockVector2D point : region.getPoints()) {
-            insertPoly2dPointStatement.setString(1, lowerId);
-            insertPoly2dPointStatement.setInt(2, point.getBlockZ());
-            insertPoly2dPointStatement.setInt(3, point.getBlockX());
+            insertPoly2dPointStatement = this.conn.prepareStatement(
+                    "INSERT INTO `region_poly2d_point` (" +
+                    "`id`, " +
+                    "`region_id`, " +
+                    "`world_id`, " +
+                    "`z`, " +
+                    "`x` " +
+                    ") VALUES (null, ?, " + this.worldDbId + ", ?, ?)"
+            );

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

@@ -947,15 +1067,20 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
    }

    private void updateRegion(ProtectedRegion region, String type) throws SQLException  {
-        PreparedStatement updateRegionStatement = this.conn.prepareStatement(
-                "UPDATE `region` SET " +
-                "`priority` = ? WHERE `id` = ? AND `world_id` = " + this.worldDbId
-        );
+        PreparedStatement updateRegionStatement = null;
+        try {
+            updateRegionStatement = this.conn.prepareStatement(
+                    "UPDATE `region` SET " +
+                    "`priority` = ? WHERE `id` = ? AND `world_id` = " + this.worldDbId
+            );

-        updateRegionStatement.setInt(1, region.getPriority());
-        updateRegionStatement.setString(2, region.getId().toLowerCase());
+            updateRegionStatement.setInt(1, region.getPriority());
+            updateRegionStatement.setString(2, region.getId().toLowerCase());

-        updateRegionStatement.execute();
+            updateRegionStatement.execute();
+        } finally {
+            closeResource(updateRegionStatement);
+        }

        updateFlags(region);

@@ -966,49 +1091,58 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
    private void updateRegionCuboid(ProtectedCuboidRegion region) throws SQLException  {
        updateRegion(region, "cuboid");

-        PreparedStatement updateCuboidRegionStatement = this.conn.prepareStatement(
-                "UPDATE `region_cuboid` SET " +
-                "`min_z` = ?, " +
-                "`min_y` = ?, " +
-                "`min_x` = ?, " +
-                "`max_z` = ?, " +
-                "`max_y` = ?, " +
-                "`max_x` = ? " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId
-        );
+        PreparedStatement updateCuboidRegionStatement = null;
+        try {
+            updateCuboidRegionStatement = this.conn.prepareStatement(
+                    "UPDATE `region_cuboid` SET " +
+                    "`min_z` = ?, " +
+                    "`min_y` = ?, " +
+                    "`min_x` = ?, " +
+                    "`max_z` = ?, " +
+                    "`max_y` = ?, " +
+                    "`max_x` = ? " +
+                    "WHERE `region_id` = ? " +
+                    "AND `world_id` = " + this.worldDbId
+            );

-        BlockVector min = region.getMinimumPoint();
-        BlockVector max = region.getMaximumPoint();
+            BlockVector min = region.getMinimumPoint();
+            BlockVector max = region.getMaximumPoint();

-        updateCuboidRegionStatement.setInt(1, min.getBlockZ());
-        updateCuboidRegionStatement.setInt(2, min.getBlockY());
-        updateCuboidRegionStatement.setInt(3, min.getBlockX());
-        updateCuboidRegionStatement.setInt(4, max.getBlockZ());
-        updateCuboidRegionStatement.setInt(5, max.getBlockY());
-        updateCuboidRegionStatement.setInt(6, max.getBlockX());
-        updateCuboidRegionStatement.setString(7, region.getId().toLowerCase());
+            updateCuboidRegionStatement.setInt(1, min.getBlockZ());
+            updateCuboidRegionStatement.setInt(2, min.getBlockY());
+            updateCuboidRegionStatement.setInt(3, min.getBlockX());
+            updateCuboidRegionStatement.setInt(4, max.getBlockZ());
+            updateCuboidRegionStatement.setInt(5, max.getBlockY());
+            updateCuboidRegionStatement.setInt(6, max.getBlockX());
+            updateCuboidRegionStatement.setString(7, region.getId().toLowerCase());

-        updateCuboidRegionStatement.execute();
+            updateCuboidRegionStatement.execute();
+        } finally {
+            closeResource(updateCuboidRegionStatement);
+        }
    }

    private void updateRegionPoly2D(ProtectedPolygonalRegion region) throws SQLException  {
        updateRegion(region, "poly2d");

-        PreparedStatement updatePoly2dRegionStatement = this.conn.prepareStatement(
-                "UPDATE `region_poly2d` SET " +
-                "`max_y` = ?, " +
-                "`min_y` = ? " +
-                "WHERE `region_id` = ? " +
-                "AND `world_id` = " + this.worldDbId
-        );
+        PreparedStatement updatePoly2dRegionStatement = null;
+        try {
+            updatePoly2dRegionStatement = this.conn.prepareStatement(
+                    "UPDATE `region_poly2d` SET " +
+                    "`max_y` = ?, " +
+                    "`min_y` = ? " +
+                    "WHERE `region_id` = ? " +
+                    "AND `world_id` = " + this.worldDbId
+            );

-        updatePoly2dRegionStatement.setInt(1, region.getMaximumPoint().getBlockY());
-        updatePoly2dRegionStatement.setInt(2, region.getMinimumPoint().getBlockY());
-        updatePoly2dRegionStatement.setString(3, region.getId().toLowerCase());
-
-        updatePoly2dRegionStatement.execute();
+            updatePoly2dRegionStatement.setInt(1, region.getMaximumPoint().getBlockY());
+            updatePoly2dRegionStatement.setInt(2, region.getMinimumPoint().getBlockY());
+            updatePoly2dRegionStatement.setString(3, region.getId().toLowerCase());

+            updatePoly2dRegionStatement.execute();
+        } finally {
+            closeResource(updatePoly2dRegionStatement);
+        }
        updatePoly2dPoints(region);
    }

@@ -1016,6 +1150,22 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
        updateRegion(region, "global");
    }

+    private void closeResource(ResultSet rs) {
+        if (rs != null) {
+            try {
+                rs.close();
+            } catch (SQLException e) {}
+        }
+    }
+
+    private void closeResource(Statement st) {
+        if (st != null) {
+            try {
+                st.close();
+            } catch (SQLException e) {}
+        }
+    }
+
    @Override
    public Map<String, ProtectedRegion> getRegions() {
        return regions;
@@ -1025,7 +1175,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
    public void setRegions(Map<String, ProtectedRegion> regions) {
        this.regions = regions;
    }
-    
+
    protected Object sqlUnmarshal(String rawValue) {
        try {
            return yaml.load(rawValue);
@@ -1033,7 +1183,7 @@ public class MySQLDatabase extends AbstractProtectionDatabase {
            return String.valueOf(rawValue);
        }
    }
-    
+
    protected String sqlMarshal(Object rawObject) {
        return yaml.dump(rawObject);
    }
@@ -40,7 +40,7 @@ public final class DefaultFlag {
    public static final StateFlag OTHER_EXPLOSION = new StateFlag("other-explosion", true);
    public static final StateFlag SLEEP = new StateFlag("sleep", true);
    public static final StateFlag TNT = new StateFlag("tnt", true, RegionGroup.ALL);
-    public static final StateFlag LIGHTER = new StateFlag("lighter", true, RegionGroup.ALL);
+    public static final StateFlag LIGHTER = new StateFlag("lighter", true);
    public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", true);
    public static final StateFlag LAVA_FIRE = new StateFlag("lava-fire", true);
    public static final StateFlag LIGHTNING = new StateFlag("lightning", true);
@@ -59,6 +59,8 @@ public final class DefaultFlag {
    public static final StateFlag LEAF_DECAY = new StateFlag("leaf-decay", true);
    public static final StateFlag GRASS_SPREAD = new StateFlag("grass-growth", true);
    public static final StateFlag MYCELIUM_SPREAD = new StateFlag("mycelium-spread", true);
+    public static final StateFlag VINE_GROWTH = new StateFlag("vine-growth", true);
+    public static final StateFlag SOIL_DRY = new StateFlag("soil-dry", true);
    public static final StateFlag ENDER_BUILD = new StateFlag("enderman-grief", true);
    public static final StateFlag INVINCIBILITY = new StateFlag("invincible", false, RegionGroup.ALL);
    public static final StateFlag EXP_DROPS = new StateFlag("exp-drops", true, RegionGroup.ALL);
@@ -76,11 +78,12 @@ public final class DefaultFlag {
    public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter", RegionGroup.ALL);
    public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave", RegionGroup.ALL);
    public static final SetFlag<EntityType> DENY_SPAWN = new SetFlag<EntityType>("deny-spawn", RegionGroup.ALL, new EntityTypeFlag(null));
+    public static final SetFlag<EntityType> DENY_PVM = new SetFlag<EntityType>("deny-pvm", new EntityTypeFlag(null));
    public static final EnumFlag<GameMode> GAME_MODE = new EnumFlag<GameMode>("game-mode", GameMode.class, RegionGroup.ALL);
    public static final IntegerFlag HEAL_DELAY = new IntegerFlag("heal-delay", RegionGroup.ALL);
    public static final IntegerFlag HEAL_AMOUNT = new IntegerFlag("heal-amount", RegionGroup.ALL);
-    public static final IntegerFlag MIN_HEAL = new IntegerFlag("heal-min-health", RegionGroup.ALL);
-    public static final IntegerFlag MAX_HEAL = new IntegerFlag("heal-max-health", RegionGroup.ALL);
+    public static final DoubleFlag MIN_HEAL = new DoubleFlag("heal-min-health", RegionGroup.ALL);
+    public static final DoubleFlag MAX_HEAL = new DoubleFlag("heal-max-health", RegionGroup.ALL);
    public static final IntegerFlag FEED_DELAY = new IntegerFlag("feed-delay", RegionGroup.ALL);
    public static final IntegerFlag FEED_AMOUNT = new IntegerFlag("feed-amount", RegionGroup.ALL);
    public static final IntegerFlag MIN_FOOD = new IntegerFlag("feed-min-hunger", RegionGroup.ALL);
@@ -89,6 +92,7 @@ public final class DefaultFlag {
    // public static final StringFlag MAX_PLAYERS_MESSAGE = new StringFlag("max-players-reject-message", RegionGroup.ALL);
    public static final LocationFlag TELE_LOC = new LocationFlag("teleport", RegionGroup.MEMBERS);
    public static final LocationFlag SPAWN_LOC = new LocationFlag("spawn", RegionGroup.MEMBERS);
+    public static final StateFlag ENABLE_SHOP = new StateFlag("allow-shop", false);
    public static final BooleanFlag BUYABLE = new BooleanFlag("buyable");
    public static final DoubleFlag PRICE = new DoubleFlag("price");
    public static final SetFlag<String> BLOCKED_CMDS = new SetFlag<String>("blocked-cmds", RegionGroup.ALL, new CommandStringFlag(null));
@@ -97,25 +101,40 @@ public final class DefaultFlag {
    public static final Flag<?>[] flagsList = new Flag<?>[] {
        PASSTHROUGH, BUILD, CONSTRUCT, PVP, CHEST_ACCESS, PISTONS,
        TNT, LIGHTER, USE, PLACE_VEHICLE, DESTROY_VEHICLE, SLEEP,
-        MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY, EXP_DROPS,
+        MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, DENY_PVM, INVINCIBILITY, EXP_DROPS,
        CREEPER_EXPLOSION, OTHER_EXPLOSION, ENDERDRAGON_BLOCK_DAMAGE, GHAST_FIREBALL, ENDER_BUILD,
        GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
        EXIT, ENTRY, LIGHTNING, ENTITY_PAINTING_DESTROY, ENDERPEARL,
        ENTITY_ITEM_FRAME_DESTROY, ITEM_DROP, /*MAX_PLAYERS, MAX_PLAYERS_MESSAGE,*/
        HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
        FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
-        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT, GAME_MODE,
-        MUSHROOMS, LEAF_DECAY, GRASS_SPREAD, MYCELIUM_SPREAD, SEND_CHAT,
-        RECEIVE_CHAT, FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
+        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT, SOIL_DRY, GAME_MODE,
+        MUSHROOMS, LEAF_DECAY, GRASS_SPREAD, MYCELIUM_SPREAD, VINE_GROWTH,
+        SEND_CHAT, RECEIVE_CHAT, FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
        TELE_LOC, SPAWN_LOC, POTION_SPLASH,
-        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE,
+        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE, ENABLE_SHOP
    };

-
    private DefaultFlag() {
    }

    public static Flag<?>[] getFlags() {
        return flagsList;
    }
+
+    /**
+     * Try to match the flag with the given ID using a fuzzy name match.
+     *
+     * @param id the flag ID
+     * @return a flag, or null
+     */
+    public static Flag<?> fuzzyMatchFlag(String id) {
+        for (Flag<?> flag : DefaultFlag.getFlags()) {
+            if (flag.getName().replace("-", "").equalsIgnoreCase(id.replace("-", ""))) {
+                return flag;
+            }
+        }
+
+        return null;
+    }
 }
@@ -52,6 +52,8 @@ public class DoubleFlag extends Flag<Double> {
    public Double unmarshal(Object o) {
        if (o instanceof Double) {
            return (Double) o;
+        } else if (o instanceof Number) {
+        	return ((Number) o).doubleValue();
        } else {
            return null;
        }
@@ -52,6 +52,8 @@ public class IntegerFlag extends Flag<Integer> {
    public Integer unmarshal(Object o) {
        if (o instanceof Integer) {
            return (Integer) o;
+        } else if (o instanceof Number) {
+        	return ((Number) o).intValue();
        } else {
            return null;
        }
@@ -76,6 +76,7 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
        setMinMaxPoints(min, pt);
    }

+    @Override
    public List<BlockVector2D> getPoints() {
        List<BlockVector2D> pts = new ArrayList<BlockVector2D>();
        int x1 = min.getBlockX();
@@ -85,8 +86,8 @@ public class ProtectedCuboidRegion extends ProtectedRegion {

        pts.add(new BlockVector2D(x1, z1));
        pts.add(new BlockVector2D(x2, z1));
-        pts.add(new BlockVector2D(x1, z2));
        pts.add(new BlockVector2D(x2, z2));
+        pts.add(new BlockVector2D(x1, z2));

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

 package com.sk89q.worldguard;

-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
+
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;

@org.junit.Ignore
 public class TestPlayer extends LocalPlayer {
@@ -49,32 +49,27 @@ public class TestPlayer extends LocalPlayer {

    @Override
    public Vector getPosition() {
-        // TODO Auto-generated method stub
-        return null;
+        return new Vector(0, 0, 0);
    }

    @Override
    public void kick(String msg) {
-        // TODO Auto-generated method stub
-        
+        System.out.println("TestPlayer{" + this.name + "} kicked!");
    }

    @Override
    public void ban(String msg) {
-        // TODO Auto-generated method stub
-        
+        System.out.println("TestPlayer{" + this.name + "} banned!");
    }

    @Override
    public void printRaw(String msg) {
-        // TODO Auto-generated method stub
-        
+        System.out.println("-> TestPlayer{" + this.name + "}: " + msg);
    }

    @Override
    public String[] getGroups() {
-        // TODO Auto-generated method stub
-        return null;
+        return groups.toArray(new String[groups.size()]);
    }

    @Override
@@ -19,26 +19,8 @@

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

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

 package com.sk89q.worldguard.protection;

+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
@@ -26,19 +35,11 @@ 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 abstract class RegionOverlapTest {
    static String COURTYARD_ID = "courtyard";
@@ -166,7 +167,6 @@ public abstract class RegionOverlapTest {
        HashSet<ProtectedRegion> test = new HashSet<ProtectedRegion>();
        test.add(courtyard);
        test.add(fountain);
-        System.out.println(test);

        // Outside
        appl = manager.getApplicableRegions(outside);
@@ -28,7 +28,6 @@ import com.sk89q.worldguard.TestPlayer;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.FlatRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.*;
 import org.junit.Test;
@@ -1,14 +1,12 @@
-package com.sk89q.worldguard.protection;
+package com.sk89q.worldguard.protection.regions;

 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import org.junit.Test;
 import static org.junit.Assert.*;

 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 public class RegionIntersectTest {
@@ -79,4 +77,27 @@ public class RegionIntersectTest {

        assertEquals("Check for '" + region2.getId() + "' region failed.", expected, actual);
    }
+
+    private static final BlockVector2D[] polygon = {
+            new BlockVector2D(1, 0),
+            new BlockVector2D(4, 3),
+            new BlockVector2D(4, -3),
+    };
+
+    @Test
+    public void testIntersection() throws Exception {
+        final ProtectedCuboidRegion cuboidRegion = new ProtectedCuboidRegion("cuboidRegion", new BlockVector(-3, -3, -3), new BlockVector(3, 3, 3));
+        for (int angle = 0; angle < 360; angle += 90) {
+            final BlockVector2D[] rotatedPolygon = new BlockVector2D[polygon.length];
+            for (int i = 0; i < polygon.length; i++) {
+                final BlockVector2D vertex = polygon[i];
+                rotatedPolygon[i] = vertex.transform2D(angle, 0, 0, 0, 0).toBlockVector2D();
+            }
+
+            final ProtectedPolygonalRegion polygonalRegion = new ProtectedPolygonalRegion("polygonalRegion", Arrays.asList(rotatedPolygon), -3, 3);
+
+            assertTrue(String.format("%s does not intersect (cuboid.intersectsEdges(polygonal)", Arrays.asList(rotatedPolygon)), cuboidRegion.intersectsEdges(polygonalRegion));
+            assertTrue(String.format("%s does not intersect (polygonal.intersectsEdges(cuboid)", Arrays.asList(rotatedPolygon)), polygonalRegion.intersectsEdges(cuboidRegion));
+        }
+    }
 }
Author	SHA1	Message	Date
Dark Arc	82cde6b5ec	Implemented a PvM Flag	2014-07-06 18:14:58 -04:00
sk89q	d827e01760	Merge pull request #313 from TheCutter/master	2014-07-06 15:09:51 -07:00
sk89q	5e6de8b76d	Added runtime CraftBukkit dependencies.	2014-07-06 15:03:22 -07:00
sk89q	b298bedea0	Set saturation level to food level with feed flag.	2014-06-26 17:47:14 -07:00
TomyLobo	fb5ae838d9	Merge pull request #315 from eswick/master Convert region ID to lowercase when saving polygon points to MySQL database.	2014-06-23 19:14:47 +02:00
eswick	3bfcd69fd9	Convert region ID to lowercase when saving polygon points to MySQL database. Check number of points in polygonal region before registering it. When saving the points of a polygonal region to a MySQL database, the region ID was not converted to lowercase. If a region ID contained a capital letter, upon reload no points would be found, causing an out-of-bounds exception and essentially leaving WorldGuard unuseable.	2014-06-22 14:13:45 -04:00
Wizjany	c66adf0119	Removed sensitive info from reports.	2014-06-17 23:24:13 -04:00
TheCutter	2119b274fd	Merge branch 'master' of https://github.com/sk89q/worldguard	2014-06-14 21:36:06 +02:00
wizjany	22f45c45ee	Apply obsidian generator disabling to tripwire.	2014-05-07 13:09:06 -04:00
wizjany	0dd9729b35	Fixed logic error in blocked-cmds for real this time. Closes WORLDGUARD-3050.	2014-04-29 12:01:38 -04:00
wizjany	ff46c2cf54	Fixed logic error in blocked-cmds checkings. Closes WORLDGUARD-3048.	2014-04-26 11:31:24 -04:00
TheCutter	1537fc879e	fixed indenation	2014-04-19 15:53:15 +02:00
TheCutter	f00352cde0	updates comments	2014-04-19 11:03:03 +02:00
TheCutter	fdc74b1c0d	fixing syntax for guideline	2014-04-18 20:21:48 +02:00
TheCutter	83a3c61b66	fixed memory leak with closing mysql resources	2014-04-18 20:10:32 +02:00
wizjany	4422d536b7	Fixed a compilation error due to a sort-of-but-not-really-breaking bukkit change.	2014-02-28 21:21:00 -05:00
wizjany	1f40908c04	[maven-release-plugin] prepare for next development iteration	2014-02-28 20:03:38 -05:00
wizjany	b707289284	[maven-release-plugin] prepare release 5.9	2014-02-28 20:03:35 -05:00
wizjany	43486bda63	Fix versioning error for release	2014-02-28 20:01:37 -05:00
sk89q	7086a1d0d2	Prepared release of v5.9.	2014-02-28 16:45:09 -08:00
TomyLobo	4dd13bd925	Merge pull request #310 from jmhertlein/master Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order Fixes com.sk89q.worldguard.protection.regions.RegionIntersectTest.testIntersection.	2014-02-28 08:19:30 +01:00
TomyLobo	4ce97bca0e	Added a unit test for ProtectedRegion.intersectsEdges.	2014-02-28 00:48:40 +01:00
Joshua M Hertlein	ec9712f30e	Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order ProtectedPolygonRegion returns points in an order such that you could play "connect the dots" and end up with the correct polygon. ProtectedCuboidRegion returns them in an order such that playing connect the dots gives you a Z shape. This breaks the intersectsEdges() function in ProtectedRegion when comparing cuboids. This commit causes ProtectedCuboidRegion::getPoints() to return them in an order consistent with ProtectedPolygonRegion, which makes intersectsEdges() work correctly.	2014-02-25 13:51:57 -06:00
Albert Pham	0162910964	Added <distributionManagement> to pom.xml	2014-02-23 22:26:36 -08:00
TomyLobo	c252a79c1a	Copied some .gitignore entries from WorldEdit.	2014-02-10 08:52:29 +01:00
wizjany	2df3290d38	Fixed snowman trails being treated as snow fall.	2014-01-11 16:08:26 -05:00
wizjany	4805df2f03	Fix being able to use bonemeal to turn tall grass into double plants.	2014-01-08 14:56:59 -05:00
wizjany	5bc670db8b	Fixed CI link in readme.	2014-01-08 14:56:58 -05:00
Wizjany	ffda88f193	Fix number of args for migratedb command.	2013-12-14 17:21:07 -05:00
Dark Arc	96a69aa2ef	Resolved an issue where explosions of type OTHER_EXPLOSION were ignoring the world config settings	2013-12-11 00:53:49 -05:00
wizjany	2d90fddbee	Check for entities and projectiles removing items from frames too.	2013-12-09 17:46:33 -05:00
wizjany	bbd1a0ef10	Protect items in item frames in protected regions.	2013-12-09 08:40:28 -05:00
TomyLobo	6b16ed79b3	Merge pull request #298 from md-5/herd_u_like_ifs Using checked exceptions for control flow is slow. Lets replace it with an isEmpty check.	2013-12-09 00:28:16 -08:00
md_5	73b9a7fb0d	Using checked exceptions for control flow is slow. Lets replace it with an isEmpty check.	2013-12-09 19:22:48 +11:00
wizjany	4a0ae833f0	Revert WE dependency to 5.5.8. WorldGuard didn't use any new API since then, so depending on an unstable snapshot wasn't necessary.	2013-11-18 15:30:17 -05:00
wizjany	5f32ebe2de	Fix compile-time error due to `23766f20`	2013-11-17 21:16:51 -05:00
Albert Pham	723928d239	Merge pull request #289 from sk89q/develop Tiny changes extracted from various branches.	2013-11-17 15:03:19 -08:00
TomyLobo	d024ed7b81	typos, unused imports	2013-11-17 23:59:02 +01:00
TomyLobo	ec4143d3dc	Bumped WE dependency to 5.5.9-SNAPSHOT.	2013-11-17 23:48:19 +01:00
TomyLobo	071fdaabd3	Added *.iml and .idea to .gitignore.	2013-11-17 23:48:18 +01:00
TomyLobo	23766f20dd	Transformed the BlockFadeEvent handler into a switch.	2013-11-16 17:35:35 +01:00
TomyLobo	31739c647b	Dissolved a .* import. Rationale: grepping for qualified class names	2013-11-16 17:35:35 +01:00
Dark Arc	faa016180a	Added a config option to allow explosion flags to only prevent block damage	2013-09-22 15:39:10 -04:00
wizjany	e26238e814	Added formatting codes, &k/l/m/n/o and &x (reset).	2013-08-31 10:07:46 -04:00
wizjany	f8ed1a3e3e	Make /rg list default to own regions if the player doesn't have permission otherwise.	2013-08-27 23:36:01 -04:00
Wizjany	d47c255168	Check bypass perms for item-drop flag.	2013-08-20 17:03:00 -04:00
wizjany	d1e7796f81	Added allow-tamed-spawns setting, on by default. This will stop WorldGuard from culling tamed animals in regions with mob-spawning deny when they log in with their owner.	2013-08-20 14:58:46 -04:00
Wizjany	1095064c5e	Update CommandBook dependency to 2.3.	2013-08-18 23:32:51 -04:00
wizjany	a15c9d289b	There have been bigger non-backwards-compatible changes since.	2013-08-18 18:48:31 -04:00
wizjany	c0f95bebf0	Send item-use blacklist event when right-clicking entities.	2013-08-16 13:17:28 -04:00
wizjany	0a54779fc4	Added snow-fall-blocks option to config to restrict snow fall to certain blocks	2013-08-12 18:09:45 -04:00
wizjany	ac525958c5	Added config option and flag to prevent soil from drying naturally.	2013-08-12 18:06:31 -04:00
wizjany	458cf64501	Fixed addowner/addmember commands adding command artifacts. Specifically, "-w <world>" will no longer be added when using it. This requires WorldEdit with commit cd5f832 or newer. Additionally fixed a typo: DefaultDomain.removaAll -> removeAll.	2013-08-03 09:46:29 -04:00
wizjany	4acef77623	Fixed milking cows in protected areas. It seems that Bukkit changed the return of the bucket/itemstack methods in the event, causing WG to think a different bucket was used.	2013-07-30 11:14:59 -04:00
TomyLobo	d38d7fc492	Changed entity report format slightly. This makes it clearer to users what that floating point number means.	2013-07-30 12:15:28 +02:00
wizjany	2510c3eeb5	Allow players to add newlines (\n) via command, not just manually in yml.	2013-07-25 13:10:16 -04:00
wizjany	326d53fd09	Allow the console to load/save all region managers with one command.	2013-07-25 10:12:03 -04:00
sk89q	75b3082b12	[maven-release-plugin] prepare for next development iteration	2013-07-16 11:07:26 -07:00
sk89q	1f214aadee	[maven-release-plugin] prepare release 5.8	2013-07-16 11:07:06 -07:00
sk89q	174b3fad15	Updated Maven release plugin to 2.4.1.	2013-07-16 10:45:44 -07:00
sk89q	07531f67d4	Updated org.bukkit:bukkit dependency to 1.6.2-R0.1-SNAPSHOT.	2013-07-16 10:35:30 -07:00
sk89q	291c45064a	Bumped version to 5.8-SNAPSHOT, updated CHANGELOG.txt.	2013-07-07 12:28:57 -07:00
sk89q	6f56cb29a5	Fixed -w flag for /rg load and /rg save.	2013-07-07 12:14:41 -07:00
sk89q	977c7d2f29	Changed DoubleFlag and IntegerFlag to take java.lang.Number objects in unmarshal().	2013-07-07 11:45:22 -07:00
sk89q	ecb87efe8d	Update Bukkit dependency to version 1.6.1-R0.1-SNAPSHOT.	2013-07-07 11:42:24 -07:00
sk89q	a57c162cd8	Convert heal flags datatype from integer to double. Existing data should be cast with no data loss.	2013-07-07 11:38:03 -07:00
wizjany	60c3ed4f6b	Polish the fix from the last commit and straighten some other multiworld issues in the move handler.	2013-06-23 20:17:20 -04:00
wizjany	714e75eb95	Potential fix for broken multiworld states.	2013-06-23 16:35:57 -04:00
Wizjany	636819c801	Revert change to permissions node for flags. region.flag.own/member/etc was region.flag.regions.own/member/etc This shouldn't be changed in between, especially if we maintain compatibility with the other flag node (flag.flags).	2013-06-20 00:52:59 -03:00
wizjany	9a6c2e0685	Finish reverting changes from earlier	2013-06-10 23:12:06 -04:00
wizjany	736eecc13b	Add config option to use player teleports for move events. Additionally removed code duplication in Vehicle listener.	2013-06-08 12:04:58 -04:00
TomyLobo	4718c5dab0	Removed unused imports.	2013-06-07 14:06:07 +02:00
Albert Pham	7e9bd49da2	Added mobs.disable-snowman-trails.	2013-06-02 13:23:01 -07:00
wizjany	a0d0ff0b92	Lighter changes in BlockIgnite as well	2013-06-02 11:19:12 -04:00
wizjany	b41be0c319	Added a static WorldGuardPlugin instance and made the utility methods in RegionCommands static.	2013-06-01 18:14:59 -04:00
wizjany	17a466059e	A few changes in the new region commands. - Allow setting flags on the global region (bugfix) - Don't throw permissions errors when listing available flags (bugfix) - Info command defaults to global region if no others are present (enhancement) - A few typo and spacing fixes (enhancement)	2013-06-01 17:39:49 -04:00
wizjany	2d9e95a63e	Revert lighter changes for now. This brings back the odd behaviors between flint & steel and fire charges, but makes it more intuitive for protection.	2013-06-01 10:14:56 -04:00
Albert Pham	532a45f9e7	Offering a sacrifice to the gods of pedantry. canX() -> mayX() for permissions.	2013-05-31 22:06:37 -07:00
Albert Pham	d61e32ebb5	Cleaned up RegionCommands, abstracted region permissions.	2013-05-31 21:56:32 -07:00
Albert Pham	b7d38e94c8	Added -a flag to region remove owner/member commands to remove all.	2013-05-29 13:24:40 -07:00
wizjany	ae158742f6	[maven-release-plugin] prepare for next development iteration	2013-05-26 17:20:00 -04:00
wizjany	c35686f8d1	[maven-release-plugin] prepare release 5.7.5	2013-05-26 17:20:00 -04:00
wizjany	a5b6651582	Update CHANGELOG for 5.7.4 and 5.7.5	2013-05-26 17:10:35 -04:00
wizjany	54973fdf82	Large patch with lots of changes and fixes. - Unified movement checking. Teleporting is now handled by entry/exit flags. Additionally, a region movement event is much closer to being added. - Fixed an issue with enderpearls and exit/entry flags conflicting. - Fixed a null check issue in several commands. - Fixed allowed and blocked command flags making false matches and improved support for blocking/allowing specific command args.	2013-05-26 17:08:51 -04:00
wizjany	0bee631385	Use getName instead of toString for displaying world name.	2013-05-15 07:56:04 -04:00
wizjany	6283382837	Fixed a few movement flag related issues. WG no longer prefixes greeting/farewell flags with '', allowing people to customize the message. (Adding &c to the beginning of the message will give previous behavior) Removed the "game mode locked" message since it returns false gamemodes when being called inside a player move event.	2013-05-05 10:57:46 -04:00
Silthus	39bb522051	Fixes heal flag bugs when player.maxHealth > 20 With the new Bukkit Changes the Player Health can be above 20, this fixes the magic number by using the now built in Bukkit functionality. Examples of this bug were Health jumping to 1/20 hearts when having a heal-amount: -1	2013-05-04 11:47:43 +03:00
wizjany	bf80d57abe	Add fishing to xp blocker.	2013-04-21 08:59:24 -04:00
wizjany	865b94006a	Apply other-explosion flag to entity damage as well.	2013-04-09 17:23:56 -04:00
wizjany	874248f8b5	Fix other explosion flag only clearing blocklist	2013-04-09 12:25:05 -04:00
steffen	cef7d5bb12	Fix explosion check order If the explosion is blocked and the block damage is also blocked, it's necessary to block the explosion (which includes the damage) instead of just the block damage.	2013-04-01 18:34:11 -04:00
wizjany	2a8131780f	Don't ignore canceled air right click events. Apparently Bukkit pre-cancels them even if they would do something.	2013-03-31 19:13:05 -04:00
Wizjany	7094f70f4a	Remove duplicate check. (derp)	2013-03-31 19:13:04 -04:00
wizjany	df5af6129c	Improved lighter handling.	2013-03-23 21:10:30 -04:00
wizjany	a6888c3767	Respect LIGHTER flag for ignition build checks	2013-03-23 15:19:56 -04:00
wizjany	1bd367ddde	Fix one last witherskull/fireball conflict	2013-03-22 19:28:18 -04:00
wizjany	0cf87ae561	Allow cow milking in no-build areas	2013-03-22 15:35:30 -04:00
wizjany	fa80f5f67f	Fix infinite durability. For whatever reason, the Bukkit API thinks that 'Durability" and "Damage" are synonymous.	2013-03-18 13:25:11 -04:00
sk89q	7f080f920d	[maven-release-plugin] prepare for next development iteration	2013-03-16 22:17:14 -07:00
sk89q	13658323b4	[maven-release-plugin] prepare release 5.7.3	2013-03-16 22:16:51 -07:00
sk89q	2d440ab5ba	Cleaned up pom.xml.	2013-03-16 22:01:14 -07:00
sk89q	dc55673691	Updated changelog for 5.7.3.	2013-03-16 21:12:26 -07:00
wizjany	92bb3948a6	Fix for minecart naming	2013-03-16 21:47:31 -04:00
wizjany	f67ad6478c	[maven-release-plugin] prepare for next development iteration	2013-03-15 16:01:09 -04:00
wizjany	1d984198ce	[maven-release-plugin] prepare release 5.7.2	2013-03-15 16:01:02 -04:00
wizjany	f2ca980771	Update changelog to 5.7.2	2013-03-15 15:44:48 -04:00
wizjany	b826697aea	Add flag check to smelting/mining xp handling	2013-03-15 15:44:34 -04:00
wizjany	89430c13ec	Handle TNT Minecarts with tnt flag/settings.	2013-03-15 15:32:57 -04:00
Wizjany	f07acea3e1	Updated to MC 1.5	2013-03-15 14:42:20 -04:00
wizjany	e9402c55e6	Fixed a bunch of small bugs	2013-03-14 18:45:05 -04:00
wizjany	2eb6c76da8	Fix stack issue.	2013-03-13 14:38:28 -04:00
Wizjany	a34e48a145	Added unit test for entry and exit flags to put the matter to rest. Also cleaned up a few other things regarding tests.	2013-03-01 22:20:16 -05:00
Wizjany	2d50659b48	Apply exp flag and config setting to xp bottles. "Workaround" for not being able to blacklist exp bottles at the moment. Although I supposed I could have just fixed that instead, this allows more flexibility.	2013-02-21 10:20:47 -05:00
Wizjany	327ae2b807	Apply crop trampling setting to all entities.	2013-02-21 10:13:17 -05:00
Wizjany	dfb6114584	Fix a few wolf issues	2013-01-31 08:23:38 -05:00
Wizjany	5085841d9d	[maven-release-plugin] prepare for next development iteration	2013-01-30 16:26:26 -05:00
Wizjany	7a98944469	[maven-release-plugin] prepare release 5.7.1	2013-01-30 16:26:20 -05:00
Wizjany	3d2b455cda	Update changelog for 5.7.1	2013-01-30 16:21:55 -05:00
Wizjany	460d5d0691	Made wolves respect pvp stuff. Removed some extraneous code.	2013-01-30 15:27:52 -05:00
Wizjany	b5f80351ec	Allow a lot of commands to be sent from the console. Examples: /rg addmem <id> <player> -w <worldname> /rg flag <id> <flag> -w <worldname> <flagvalue> /rg remove <id> -w <worldname> Command blocks are currently untested. List of commands: flag, priority, parent, remove, addmember, removemember, addowner, removeowner	2013-01-30 14:45:29 -05:00
Wizjany	72a9472a57	Add vine growth flag and config option.	2013-01-30 14:02:45 -05:00
Wizjany	7eb820c688	Fixed bug where players could place beds on the borders of regions without permissions	2013-01-30 13:47:48 -05:00
Wizjany	886b279da6	Bugfixes for bonemeal and minecarts.	2013-01-27 22:43:29 -05:00
Wizjany	f2d7135fc5	Check shooter of projectile when one hits a hanging entity	2013-01-25 21:07:11 -05:00
Wizjany	d214a859c3	Check the block that the item frame will end in, not the block the player clicked.	2013-01-21 04:08:17 -05:00
Wizjany	d1e221c2b7	Don't cancel explosion if we only want to clear blocklist. May potentially cause issues with multiple settings overlapping.	2013-01-19 08:46:51 -05:00
Dark Arc	e0e4207a4d	Apply a cap to the health and hunger flags to prevent possible exceptions If a player's health or hunger is set to higher than its respective maximum CraftBukkit will throw exceptions.	2013-01-16 14:48:39 -05:00
Wizjany	4398c781c5	Wither skulls should be handled separately from fireballs	2013-01-15 18:23:53 -05:00
Wizjany	3e06000fd9	Workaround for CraftBukkit bug with slab placement	2013-01-15 16:06:42 -05:00
Wizjany	833795ebe1	Add enderchest and anvil to blacklist inventories.	2013-01-14 13:31:54 -05:00
Wizjany	6e270d5ec3	Setting summary-on-start to false reduces much more clutter now	2013-01-13 17:21:51 -05:00
Wizjany	09a9bea3a7	Move enderchest to use flag	2013-01-13 16:10:06 -05:00
Wizjany	035ccee2a6	Fixed placing stuff in flower pots. (derp)	2013-01-13 13:44:54 -05:00
Wizjany	17aa2a4153	Fix region teleport permission	2013-01-13 06:13:41 -05:00
Wizjany	f5bc5c0b47	That was not in there	2013-01-13 03:48:11 -05:00
Wizjany	e7a4afde7d	[maven-release-plugin] prepare for next development iteration	2013-01-13 03:08:17 -05:00