[maven-release-plugin] prepare release 5.4

Updated changelog for release
Made WorldGuard check to see if both the attacker & defender are in a pvp area.
2011-12-17 20:16:41 -08:00 · 2011-12-17 19:37:24 -08:00 · 2011-12-14 20:15:42 -05:00 · 2011-12-11 08:34:14 -08:00 · 2011-12-11 08:29:42 -08:00 · 2011-12-10 12:52:32 -08:00
76 changed files with 2767 additions and 1578 deletions
@@ -0,0 +1,6 @@
+.classpath
+.project
+.settings
+target
+
+.DS_Store
@@ -1,3 +1,70 @@
+5.4:
+- Fixed configuration generation on Windows
+- Fixed intersection calculation for regions
+- Fixed timer and feeding delay for food flags
+- Fixed region managers not being created properly (This caused errors related to CREATURE_SPAWN)
+- Added support for Minecraft 1.0.1 blocks
+- Added support for enchantments and tool damage (worldguard.stack.damaged is the node) with /stack
+- Made being in the wg-invincible group respect the configuration's auto-invincible setting
+- Added per-group region claim limit maximum
+- Added worldguard.region.addowner.unclaimed.* permission for non-economy region 'buying'
+- Checking allowed/blocked commands now occurs earlier to override more plugins
+- Made PVP flag check whether either player is in a pvp deny region for blocking
+
+Contributions thanks to: epuidokas, wizjany, Turtle9598, and DerFlash
+
+5.3:
+- Added new config options and flags to better handle explosions of all types
+- Added config options and flags for snow, ice, mushroom spread, grass spread,
+    and leaf decay
+- Added min and max health flags to clamp the values for the existing healing
+    flags
+- Added hunger flags similar to the existing healing flags
+- Added an option to disable the use of the move event. This can boost
+    performance on large servers but will disable the greeting/farewell
+    and entry/exit flags
+- Added flag to prevent pistons (including those that are outside the
+    region, but would affect blocks inside the region)
+- Added a /wg flushstates [player] command to free players stuck in a
+    region that was exit-deny but no longer exists or the flag was removed
+- Added a config option to disable xp orb dropping
+- Added config option to disable redstone wire obsidian generators
+- Added a vehicle-destroy flag
+- Added enderman protection config and flag
+- Allowed and blocked command flags will now fall back to the global region
+- The worldguard.region.flag.own/member permissions are now
+    worldguard.region.flag.regions.own/member! Please change your permissions
+    accordingly.
+- Made //stack respect max stack sizes unless the player has the
+    worldguard.stack.illegitimate permission
+- Setting invincibility flag to deny will override god mode unless the player
+    has worldguard.god.override-regions
+- The sleep flag will now prevent beds in the nether from
+    exploding if set to deny
+- Existing regions can no longer be accidentally overwritten.
+    Use /region redefine to move an existing region.
+- The info command will now sort players alphabetically
+- Priming TNT by punching it with flint and steal should throw a blacklist
+    event (consistent with old Minecraft versions)
+- The /stoplag command will now remove xp orbs
+- Permissions system will use per-world permissions if the provider supports it
+- Players in vehicles are now subject to entry/exit and greeting/farewell flags
+- Fixed interact blacklist event not logging correctly
+- Fixed heal flag taking effect half a block northeast of the region
+- Fixed a infinite sign dropping bug
+- Fixed players being able to douse fire by punching it in regions they
+    couldn't build it
+- Fixed players being able to eat protected cake
+- Fence gate usage can be blocked with the use flag
+- Fixed chests being unprotected when they should be in 1.8
+- Fixed weather config settings not applying when a world was loaded
+- Fixed explosion handling in certain cases
+- Fixed arrows working in non-pvp zones
+- Fixed buckets working on the border of protected regions in certain cases
+Contributions thanks to:
+wizjany, zml2008, imjake9, Droolio, epuidokas,
+EduardBaer, TomyLobo, and halvors
+
 5.2.2:
 - Changed configuration saving so empty lists will be added to
    the configuration files.
@@ -1,186 +1,192 @@
-<!--
-  Maven build file for WorldGuard
-  Copyright (c) 2011 sk89q <http://www.sk89q.com> 
-  CommandBook is available under the GNU General Public License v3
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.sk89q</groupId>
-  <artifactId>worldguard</artifactId>
-  <version>5.2.2</version>
-  <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers</description>
-
-  <scm>
-    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
-    <url>https://github.com/sk89q/worldguard</url>
-    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
-  </scm>
-
-  <repositories>
-    <!-- Repository for other dependencies of SK's -->
-    <repository>
-      <id>sk89q-mvn2</id>
-      <url>http://mvn2.sk89q.com/repo</url>
-    </repository>
-    <!-- Repository for Bukkit -->
-    <repository>
-      <id>bukkit-repo</id>
-      <url>http://repo.bukkit.org/artifactory/repo</url>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <!-- Required component -->
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>4.4.2</version>
-    </dependency>
-    
-    <!-- Bukkit -->
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-    
-    <!-- Additional libraries -->
-    <dependency>
-      <groupId>com.nijikokun</groupId>
-      <artifactId>iconomy</artifactId>
-      <version>5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.khelekore</groupId>
-      <artifactId>prtree</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.opencsv</groupId>
-      <artifactId>opencsv</artifactId>
-      <version>2.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-
-    <!-- Resources -->
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>plugin.yml</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath>defaults/</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>config.yml</include>
-          <include>config_world.yml</include>
-          <include>blacklist.txt</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <!-- Compile plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-      </plugin>
-
-      <!-- JAR creation plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>true</addMavenDescriptor>
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-            <manifestEntries>
-              <Class-Path>WorldEdit.jar WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <!-- Shade -->
-      <!-- We want to bundle in some dependencies -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <!-- We want to bundle in the modified CSV library -->
-                <includes>
-                  <include>net.sf.opencsv:opencsv</include>
-                </includes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Assembly -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
-        </configuration>
-        <executions>
-          <execution>
-            <id>release</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Release -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <preparationGoals>assembly:assembly</preparationGoals>
-          <goals>assembly:assembly</goals>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <reporting>
-    <plugins>
-      <!-- Javadocs -->
-      <!-- TODO: Get Doclava working -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
-        <configuration>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
+<!--
+  Maven build file for WorldGuard
+  Copyright (c) 2011 sk89q <http://www.sk89q.com> 
+  WorldGuard is available under the GNU General Public License v3
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.sk89q</groupId>
+  <artifactId>worldguard</artifactId>
+  <version>5.4</version>
+  <name>WorldGuard</name>
+  <description>WorldGuard protects your Minecraft servers</description>
+
+  <scm>
+    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
+    <url>https://github.com/sk89q/worldguard</url>
+    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
+  </scm>
+
+  <repositories>
+    <!-- Repository for other dependencies of SK's -->
+    <repository>
+      <id>sk89q-mvn2</id>
+      <url>http://mvn2.sk89q.com/repo</url>
+    </repository>
+    <!-- Repository for Bukkit -->
+    <repository>
+      <id>bukkit-repo</id>
+      <url>http://repo.bukkit.org/artifactory/repo</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <!-- Required component -->
+    <dependency>
+      <groupId>com.sk89q</groupId>
+      <artifactId>worldedit</artifactId>
+      <version>4.7</version>
+    </dependency>
+    
+    <!-- Bukkit -->
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.0.0-R1-SNAPSHOT</version>
+    </dependency>
+    
+    <!-- Additional libraries -->
+    <dependency>
+      <groupId>com.nijikokun</groupId>
+      <artifactId>iconomy</artifactId>
+      <version>5.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.khelekore</groupId>
+      <artifactId>prtree</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.opencsv</groupId>
+      <artifactId>opencsv</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+
+    <!-- Resources -->
+    <resources>
+      <resource>
+        <targetPath>.</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+        <includes>
+          <include>plugin.yml</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>defaults/</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+        <includes>
+          <include>config.yml</include>
+          <include>config_world.yml</include>
+          <include>blacklist.txt</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <plugins>
+      <!-- Compile plugin -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+      </plugin>
+
+      <!-- JAR creation plugin -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>true</addMavenDescriptor>
+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Class-Path>WorldEdit.jar WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <!-- Shade -->
+      <!-- We want to bundle in some dependencies -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <!-- We want to bundle in the modified CSV library -->
+                <includes>
+                  <include>net.sf.opencsv:opencsv</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Assembly -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
+        </configuration>
+        <executions>
+          <execution>
+            <id>release</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Release -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <preparationGoals>assembly:assembly</preparationGoals>
+          <goals>assembly:assembly</goals>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <reporting>
+    <plugins>
+      <!-- Javadocs -->
+      <!-- TODO: Get Doclava working -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.8</version>
+        <configuration>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>
@@ -28,6 +28,7 @@
      <includes>
        <include>LICENSE.txt</include>
        <include>NOTICE.txt</include>
+        <include>CHANGELOG.txt</include>
        <include>blacklist_table.sql</include>
      </includes>
    </fileSet>
@@ -19,14 +19,19 @@

 package com.sk89q.worldguard.blacklist;

-import java.util.Map;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
-import java.util.logging.Logger;
+import java.util.Map;
 import java.util.logging.Level;
-import java.io.*;
+import java.util.logging.Logger;
+
 import org.bukkit.ChatColor;
+
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
@@ -40,7 +45,7 @@ public abstract class Blacklist {
     * Logger.
     */
    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
+
    /**
     * List of entries by block ID.
     */
@@ -60,17 +65,15 @@ public abstract class Blacklist {
    Map<String,BlacklistTrackedEvent> lastAffected =
            new HashMap<String,BlacklistTrackedEvent>();

-
    private boolean useAsWhitelist;

-    public Blacklist(Boolean useAsWhitelist)
-    {
+    public Blacklist(Boolean useAsWhitelist) {
        this.useAsWhitelist = useAsWhitelist;
    }

    /**
     * Returns whether the list is empty.
-     * 
+     *
     * @return
     */
    public boolean isEmpty() {
@@ -79,35 +82,35 @@ public abstract class Blacklist {

    /**
     * Get the entries for an item or list.
-     * 
-     * @param id 
-     * @return 
+     *
+     * @param id
+     * @return
     */
    public List<BlacklistEntry> getEntries(int id) {
        return blacklist.get(id);
    }
-    
+
    /**
     * Get the number of individual items that have blacklist entries.
-     * 
+     *
     * @return
     */
    public int getItemCount() {
        return blacklist.size();
    }
-    
+
    /**
     * Returns whether the blacklist is used as a whitelist.
-     * 
+     *
     * @return
     */
    public boolean isWhitelist() {
        return useAsWhitelist;
    }
-    
+
    /**
     * Get the logger.
-     * 
+     *
     * @return
     */
    public BlacklistLogger getLogger() {
@@ -116,7 +119,7 @@ public abstract class Blacklist {

    /**
     * Method to handle the event.
-     * 
+     *
     * @param event
     * @param forceRepeat
     * @param silent
@@ -250,36 +253,36 @@ public abstract class Blacklist {
            }
        }
    }
-    
+
    /**
     * Get the last event.
-     * 
+     *
     * @return
     */
    public BlacklistEvent getLastEvent() {
        return lastEvent;
    }
-    
+
    /**
     * Notify administrators.
-     * 
+     *
     * @param event
-     * @param comment 
+     * @param comment
     */
    public void notify(BlacklistEvent event, String comment) {
        lastEvent = event;
-        
-        broadcastNotification(ChatColor.GRAY + "WG: " 
+
+        broadcastNotification(ChatColor.GRAY + "WG: "
                + ChatColor.LIGHT_PURPLE + event.getPlayer().getName()
                + ChatColor.GOLD + " (" + event.getDescription() + ") "
                + ChatColor.WHITE
                + getFriendlyItemName(event.getType())
                + (comment != null ? " (" + comment + ")" : "") + ".");
    }
-    
+
    /**
     * Sends a notification to all subscribing users.
-     * 
+     *
     * @param msg
     */
    public abstract void broadcastNotification(String msg);
@@ -302,7 +305,7 @@ public abstract class Blacklist {

    /**
     * Get an item's ID from its name.
-     * 
+     *
     * @param name
     */
    private static int getItemID(String name) {
@@ -316,7 +319,7 @@ public abstract class Blacklist {

    /**
     * Get an item's friendly name with its ID.
-     * 
+     *
     * @param id
     */
    private static String getFriendlyItemName(int id) {
@@ -19,9 +19,11 @@

 package com.sk89q.worldguard.blacklist;

-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
+
 import org.bukkit.ChatColor;
+
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
@@ -52,7 +54,7 @@ public class BlacklistEntry {
     * List of permissions to not affect.
     */
    private Set<String> ignorePermissions;
-    
+
    private String[] breakActions;
    private String[] destroyWithActions;
    private String[] placeActions;
@@ -60,13 +62,13 @@ public class BlacklistEntry {
    private String[] useActions;
    private String[] dropActions;
    private String[] acquireActions;
-    
+
    private String message;
    private String comment;

    /**
     * Construct the object.
-     * 
+     *
     * @param blacklist
     */
    public BlacklistEntry(Blacklist blacklist) {
@@ -260,35 +262,35 @@ public class BlacklistEntry {

        return false;
    }
-    
+
    /**
     * Get the associated actions with an event.
-     * 
+     *
     * @param event
     * @return
     */
    private String[] getActions(BlacklistEvent event) {
        if (event instanceof BlockBreakBlacklistEvent) {
            return breakActions;
-            
+
        } else if (event instanceof BlockPlaceBlacklistEvent) {
            return placeActions;
-            
+
        } else if (event instanceof BlockInteractBlacklistEvent) {
            return interactActions;
-            
+
        } else if (event instanceof DestroyWithBlacklistEvent) {
            return destroyWithActions;
-            
+
        } else if (event instanceof ItemAcquireBlacklistEvent) {
            return acquireActions;
-            
+
        } else if (event instanceof ItemDropBlacklistEvent) {
            return dropActions;
-            
+
        } else if (event instanceof ItemUseBlacklistEvent) {
            return useActions;
-            
+
        } else {
            return null;
        }
@@ -296,8 +298,8 @@ public class BlacklistEntry {

    /**
     * Method to handle the event.
-     * 
-     * @param useAsWhitelist 
+     *
+     * @param useAsWhitelist
     * @param event
     * @param forceRepeat
     * @param silent
@@ -305,7 +307,7 @@ public class BlacklistEntry {
     */
    public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean forceRepeat, boolean silent) {
        LocalPlayer player = event.getPlayer();
-        
+
        if (shouldIgnore(player)) {
            return true;
        }
@@ -326,21 +328,21 @@ public class BlacklistEntry {

        String actions[] = getActions(event);

-        
+
        boolean ret = useAsWhitelist ? false : true;
-        
+
        // Nothing to do
        if (actions == null) {
            return useAsWhitelist ? false : true;
        }
-        
+
        for (String action : actions) {
            // Deny
            if (action.equalsIgnoreCase("deny")) {
                if (silent) {
                    return false;
                }
-                
+
                ret = false;

            // Allow
@@ -356,7 +358,7 @@ public class BlacklistEntry {
                if (silent) {
                    continue;
                }
-                
+
                if (this.message != null) {
                    player.kick(String.format(this.message,
                            getFriendlyItemName(event.getType())));
@@ -370,7 +372,7 @@ public class BlacklistEntry {
                if (silent) {
                    continue;
                }
-                
+
                if (this.message != null) {
                    player.ban("Banned: " + String.format(this.message,
                            getFriendlyItemName(event.getType())));
@@ -379,12 +381,12 @@ public class BlacklistEntry {
                            + event.getDescription() + " "
                            + getFriendlyItemName(event.getType()));
                }
-            
+
            } else if (!silent && (!repeating || forceRepeat)) {
                // Notify
                if (action.equalsIgnoreCase("notify")) {
                    blacklist.notify(event, comment);
-                
+
                // Log
                } else if (action.equalsIgnoreCase("log")) {
                    blacklist.getLogger().logEvent(event, comment);
@@ -409,7 +411,7 @@ public class BlacklistEntry {

    /**
     * Get an item's friendly name with its ID.
-     * 
+     *
     * @param id
     */
    private static String getFriendlyItemName(int id) {
@@ -19,8 +19,9 @@

 package com.sk89q.worldguard.blacklist;

-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
+
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 import com.sk89q.worldguard.blacklist.loggers.BlacklistLoggerHandler;

@@ -59,7 +60,7 @@ public class BlacklistLogger implements BlacklistLoggerHandler {
    public void clearHandlers() {
        handlers.clear();
    }
-    
+
    /**
     * Log an event.
     *
@@ -31,8 +31,8 @@ public class BlacklistTrackedEvent {

    /**
     * Construct the object.
-     * 
-     * @param event 
+     *
+     * @param event
     * @param time
     */
    public BlacklistTrackedEvent(BlacklistEvent event, long time) {
@@ -34,7 +34,7 @@ public interface BlacklistLoggerHandler {
     * @param comment
     */
    public void logEvent(BlacklistEvent event, String comment);
-    
+
    /**
     * Close the logger.
     */
@@ -19,10 +19,18 @@

 package com.sk89q.worldguard.blacklist.loggers;

-import java.util.logging.Logger;
 import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;

 /**
 *
@@ -33,13 +41,13 @@ public class ConsoleLoggerHandler implements BlacklistLoggerHandler {
     * Logger.
     */
    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
-    
+
+
    private String worldName;
-    
+
    public ConsoleLoggerHandler(String worldName)
    {
-       this.worldName = worldName;    
+       this.worldName = worldName;
    }

    /**
@@ -54,49 +62,49 @@ public class ConsoleLoggerHandler implements BlacklistLoggerHandler {
            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
                    + " tried to break " + getFriendlyItemName(evt.getType())
                    + (comment != null ? " (" + comment + ")" : ""));
-        
+
        // Block place
        } else if (event instanceof BlockPlaceBlacklistEvent) {
            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
                    + " tried to place " + getFriendlyItemName(evt.getType())
                    + (comment != null ? " (" + comment + ")" : ""));
-        
+
        // Block interact
        } else if (event instanceof BlockInteractBlacklistEvent) {
            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
                    + " tried to interact with " + getFriendlyItemName(evt.getType())
                    + (comment != null ? " (" + comment + ")" : ""));
-        
+
        // Destroy with
        } else if (event instanceof DestroyWithBlacklistEvent) {
            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
                    + " tried to destroy with " + getFriendlyItemName(evt.getType())
                    + (comment != null ? " (" + comment + ")" : ""));
-        
+
        // Acquire
        } else if (event instanceof ItemAcquireBlacklistEvent) {
            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
                    + " tried to acquire " + getFriendlyItemName(evt.getType())
                    + (comment != null ? " (" + comment + ")" : ""));
-        
+
        // Drop
        } else if (event instanceof ItemDropBlacklistEvent) {
            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
                    + " tried to drop " + getFriendlyItemName(evt.getType())
                    + (comment != null ? " (" + comment + ")" : ""));
-        
+
        // Use
        } else if (event instanceof ItemUseBlacklistEvent) {
            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
                    + " tried to use " + getFriendlyItemName(evt.getType())
                    + (comment != null ? " (" + comment + ")" : ""));
-        
+
        // Unknown
        } else {
            logger.log(Level.INFO, "WorldGuard: [" + worldName + "] " + event.getPlayer().getName()
@@ -106,7 +114,7 @@ public class ConsoleLoggerHandler implements BlacklistLoggerHandler {

    /**
     * Get an item's friendly name with its ID.
-     * 
+     *
     * @param id
     */
    private static String getFriendlyItemName(int id) {
@@ -19,17 +19,19 @@

 package com.sk89q.worldguard.blacklist.loggers;

-import java.util.logging.Logger;
-import java.util.logging.Level;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.SQLException;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
@@ -72,12 +74,12 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {

    /**
     * Construct the object.
-     * 
+     *
     * @param dsn
     * @param user
     * @param pass
-     * @param table 
-     * @param worldName 
+     * @param table
+     * @param worldName
     */
    public DatabaseLoggerHandler(String dsn, String user, String pass, String table, String worldName) {
        this.dsn = dsn;
@@ -89,7 +91,7 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {

    /**
     * Gets the database connection.
-     * 
+     *
     * @return
     * @throws SQLException
     */
@@ -102,7 +104,7 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {

    /**
     * Log an event to the database.
-     * 
+     *
     * @param event
     * @param name
     * @param x
@@ -134,7 +136,7 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
                    + e.getMessage());
        }
    }
-    
+
    /**
     * Log an event.
     *
@@ -146,43 +148,43 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
            logEvent("BREAK", evt.getPlayer(), evt.getPosition(),
                    evt.getType(), comment);
-        
+
        // Block place
        } else if (event instanceof BlockPlaceBlacklistEvent) {
            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
            logEvent("PLACE", evt.getPlayer(), evt.getPosition(),
                    evt.getType(), comment);
-            
+
        // Block interact
-        } else if (event instanceof BlockPlaceBlacklistEvent) {
-            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
+        } else if (event instanceof BlockInteractBlacklistEvent) {
+            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
            logEvent("INTERACT", evt.getPlayer(), evt.getPosition(),
                    evt.getType(), comment);
-        
+
        // Destroy with
        } else if (event instanceof DestroyWithBlacklistEvent) {
            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
            logEvent("DESTROY_WITH", evt.getPlayer(), evt.getPosition(),
                    evt.getType(), comment);
-        
+
        // Acquire
        } else if (event instanceof ItemAcquireBlacklistEvent) {
            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
            logEvent("ACQUIRE", evt.getPlayer(), evt.getPlayer().getPosition(),
                    evt.getType(), comment);
-        
+
        // Drop
        } else if (event instanceof ItemDropBlacklistEvent) {
            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
            logEvent("DROP", evt.getPlayer(), evt.getPlayer().getPosition(),
                    evt.getType(), comment);
-        
+
        // Use
        } else if (event instanceof ItemUseBlacklistEvent) {
            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
            logEvent("USE", evt.getPlayer(), evt.getPlayer().getPosition(),
                    evt.getType(), comment);
-        
+
        // Unknown
        } else {
            logEvent("UNKNOWN", event.getPlayer(), event.getPlayer().getPosition(),
@@ -199,7 +201,7 @@ public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
                conn.close();
            }
        } catch (SQLException e) {
-            
+
        }
    }
 }
@@ -19,16 +19,33 @@

 package com.sk89q.worldguard.blacklist.loggers;

-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.io.*;
-import java.util.regex.*;
-import java.util.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;

 /**
 *
@@ -71,7 +88,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
     * Construct the object.
     *
     * @param pathPattern
-     * @param worldName 
+     * @param worldName
     */
    public FileLoggerHandler(String pathPattern, String worldName) {
        this.pathPattern = pathPattern;
@@ -83,7 +100,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
     *
     * @param pathPattern
     * @param cacheSize
-     * @param worldName 
+     * @param worldName
     */
    public FileLoggerHandler(String pathPattern, int cacheSize, String worldName) {
        if (cacheSize < 1) {
@@ -96,7 +113,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {

    /**
     * Build the path.
-     * 
+     *
     * @return
     */
    private String buildPath(String playerName) {
@@ -142,18 +159,18 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
            } else if (group.matches("%s")) {
                rep = String.format("%02d", calendar.get(Calendar.SECOND));
            }
-            
+
            m.appendReplacement(buffer, rep);
        }

        m.appendTail(buffer);
-        
+
        return buffer.toString();
    }

    /**
     * Log a message.
-     * 
+     *
     * @param player
     * @param message
     */
@@ -163,7 +180,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
            String date = dateFormat.format(new Date());
            String line = "[" + date + "] " + player.getName() + ": " + message
                    + (comment != null ? " (" + comment + ")" : "") + "\r\n";
-            
+
            FileLoggerWriter writer = writers.get(path);

            // Writer already exists!
@@ -185,7 +202,7 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
            if (parent != null && !parent.exists()) {
                parent.mkdirs();
            }
-            
+
            FileWriter stream = new FileWriter(path, true);
            BufferedWriter out = new BufferedWriter(stream);
            out.write(line);
@@ -222,19 +239,19 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {

    /**
     * Gets the coordinates in text form for the log.
-     * 
+     *
     * @param pos
     * @return
     */
    private String getCoordinates(Vector pos) {
        return "@" + pos.getBlockX() + "," + pos.getBlockY() + "," + pos.getBlockZ();
    }
-    
+
    private void logEvent(BlacklistEvent event, String text, int id, Vector pos, String comment) {
        log(event.getPlayer(), "Tried to " + text + " " + getFriendlyItemName(id)
                + " " + getCoordinates(pos), comment);
    }
-    
+
    /**
     * Log an event.
     *
@@ -245,37 +262,37 @@ public class FileLoggerHandler implements BlacklistLoggerHandler {
        if (event instanceof BlockBreakBlacklistEvent) {
            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
            logEvent(event, "break", evt.getType(), evt.getPosition(), comment);
-        
+
        // Block place
        } else if (event instanceof BlockPlaceBlacklistEvent) {
            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
            logEvent(event, "place", evt.getType(), evt.getPosition(), comment);
-        
+
        // Block interact
        } else if (event instanceof BlockInteractBlacklistEvent) {
            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
            logEvent(event, "interact with", evt.getType(), evt.getPosition(), comment);
-        
+
        // Destroy with
        } else if (event instanceof DestroyWithBlacklistEvent) {
            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
            logEvent(event, "destroy with", evt.getType(), evt.getPosition(), comment);
-            
+
        // Acquire
        } else if (event instanceof ItemAcquireBlacklistEvent) {
            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
            logEvent(event, "acquire", evt.getType(), evt.getPosition(), comment);
-        
+
        // Drop
        } else if (event instanceof ItemDropBlacklistEvent) {
            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
            logEvent(event, "drop", evt.getType(), evt.getPosition(), comment);
-            
+
        // Use
        } else if (event instanceof ItemUseBlacklistEvent) {
            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
            logEvent(event, "use", evt.getType(), evt.getPosition(), comment);
-        
+
        // Unknown
        } else {
            log(event.getPlayer(), "Unknown event: "
@@ -19,7 +19,7 @@

 package com.sk89q.worldguard.blacklist.loggers;

-import java.io.*;
+import java.io.BufferedWriter;

 /**
 *
@@ -41,8 +41,8 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {

    /**
     * Construct the object.
-     * 
-     * @param path 
+     *
+     * @param path
     * @param writer
     */
    public FileLoggerWriter(String path, BufferedWriter writer) {
@@ -53,7 +53,7 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {

    /**
     * File path.
-     * 
+     *
     * @return
     */
    public String getPath() {
@@ -73,7 +73,7 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {
    public long getLastUse() {
        return lastUse;
    }
-    
+
    /**
     * Update last use time.
     */
@@ -83,7 +83,7 @@ public class FileLoggerWriter implements Comparable<FileLoggerWriter> {

    /**
     * Comparison function.
-     * 
+     *
     * @param other
     * @return
     */
@@ -33,5 +33,4 @@ public class BukkitBlacklist extends Blacklist {
    public void broadcastNotification(String msg) {
        plugin.broadcastNotification(msg);
    }
-
 }
@@ -21,6 +21,7 @@ package com.sk89q.worldguard.bukkit;

 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;

@@ -73,5 +74,4 @@ public class BukkitPlayer extends LocalPlayer {
    public boolean hasPermission(String perm) {
        return plugin.hasPermission(player, perm);
    }
-
 }
@@ -21,18 +21,29 @@ package com.sk89q.worldguard.bukkit;

 import java.util.List;

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

 public class BukkitUtil {

-
    private BukkitUtil()  {
+    	
    }
    
    /**
@@ -99,7 +110,7 @@ public class BukkitUtil {
    public static void dropSign(Block block) {
        block.setTypeId(0);
        block.getWorld().dropItemNaturally(block.getLocation(),
-                new ItemStack(Material.SIGN));
+                new ItemStack(Material.SIGN, 1));
    }

    /**
@@ -219,4 +230,19 @@ public class BukkitUtil {

        return str;
    }
+
+    /**
+     * Returns whether an entity should be removed for the halt activity mode.
+     *
+     * @param entity
+     * @return
+     */
+    public static boolean isIntensiveEntity(Entity entity) {
+        return entity instanceof Item
+                || entity instanceof TNTPrimed
+                || entity instanceof ExperienceOrb
+                || (entity instanceof LivingEntity
+                && !(entity instanceof Tameable)
+                && !(entity instanceof Player));
+    }
 }
@@ -18,32 +18,34 @@
 */
 package com.sk89q.worldguard.bukkit;

-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.Blacklist;
 import java.io.File;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.util.config.Configuration;

+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.Blacklist;
+
 /**
 * Represents the global configuration and also delegates configuration
 * for individual worlds.
- * 
+ *
 * @author sk89q
 * @author Michael
 */
 public class ConfigurationManager {
-    
+
    private static final String CONFIG_HEADER = "#\r\n" +
            "# WorldGuard's main configuration file\r\n" +
            "#\r\n" +
            "# This is the global configuration file. Anything placed into here will\r\n" +
            "# be applied to all worlds. However, each world has its own configuration\r\n" +
-            "# file to allow you to replace any setting in here for that world only.\r\n" +
+            "# file to allow you to replace most settings in here for that world only.\r\n" +
            "#\r\n" +
            "# About editing this file:\r\n" +
            "# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If\r\n" +
@@ -63,30 +65,31 @@ public class ConfigurationManager {
     * Reference to the plugin.
     */
    private WorldGuardPlugin plugin;
-    
+
    /**
     * Holds configurations for different worlds.
     */
    private Map<String, WorldConfiguration> worlds;
-    
+
    /**
     * List of people with god mode.
     */
    private Set<String> hasGodMode = new HashSet<String>();
-    
+
    /**
     * List of people who can breathe underwater.
     */
    private Set<String> hasAmphibious = new HashSet<String>();
-    
+
    public boolean suppressTickSyncWarnings;
    public boolean useRegionsScheduler;
    public boolean activityHaltToggle = false;
    public boolean autoGodMode;
+    public boolean usePlayerMove;

    /**
     * Construct the object.
-     * 
+     *
     * @param plugin
     */
    public ConfigurationManager(WorldGuardPlugin plugin) {
@@ -99,9 +102,9 @@ public class ConfigurationManager {
     */
    public void load() {
        // Create the default configuration file
-        WorldGuardPlugin.createDefaultConfiguration(
+        plugin.createDefaultConfiguration(
                new File(plugin.getDataFolder(), "config.yml"), "config.yml");
-        
+
        Configuration config = plugin.getConfiguration();
        config.load();

@@ -111,6 +114,8 @@ public class ConfigurationManager {
                "regions.use-scheduler", true);
        autoGodMode = config.getBoolean(
                "auto-invincible-permission", false);
+        usePlayerMove = config.getBoolean(
+                "use-player-move-event", true);

        // Load configurations for each world
        for (World world : plugin.getServer().getWorlds()) {
@@ -134,14 +139,14 @@ public class ConfigurationManager {

    /**
     * Get the configuration for a world.
-     * 
+     *
     * @param world
     * @return
     */
    public WorldConfiguration get(World world) {
        String worldName = world.getName();
        WorldConfiguration config = worlds.get(worldName);
-        
+
        if (config == null) {
            config = new WorldConfiguration(plugin, worldName);
            worlds.put(worldName, config);
@@ -152,75 +157,75 @@ public class ConfigurationManager {

    /**
     * Forget a player.
-     * 
+     *
     * @param player
     */
    public void forgetPlayer(LocalPlayer player) {
        for (Map.Entry<String, WorldConfiguration> entry
                : worlds.entrySet()) {
-            
+
            // The blacklist needs to forget players
            Blacklist bl = entry.getValue().getBlacklist();
            if (bl != null) {
                bl.forgetPlayer(player);
            }
        }
-        
+
        hasGodMode.remove(player.getName());
        hasAmphibious.remove(player.getName());
    }
-    
+
    /**
     * Enable god mode for a player.
-     * 
+     *
     * @param player
     */
    public void enableGodMode(Player player) {
        hasGodMode.add(player.getName());
    }
-    
+
    /**
     * Disable god mode for a player.
-     * 
+     *
     * @param player
     */
    public void disableGodMode(Player player) {
        hasGodMode.remove(player.getName());
    }
-    
+
    /**
     * Check to see if god mode is enabled for a player.
-     * 
+     *
     * @param player
-     * @return 
+     * @return
     */
    public boolean hasGodMode(Player player) {
        return hasGodMode.contains(player.getName());
    }
-    
+
    /**
     * Enable amphibious mode for a player.
-     * 
+     *
     * @param player
     */
    public void enableAmphibiousMode(Player player) {
        hasAmphibious.add(player.getName());
    }
-    
+
    /**
     * Disable amphibious mode  for a player.
-     * 
+     *
     * @param player
     */
    public void disableAmphibiousMode(Player player) {
        hasAmphibious.remove(player.getName());
    }
-    
+
    /**
     * Check to see if amphibious mode  is enabled for a player.
-     * 
+     *
     * @param player
-     * @return 
+     * @return
     */
    public boolean hasAmphibiousMode(Player player) {
        return hasAmphibious.contains(player.getName());
@@ -19,15 +19,19 @@

 package com.sk89q.worldguard.bukkit;

+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
 import java.util.HashMap;
 import java.util.Map;
-import org.bukkit.entity.Player;
+
+import org.bukkit.GameMode;
 import org.bukkit.World;
+import org.bukkit.entity.Player;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;

 /**
 * This processes per-player state information and is also meant to be used
@@ -84,7 +88,12 @@ public class FlagStateManager implements Runnable {
            ApplicableRegionSet applicable = regionManager
                    .getApplicableRegions(playerLocation);
            
-            processHeal(applicable, player, state);
+            if (!RegionQueryUtil.isInvincible(plugin, player, applicable)
+                    && !plugin.getGlobalStateManager().hasGodMode(player)
+                    && !(player.getGameMode() == GameMode.CREATIVE)) {
+                processHeal(applicable, player, state);
+                processFeed(applicable, player, state);
+            }
        }
    }
    
@@ -106,24 +115,66 @@ 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);
        
        if (healAmount == null || healDelay == null || healAmount == 0 || healDelay < 0) {
            return;
        }
+        if (minHealth == null) minHealth = 0;
+        if (maxHealth == null) maxHealth = 20;

-        if (player.getHealth() >= 20 && healAmount > 0) {
+        if (player.getHealth() >= maxHealth && healAmount > 0) {
            return;
        }
        
-        if (healDelay <= 0 && healAmount > 0) {
-            player.setHealth(20);
+        if (healDelay <= 0) {
+            player.setHealth(healAmount > 0 ? maxHealth : minHealth); // this will insta-kill if the flag is unset
            state.lastHeal = now;
        } else if (now - state.lastHeal > healDelay * 1000) {
-            player.setHealth(Math.min(20, Math.max(0, player.getHealth() + healAmount)));
+            // clamp health between minimum and maximum
+            player.setHealth(Math.min(maxHealth, Math.max(minHealth, player.getHealth() + healAmount)));
            state.lastHeal = now;
        }
    }
    
+    /**
+     * Process restoring hunger for a player.
+     * 
+     * @param applicable
+     * @param player
+     * @param state
+     */
+    private void processFeed(ApplicableRegionSet applicable, Player player,
+            PlayerFlagState state) {
+
+        long now = System.currentTimeMillis();
+
+        Integer feedAmount = applicable.getFlag(DefaultFlag.FEED_AMOUNT);
+        Integer feedDelay = applicable.getFlag(DefaultFlag.FEED_DELAY);
+        Integer minHunger = applicable.getFlag(DefaultFlag.MIN_FOOD);
+        Integer maxHunger = applicable.getFlag(DefaultFlag.MAX_FOOD);
+        
+        if (feedAmount == null || feedDelay == null || feedAmount == 0 || feedDelay < 0) {
+            return;
+        }
+        if (minHunger == null) minHunger = 0;
+        if (maxHunger == null) maxHunger = 20;
+
+        if (player.getFoodLevel() >= maxHunger && feedAmount > 0) {
+            return;
+        }
+
+        if (feedDelay <= 0) {
+            player.setFoodLevel(feedAmount > 0 ? maxHunger : minHunger);
+            state.lastFeed = now;
+        } else if (now - state.lastFeed > feedDelay * 1000) {
+            // clamp health between minimum and maximum
+            player.setFoodLevel(Math.min(maxHunger, Math.max(minHunger, player.getFoodLevel() + feedAmount)));
+            state.lastFeed = now;
+        }
+    }
+
    /**
     * Forget a player.
     * 
@@ -132,7 +183,14 @@ public class FlagStateManager implements Runnable {
    public synchronized void forget(Player player) {
        states.remove(player.getName());
    }
-    
+
+    /**
+     * Forget all managed players. Use with caution.
+     */
+    public synchronized void forgetAll() {
+        states.clear();
+    }
+
    /**
     * Get a player's flag state.
     * 
@@ -155,6 +213,7 @@ public class FlagStateManager implements Runnable {
     */
    public static class PlayerFlagState {
        public long lastHeal;
+        public long lastFeed;
        public String lastGreeting;
        public String lastFarewell;
        public Boolean lastExitAllowed = null;
@@ -164,6 +223,12 @@ public class FlagStateManager implements Runnable {
        public int lastBlockX;
        public int lastBlockY;
        public int lastBlockZ;
-    }

+        /* Used to cache invincibility status */
+        public World lastInvincibleWorld;
+        public int lastInvincibleX;
+        public int lastInvincibleY;
+        public int lastInvincibleZ;
+        public boolean wasInvincible;
+    }
 }
@@ -19,9 +19,17 @@

 package com.sk89q.worldguard.bukkit;

-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.logging.Logger;
+
 import org.bukkit.World;
+
 import com.sk89q.worldguard.protection.databases.CSVDatabase;
 import com.sk89q.worldguard.protection.managers.RegionManager;

@@ -21,6 +21,7 @@ package com.sk89q.worldguard.bukkit;

 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

@@ -37,7 +38,7 @@ public class LoggerToChatHandler extends Handler {

    /**
     * Construct the object.
-     * 
+     *
     * @param player
     */
    public LoggerToChatHandler(CommandSender player) {
@@ -0,0 +1,83 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+public class RegionQueryUtil {
+
+    public static boolean isInvincible(WorldGuardPlugin plugin, Player player) {
+        return isInvincible(plugin, player, null);
+    }
+
+    public static boolean isInvincible(WorldGuardPlugin plugin, Player player,
+                                       ApplicableRegionSet set) {
+        Location loc = player.getLocation();
+        World world = player.getWorld();
+        
+        FlagStateManager.PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+
+        if (state.lastInvincibleWorld == null ||
+                !state.lastInvincibleWorld.equals(world) ||
+                state.lastInvincibleX != loc.getBlockX() ||
+                state.lastInvincibleY != loc.getBlockY() ||
+                state.lastInvincibleZ != loc.getBlockZ()) {
+            state.lastInvincibleX = loc.getBlockX();
+            state.lastInvincibleY = loc.getBlockY();
+            state.lastInvincibleZ = loc.getBlockZ();
+            state.lastInvincibleWorld = world;
+
+            if (set == null) {
+                Vector vec = new Vector(state.lastInvincibleX,
+                        state.lastInvincibleY, state.lastInvincibleZ);
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                set = mgr.getApplicableRegions(vec);
+            }
+
+            state.wasInvincible = set.allows(DefaultFlag.INVINCIBILITY);
+        }
+
+        return state.wasInvincible;
+    }
+
+    public static Boolean isAllowedInvinciblity(WorldGuardPlugin plugin, Player player) {
+        World world = player.getWorld();
+        FlagStateManager.PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+        Vector vec = new Vector(state.lastInvincibleX, state.lastInvincibleY, state.lastInvincibleZ);
+
+        StateFlag.State regionState = plugin.getGlobalRegionManager().get(world).
+                getApplicableRegions(vec).getFlag(DefaultFlag.INVINCIBILITY);
+        if (regionState == StateFlag.State.ALLOW) {
+            return true;
+        } else if (regionState == StateFlag.State.DENY) {
+            return false;
+        } else {
+            return null;
+        }
+    }
+}
@@ -23,16 +23,18 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.lang.reflect.*;
+import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.plugin.Plugin;
+
 import com.sk89q.worldguard.protection.GlobalRegionManager;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.Flag;
@@ -120,6 +122,7 @@ public class ReportWriter {
        Class<? extends ConfigurationManager> cls = config.getClass();
        for (Field field : cls.getFields()) {
            try {
+                if (field.getName().equalsIgnoreCase("CONFIG_HEADER")) continue;
                Object val = field.get(config);
                configLog.put(field.getName(), val);
            } catch (IllegalArgumentException e) {
@@ -202,7 +205,7 @@ public class ReportWriter {
            LogListBlock infoLog = worldLog.putChild("Information");
            LogListBlock entitiesLog = worldLog.putChild("Entities");
            
-            infoLog.put("ID", world.getId());
+            infoLog.put("Seed", world.getSeed());
            infoLog.put("Environment", world.getEnvironment().toString());
            infoLog.put("Player count", world.getPlayers().size());
            infoLog.put("Entity count", world.getEntities().size());
@@ -331,5 +334,4 @@ public class ReportWriter {
    public String toString() {
        return output.toString();
    }
-    
 }
@@ -19,7 +19,9 @@

 package com.sk89q.worldguard.bukkit;

-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.isBlockWater;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.setBlockToWater;
+
 import org.bukkit.World;

 public class SpongeUtil {
@@ -19,6 +19,23 @@

 package com.sk89q.worldguard.bukkit;

+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.Player;
+import org.bukkit.util.config.Configuration;
+
 import com.sk89q.worldguard.blacklist.Blacklist;
 import com.sk89q.worldguard.blacklist.BlacklistLogger;
 import com.sk89q.worldguard.blacklist.loggers.ConsoleLoggerHandler;
@@ -26,19 +43,6 @@ import com.sk89q.worldguard.blacklist.loggers.DatabaseLoggerHandler;
 import com.sk89q.worldguard.blacklist.loggers.FileLoggerHandler;
 import com.sk89q.worldguard.chest.ChestProtection;
 import com.sk89q.worldguard.chest.SignChestProtection;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.block.Block;
-import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.Player;
-import org.bukkit.util.config.Configuration;

 /**
 * Holds the configuration for individual worlds.
@@ -78,28 +82,32 @@ public class WorldConfiguration {
    public boolean fireSpreadDisableToggle;
    public boolean enforceOneSession;
    public boolean itemDurability;
-    public boolean classicWater;
+    // public boolean classicWater;
    public boolean simulateSponge;
    public int spongeRadius;
+    public boolean disableExpDrops;
    public boolean pumpkinScuba;
    public boolean redstoneSponges;
    public boolean noPhysicsGravel;
    public boolean noPhysicsSand;
    public boolean allowPortalAnywhere;
    public Set<Integer> preventWaterDamage;
-    public boolean blockTNT;
    public boolean blockLighter;
    public boolean disableFireSpread;
    public Set<Integer> disableFireSpreadBlocks;
    public boolean preventLavaFire;
    public Set<Integer> allowedLavaSpreadOver;
+    public boolean blockTNTExplosions;
+    public boolean blockTNTBlockDamage;
    public boolean blockCreeperExplosions;
    public boolean blockCreeperBlockDamage;
-    public int loginProtection;
-    public int spawnProtection;
-    public boolean kickOnDeath;
-    public boolean exactRespawn;
-    public boolean teleportToHome;
+    public boolean blockFireballExplosions;
+    public boolean blockFireballBlockDamage;
+    // public int loginProtection;
+    // public int spawnProtection;
+    // public boolean kickOnDeath;
+    // public boolean exactRespawn;
+    // public boolean teleportToHome;
    public boolean disableContactDamage;
    public boolean disableFallDamage;
    public boolean disableLavaDamage;
@@ -116,9 +124,9 @@ public class WorldConfiguration {
    public boolean highFreqFlags;
    public int regionWand = 287;
    public Set<CreatureType> blockCreatureSpawn;
-    public boolean useiConomy;
-    public boolean buyOnClaim;
-    public double buyOnClaimPrice;
+    // public boolean useiConomy;
+    // public boolean buyOnClaim;
+    // public double buyOnClaimPrice;
    public int maxClaimVolume;
    public boolean claimOnlyInsideExistingRegions;
    public int maxRegionCountPerPlayer;
@@ -142,6 +150,13 @@ public class WorldConfiguration {
    public boolean disableSnowFormation;
    public boolean disableIceFormation;
    public boolean disableLeafDecay;
+    public boolean disableGrassGrowth;
+    public boolean disableEndermanGriefing;
+    public boolean regionInvinciblityRemovesMobs;
+    public boolean disableDeathMessages;
+    public boolean disableObsidianGenerators;
+    
+    private Map<String, Integer> maxRegionCounts;

    /* Configuration data end */

@@ -160,8 +175,8 @@ public class WorldConfiguration {
        this.worldName = worldName;
        this.parentConfig = plugin.getConfiguration();

-        WorldGuardPlugin.createDefaultConfiguration(configFile, "config_world.yml");
-        WorldGuardPlugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
+        plugin.createDefaultConfiguration(configFile, "config_world.yml");
+        plugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");

        config = new Configuration(this.configFile);
        loadConfiguration();
@@ -170,66 +185,94 @@ public class WorldConfiguration {
    }

    private boolean getBoolean(String node, boolean def) {
+        boolean val = parentConfig.getBoolean(node, def);
+
        if (config.getProperty(node) != null) {
            return config.getBoolean(node, def);
        } else {
-            return parentConfig.getBoolean(node, def);
+            return val;
        }
    }

    private String getString(String node, String def) {
+        String val = parentConfig.getString(node, def);
+
        if (config.getProperty(node) != null) {
            return config.getString(node, def);
        } else {
-            return parentConfig.getString(node, def);
+            return val;
        }
    }

    private int getInt(String node, int def) {
+        int val = parentConfig.getInt(node, def);
+
        if (config.getProperty(node) != null) {
            return config.getInt(node, def);
        } else {
-            return parentConfig.getInt(node, def);
+            return val;
        }
    }

+    @SuppressWarnings("unused")
    private double getDouble(String node, double def) {
+        double val = parentConfig.getDouble(node, def);
+
        if (config.getProperty(node) != null) {
            return config.getDouble(node, def);
        } else {
-            return parentConfig.getDouble(node, def);
+            return val;
        }
    }

    private List<Integer> getIntList(String node, List<Integer> def) {
-        List<Integer> res;
-
-        if (config.getProperty(node) != null) {
-            res = config.getIntList(node, def);
-        } else {
-            res = parentConfig.getIntList(node, def);
-        }
+        List<Integer> res = parentConfig.getIntList(node, def);

        if (res == null || res.size() == 0) {
            parentConfig.setProperty(node, new ArrayList<Integer>());
        }

+        if (config.getProperty(node) != null) {
+            res = config.getIntList(node, def);
+        }
+
        return res;
    }

    private List<String> getStringList(String node, List<String> def) {
-        List<String> res;
-
-        if (config.getProperty(node) != null) {
-            res = config.getStringList(node, def);
-        } else {
-            res = parentConfig.getStringList(node, def);
-        }
+        List<String> res = parentConfig.getStringList(node, def);

        if (res == null || res.size() == 0) {
            parentConfig.setProperty(node, new ArrayList<String>());
        }

+        if (config.getProperty(node) != null) {
+            res = config.getStringList(node, def);
+        }
+
+        return res;
+    }
+
+    private List<String> getKeys(String node) {
+        List<String> res = parentConfig.getKeys(node);
+
+        if (res == null || res.size() == 0) {
+            res = config.getKeys(node);
+        }
+        if (res == null) {
+            res = new ArrayList<String>();
+        }
+
+        return res;
+    }
+
+    private Object getProperty(String node) {
+        Object res = parentConfig.getProperty(node);
+
+        if (config.getProperty(node) != null) {
+            res = config.getProperty(node);
+        }
+
        return res;
    }

@@ -244,14 +287,15 @@ public class WorldConfiguration {
        enforceOneSession = getBoolean("protection.enforce-single-session", true);
        itemDurability = getBoolean("protection.item-durability", true);
        removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
+        disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);
+        disableObsidianGenerators = getBoolean("protection.disable-obsidian-generators", false);

-        classicWater = getBoolean("simulation.classic-water", false);
+        // classicWater = getBoolean("simulation.classic-water", false);
        simulateSponge = getBoolean("simulation.sponge.enable", true);
        spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
        redstoneSponges = getBoolean("simulation.sponge.redstone", false);

-        pumpkinScuba = getBoolean("pumpkin-scuba", false);
-
+        pumpkinScuba = getBoolean("default.pumpkin-scuba", false);
        disableHealthRegain = getBoolean("default.disable-health-regain", false);

        noPhysicsGravel = getBoolean("physics.no-physics-gravel", false);
@@ -259,7 +303,8 @@ public class WorldConfiguration {
        allowPortalAnywhere = getBoolean("physics.allow-portal-anywhere", false);
        preventWaterDamage = new HashSet<Integer>(getIntList("physics.disable-water-damage-blocks", null));

-        blockTNT = getBoolean("ignition.block-tnt", false);
+        blockTNTExplosions = getBoolean("ignition.block-tnt", false);
+        blockTNTBlockDamage = getBoolean("ignition.block-tnt-block-damage", false);
        blockLighter = getBoolean("ignition.block-lighter", false);

        preventLavaFire = getBoolean("fire.disable-lava-fire-spread", true);
@@ -269,13 +314,16 @@ public class WorldConfiguration {

        blockCreeperExplosions = getBoolean("mobs.block-creeper-explosions", false);
        blockCreeperBlockDamage = getBoolean("mobs.block-creeper-block-damage", false);
+        blockFireballExplosions = getBoolean("mobs.block-fireball-explosions", false);
+        blockFireballBlockDamage = getBoolean("mobs.block-fireball-block-damage", false);
        antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
+        disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);

-        loginProtection = getInt("spawn.login-protection", 3);
-        spawnProtection = getInt("spawn.spawn-protection", 0);
-        kickOnDeath = getBoolean("spawn.kick-on-death", false);
-        exactRespawn = getBoolean("spawn.exact-respawn", false);
-        teleportToHome = getBoolean("spawn.teleport-to-home-on-death", false);
+        // loginProtection = getInt("spawn.login-protection", 3);
+        // spawnProtection = getInt("spawn.spawn-protection", 0);
+        // kickOnDeath = getBoolean("spawn.kick-on-death", false);
+        // exactRespawn = getBoolean("spawn.exact-respawn", false);
+        // teleportToHome = getBoolean("spawn.teleport-to-home-on-death", false);

        disableFallDamage = getBoolean("player-damage.disable-fall-damage", false);
        disableLavaDamage = getBoolean("player-damage.disable-lava-damage", false);
@@ -289,6 +337,7 @@ public class WorldConfiguration {
        teleportOnVoid = getBoolean("player-damage.teleport-on-void-falling", false);
        disableExplosionDamage = getBoolean("player-damage.disable-explosion-damage", false);
        disableMobDamage = getBoolean("player-damage.disable-mob-damage", false);
+        disableDeathMessages = getBoolean("player-damage.disable-death-messages", false);

        signChestProtection = getBoolean("chest-protection.enable", false);

@@ -310,17 +359,31 @@ public class WorldConfiguration {
        disableSnowFormation = getBoolean("dynamics.disable-snow-formation", false);
        disableIceFormation = getBoolean("dynamics.disable-ice-formation", false);
        disableLeafDecay = getBoolean("dynamics.disable-leaf-decay", false);
+        disableGrassGrowth = getBoolean("dynamics.disable-grass-growth", false);

        useRegions = getBoolean("regions.enable", true);
+        regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
        highFreqFlags = getBoolean("regions.high-frequency-flags", false);
        regionWand = getInt("regions.wand", 287);
        maxClaimVolume = getInt("regions.max-claim-volume", 30000);
        claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);
-        maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player", 7);
-
-        useiConomy = getBoolean("iconomy.enable", false);
-        buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
-        buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);
+        
+        maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player.default", 7);
+        maxRegionCounts = new HashMap<String, Integer>();
+        maxRegionCounts.put(null, maxRegionCountPerPlayer);
+        
+        for (String key : getKeys("regions.max-region-count-per-player")) {
+            if (!key.equalsIgnoreCase("default")) {
+                Object val = getProperty("regions.max-region-count-per-player." + key);
+                if (val != null && val instanceof Number) {
+                    maxRegionCounts.put(key, ((Number) val).intValue());
+                }
+            }
+        }
+        
+        // useiConomy = getBoolean("iconomy.enable", false);
+        // buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
+        // buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);

        blockCreatureSpawn = new HashSet<CreatureType>();
        for (String creatureName : getStringList("mobs.block-creature-spawn", null)) {
@@ -397,7 +460,7 @@ public class WorldConfiguration {
            logger.log(Level.INFO, enforceOneSession
                    ? "WorldGuard: (" + worldName + ") Single session is enforced."
                    : "WorldGuard: (" + worldName + ") Single session is NOT ENFORCED.");
-            logger.log(Level.INFO, blockTNT
+            logger.log(Level.INFO, blockTNTExplosions
                    ? "WorldGuard: (" + worldName + ") TNT ignition is blocked."
                    : "WorldGuard: (" + worldName + ") TNT ignition is PERMITTED.");
            logger.log(Level.INFO, blockLighter
@@ -436,7 +499,7 @@ public class WorldConfiguration {
    public String getWorldName() {
        return this.worldName;
    }
-    
+
    public boolean isChestProtected(Block block, Player player) {
        if (!signChestProtection) {
            return false;
@@ -447,14 +510,14 @@ public class WorldConfiguration {
        }
        return chestProtection.isProtected(block, player);
    }
-    
+
    public boolean isChestProtected(Block block) {
        if (!signChestProtection) {
            return false;
        }
        return chestProtection.isProtected(block, null);
    }
-    
+
    public boolean isChestProtectedPlacement(Block block, Player player) {
        if (!signChestProtection) {
            return false;
@@ -481,4 +544,17 @@ public class WorldConfiguration {
        return chestProtection;
    }
    
+    public int getMaxRegionCount(Player player) {
+        int max = -1;
+        for (String group : plugin.getGroups(player)) {
+            if (maxRegionCounts.containsKey(group)) {
+                int groupMax = maxRegionCounts.get(group);
+                if (max < groupMax) max = groupMax;
+            }
+        }
+        if (max <= -1) {
+            max = maxRegionCountPerPlayer;
+        }
+        return max;
+    }
 }
@@ -18,29 +18,48 @@
 */
 package com.sk89q.worldguard.bukkit;

-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.block.Block;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.dropSign;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import java.util.logging.Logger;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.entity.Player;
 import org.bukkit.World;
-import org.bukkit.event.block.*;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.Event.Priority;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.block.BlockFormEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockListener;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.BlockRedstoneEvent;
+import org.bukkit.event.block.BlockSpreadEvent;
+import org.bukkit.event.block.LeavesDecayEvent;
+import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.PluginManager;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
-
-import java.util.logging.Logger;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;

 /**
 * The listener for block events.
@@ -68,8 +87,6 @@ public class WorldGuardBlockListener extends BlockListener {
     * Register events.
     */
    public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
-
        registerEvent("BLOCK_DAMAGE", Priority.High);
        registerEvent("BLOCK_BREAK", Priority.High);
        registerEvent("BLOCK_FROMTO", Priority.Normal);
@@ -79,11 +96,12 @@ public class WorldGuardBlockListener extends BlockListener {
        registerEvent("BLOCK_BURN", Priority.High);
        registerEvent("SIGN_CHANGE", Priority.High);
        registerEvent("REDSTONE_CHANGE", Priority.High);
-        registerEvent("SNOW_FORM", Priority.High);
        registerEvent("LEAVES_DECAY", Priority.High);
        registerEvent("BLOCK_FORM", Priority.High);
        registerEvent("BLOCK_SPREAD", Priority.High);
        registerEvent("BLOCK_FADE", Priority.High);
+        registerEvent("BLOCK_PISTON_EXTEND", Priority.High);
+        registerEvent("BLOCK_PISTON_RETRACT", Priority.High);
    }

    /**
@@ -213,6 +231,7 @@ public class WorldGuardBlockListener extends BlockListener {

        boolean isWater = blockFrom.getTypeId() == 8 || blockFrom.getTypeId() == 9;
        boolean isLava = blockFrom.getTypeId() == 10 || blockFrom.getTypeId() == 11;
+        boolean isAir = blockFrom.getTypeId() == 0;

        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
@@ -257,7 +276,7 @@ public class WorldGuardBlockListener extends BlockListener {
        if (wcfg.preventWaterDamage.size() > 0) {
            int targetId = blockTo.getTypeId();
            
-            if ((blockFrom.getTypeId() == 0 || isWater) && 
+            if ((isAir || isWater) &&
                    wcfg.preventWaterDamage.contains(targetId)) {
                event.setCancelled(true);
                return;
@@ -286,6 +305,12 @@ public class WorldGuardBlockListener extends BlockListener {
            event.setCancelled(true);
            return;
        }
+
+        if (wcfg.disableObsidianGenerators && (isAir || isLava)
+                && blockTo.getTypeId() == 55) {
+            blockTo.setTypeId(0);
+            return;
+        }
    }

    /**
@@ -642,36 +667,6 @@ public class WorldGuardBlockListener extends BlockListener {
            return;
        }
    }
-    
-    /**
-     * Called when snow is formed.
-     */
-    @Override
-    public void onSnowForm(SnowFormEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableSnowFormation) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.SNOW_FALL,
-                    event.getBlock().getLocation())) {
-                event.setCancelled(true);
-            }
-        }
-    }

    @Override
    public void onLeavesDecay(LeavesDecayEvent event) {
@@ -718,14 +713,28 @@ public class WorldGuardBlockListener extends BlockListener {

        Material type = event.getNewState().getType();

-        if (wcfg.disableIceFormation && type == Material.ICE) {
-            event.setCancelled(true);
-            return;
+        if (type == Material.ICE) {
+            if (wcfg.disableIceFormation) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.ICE_FORM, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
        }

-        if (wcfg.disableSnowFormation && type == Material.SNOW) {
-            event.setCancelled(true);
-            return;
+        if (type == Material.SNOW) {
+            if (wcfg.disableSnowFormation) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.SNOW_FALL, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
        }
    }

@@ -747,10 +756,28 @@ public class WorldGuardBlockListener extends BlockListener {

        Material fromType = event.getSource().getType();

-        if (wcfg.disableMushroomSpread && (fromType == Material.RED_MUSHROOM
-                || fromType == Material.BROWN_MUSHROOM)) {
-            event.setCancelled(true);
-            return;
+        if (fromType == Material.RED_MUSHROOM || fromType == Material.BROWN_MUSHROOM) {
+            if (wcfg.disableMushroomSpread) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.MUSHROOMS, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (fromType == Material.GRASS) {
+            if (wcfg.disableGrassGrowth) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.GRASS_SPREAD, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
        }
    }

@@ -767,14 +794,72 @@ public class WorldGuardBlockListener extends BlockListener {

        Material type = event.getBlock().getType();

-        if (wcfg.disableIceMelting && type == Material.ICE) {
-            event.setCancelled(true);
+        if (type == Material.ICE) {
+            if (wcfg.disableIceMelting) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.ICE_MELT, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (type == Material.SNOW) {
+            if (wcfg.disableSnowMelting) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
+                    DefaultFlag.SNOW_MELT, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a piston extends
+     */
+    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+        if (event.isCancelled()) {
            return;
        }

-        if (wcfg.disableSnowMelting && type == Material.SNOW) {
-            event.setCancelled(true);
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getBlock().getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+            for (Block block : event.getBlocks()) {
+                if (!plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, block.getLocation())) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when a piston retracts
+     */
+    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
+        if (event.isCancelled()) {
            return;
        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
+
+        if (wcfg.useRegions && event.isSticky()) {
+            if (!(plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getRetractLocation()))
+                    || !(plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getBlock().getLocation()))) {
+                event.setCancelled(true);
+            }
+        }
    }
 }
@@ -20,31 +20,60 @@ package com.sk89q.worldguard.bukkit;

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

-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import java.util.Set;
+import java.util.logging.Logger;
+
 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.*;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Fireball;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Painting;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Skeleton;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Wolf;
 import org.bukkit.event.Event;
 import org.bukkit.event.Event.Priority;
-import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.CreeperPowerEvent;
+import org.bukkit.event.entity.EndermanPickupEvent;
+import org.bukkit.event.entity.EndermanPlaceEvent;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityDamageByBlockEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityInteractEvent;
+import org.bukkit.event.entity.EntityListener;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PigZapEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.painting.PaintingBreakByEntityEvent;
 import org.bukkit.event.painting.PaintingBreakEvent;
 import org.bukkit.event.painting.PaintingPlaceEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.PluginManager;
+
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
 import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;

-import java.util.Set;
-import java.util.logging.Logger;
-
 /**
 * Listener for entity related events.
 * 
@@ -71,11 +100,12 @@ public class WorldGuardEntityListener extends EntityListener {
     * Register events.
     */
    public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
+//        PluginManager pm = plugin.getServer().getPluginManager();

        registerEvent("ENTITY_DAMAGE", Priority.High);
        registerEvent("ENTITY_COMBUST", Priority.High);
        registerEvent("ENTITY_EXPLODE", Priority.High);
+        registerEvent("EXPLOSION_PRIME", Priority.High);
        registerEvent("CREATURE_SPAWN", Priority.High);
        registerEvent("ENTITY_INTERACT", Priority.High);
        registerEvent("CREEPER_POWER", Priority.High);
@@ -83,6 +113,10 @@ public class WorldGuardEntityListener extends EntityListener {
        registerEvent("PAINTING_BREAK", Priority.High);
        registerEvent("PAINTING_PLACE", Priority.High);
        registerEvent("ENTITY_REGAIN_HEALTH", Priority.High);
+        registerEvent("ENDERMAN_PICKUP", Priority.High);
+        registerEvent("ENDERMAN_PLACE", Priority.High);
+        registerEvent("ENTITY_DEATH", Priority.High);
+        registerEvent("FOOD_LEVEL_CHANGE", Priority.High);
    }

    /**
@@ -106,7 +140,6 @@ public class WorldGuardEntityListener extends EntityListener {
     */
    @Override
    public void onEntityInteract(EntityInteractEvent event) {
-        //bukkit doesn't actually throw this event yet, someone add a ticket to leaky
        Entity entity = event.getEntity();
        Block block = event.getBlock();

@@ -120,6 +153,24 @@ public class WorldGuardEntityListener extends EntityListener {
        }
    }

+    /**
+     * Called when an entity dies.
+     */
+    @Override
+    public void onEntityDeath(EntityDeathEvent event) {
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(event.getEntity().getWorld());
+        if (wcfg.disableExpDrops) {
+            event.setDroppedExp(0);
+        }
+        try {
+            if (event instanceof PlayerDeathEvent && wcfg.disableDeathMessages) {
+                ((PlayerDeathEvent) event).setDeathMessage("");
+            }
+        } catch (Throwable t) {
+            // old CraftBukkit, eat it
+        }
+    }
+
    /**
     * Called on entity damage by a block.
     * 
@@ -140,7 +191,7 @@ public class WorldGuardEntityListener extends EntityListener {
        } else if (defender instanceof Player) {
            Player player = (Player) defender;

-            if (cfg.hasGodMode(player)) {
+            if (isInvincible(player)) {
                event.setCancelled(true);
                return;
            }
@@ -167,7 +218,7 @@ public class WorldGuardEntityListener extends EntityListener {
                return;
            }

-            if (wcfg.disableExplosionDamage && event.getCause() == DamageCause.BLOCK_EXPLOSION) {
+            if (wcfg.disableExplosionDamage && type == DamageCause.BLOCK_EXPLOSION) {
                event.setCancelled(true);
                return;
            }
@@ -180,6 +231,11 @@ public class WorldGuardEntityListener extends EntityListener {
     * @param event
     */
    private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        if (event.getCause() == DamageCause.PROJECTILE) {
+            onEntityDamageByProjectile(event);
+            return;
+        }
+
        Entity attacker = event.getDamager();
        Entity defender = event.getEntity();
        
@@ -208,8 +264,14 @@ public class WorldGuardEntityListener extends EntityListener {

            ConfigurationManager cfg = plugin.getGlobalStateManager();
            WorldConfiguration wcfg = cfg.get(player.getWorld());
-            
-            if (cfg.hasGodMode(player)) {
+
+            if (isInvincible(player)) {
+                if (wcfg.regionInvinciblityRemovesMobs
+                        && attacker instanceof LivingEntity && !(attacker instanceof Player)
+                        && !(attacker instanceof Tameable && ((Tameable) attacker).isTamed())) {
+                    attacker.remove();
+                }
+
                event.setCancelled(true);
                return;
            }
@@ -227,9 +289,10 @@ public class WorldGuardEntityListener extends EntityListener {
            if (attacker != null && attacker instanceof Player) {
                if (wcfg.useRegions) {
                    Vector pt = toVector(defender.getLocation());
+                    Vector pt2 = toVector(attacker.getLocation());
                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());

-                    if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP)) {
+                    if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.PVP) || !mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP)) {
                        ((Player) attacker).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
                        event.setCancelled(true);
                        return;
@@ -237,6 +300,38 @@ public class WorldGuardEntityListener extends EntityListener {
                }
            }

+            if (attacker != null && attacker instanceof TNTPrimed) {
+                if (wcfg.blockTNTExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+                    if (!set.allows(DefaultFlag.TNT)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+
+            if (attacker != null && attacker instanceof Fireball) {
+                if (wcfg.blockFireballExplosions) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (wcfg.useRegions) {
+                    Vector pt = toVector(defender.getLocation());
+                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+                    ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+                    if (!set.allows(DefaultFlag.GHAST_FIREBALL)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+
            if (attacker != null && attacker instanceof LivingEntity
                    && !(attacker instanceof Player)) {
                if (attacker instanceof Creeper && wcfg.blockCreeperExplosions) {
@@ -276,9 +371,9 @@ public class WorldGuardEntityListener extends EntityListener {
     * 
     * @param event
     */
-    private void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
+    private void onEntityDamageByProjectile(EntityDamageByEntityEvent event) {
        Entity defender = event.getEntity();
-        Entity attacker = event.getDamager();
+        Entity attacker = ((Projectile) event.getDamager()).getShooter();

        if (defender instanceof Player) {
            Player player = (Player) defender;
@@ -286,7 +381,7 @@ public class WorldGuardEntityListener extends EntityListener {
            ConfigurationManager cfg = plugin.getGlobalStateManager();
            WorldConfiguration wcfg = cfg.get(player.getWorld());
            
-            if (cfg.hasGodMode(player)) {
+            if (isInvincible(player)) {
                event.setCancelled(true);
                return;
            }
@@ -331,10 +426,7 @@ public class WorldGuardEntityListener extends EntityListener {
            return;
        }

-        if (event instanceof EntityDamageByProjectileEvent) {
-            this.onEntityDamageByProjectile((EntityDamageByProjectileEvent) event);
-            return;
-        } else if (event instanceof EntityDamageByEntityEvent) {
+        if (event instanceof EntityDamageByEntityEvent) {
            this.onEntityDamageByEntity((EntityDamageByEntityEvent) event);
            return;
        } else if (event instanceof EntityDamageByBlockEvent) {
@@ -356,7 +448,7 @@ public class WorldGuardEntityListener extends EntityListener {
        } else if (defender instanceof Player) {
            Player player = (Player) defender;

-            if (cfg.hasGodMode(player)) {
+            if (isInvincible(player)) {
                event.setCancelled(true);
                player.setFireTicks(0);
                return;
@@ -418,11 +510,12 @@ public class WorldGuardEntityListener extends EntityListener {
        Entity entity = event.getEntity();

        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());

        if (entity instanceof Player) {
            Player player = (Player) entity;

-            if (cfg.hasGodMode(player)) {
+            if (cfg.hasGodMode(player) || (wcfg.useRegions && RegionQueryUtil.isInvincible(plugin, player))) {
                event.setCancelled(true);
                return;
            }
@@ -444,58 +537,64 @@ public class WorldGuardEntityListener extends EntityListener {
        WorldConfiguration wcfg = cfg.get(world);
        Entity ent = event.getEntity();

+        if (cfg.activityHaltToggle) {
+            ent.remove();
+            event.setCancelled(true);
+            return;
+        }
+
        if (ent instanceof LivingEntity) {
-            if (wcfg.blockCreeperBlockDamage) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.blockCreeperExplosions) {
+            if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
                event.setCancelled(true);
                return;
            }

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

-                if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.CREEPER_EXPLOSION)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        } else if (ent instanceof Fireball) {
-            if (wcfg.useRegions) {
-                Vector pt = toVector(l);
-                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-
-                if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.GHAST_FIREBALL)) {
-                    event.setCancelled(true);
-                    return;
+                    for (Block block : event.blockList()) {
+                        if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.CREEPER_EXPLOSION)) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
                }
            }
        } else if (ent instanceof TNTPrimed) {
-            if (cfg.activityHaltToggle) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.blockTNT) {
+            if (wcfg.blockTNTBlockDamage || wcfg.blockTNTExplosions) {
                event.setCancelled(true);
                return;
            }

            if (wcfg.useRegions) {
-                Vector pt = toVector(l);
                RegionManager mgr = plugin.getGlobalRegionManager().get(world);

-                if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.TNT)) {
-                    event.setCancelled(true);
-                    return;
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.TNT)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        } else if (ent instanceof Fireball) {
+            if (wcfg.blockFireballBlockDamage || wcfg.blockFireballExplosions) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.useRegions) {
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+
+                for (Block block : event.blockList()) {
+                    if (!mgr.getApplicableRegions(toVector(block)).allows(DefaultFlag.GHAST_FIREBALL)) {
+                        event.setCancelled(true);
+                        return;
+                    }
                }
            }
        }
-        
+
        if (wcfg.signChestProtection) {
            for (Block block : event.blockList()) {
                if (wcfg.isChestProtected(block)) {
@@ -505,19 +604,26 @@ public class WorldGuardEntityListener extends EntityListener {
            }
        }

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

-            // Whoo, for each block
-            for (Block block : event.blockList()) {
-                Vector pt = toVector(block);
-
-                if (!mgr.getApplicableRegions(pt).allows(DefaultFlag.TNT)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
+    /**
+     * Called on explosion prime
+     */
+    @Override
+    public void onExplosionPrime(ExplosionPrimeEvent event) {
+        if (event.isCancelled()) {
+            return;
        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        Entity ent = event.getEntity();
+
+        if (cfg.activityHaltToggle) {
+            ent.remove();
+            event.setCancelled(true);
+            return;
+        }
+
    }

    /**
@@ -549,6 +655,8 @@ public class WorldGuardEntityListener extends EntityListener {
        if (wcfg.useRegions) {
            Vector pt = toVector(eventLoc);
            RegionManager mgr = plugin.getGlobalRegionManager().get(eventLoc.getWorld());
+            // @TODO get victims' stacktraces and find out why it's null anyway
+            if (mgr == null) return;
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);

            if (!set.allows(DefaultFlag.MOB_SPAWNING)) {
@@ -556,8 +664,8 @@ public class WorldGuardEntityListener extends EntityListener {
                return;
            }

-            Set<CreatureType> blockTypes = set.getFlag(DefaultFlag.DENY_SPAWN);
-            if (blockTypes != null && blockTypes.contains(creaType)) {
+            Set<CreatureType> creatureTypes = set.getFlag(DefaultFlag.DENY_SPAWN);
+            if (creatureTypes != null && creatureTypes.contains(creaType)) {
                event.setCancelled(true);
                return;
            }
@@ -646,6 +754,10 @@ public class WorldGuardEntityListener extends EntityListener {
     */
    @Override
    public void onPaintingPlace(PaintingPlaceEvent event) {
+        if (event.isCancelled()) {
+            return;
+         }
+
        Block placedOn = event.getBlock();
        Player player = event.getPlayer();
        World world = placedOn.getWorld();
@@ -675,6 +787,10 @@ public class WorldGuardEntityListener extends EntityListener {
     * Called on entity health regain.
     */
    public void onEntityRegainHealth(EntityRegainHealthEvent event) {
+        if (event.isCancelled()) {
+            return;
+         }
+
        Entity ent = event.getEntity();
        World world = ent.getWorld();

@@ -687,4 +803,98 @@ public class WorldGuardEntityListener extends EntityListener {
        }
    }

+    /**
+     * Called when an enderman picks a block up.
+     */
+    @Override
+    public void onEndermanPickup(EndermanPickupEvent event) {
+        if (event.isCancelled()) {
+            return;
+         }
+
+        Entity ent = event.getEntity();
+        Block block = event.getBlock();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(ent.getWorld());
+
+        if (wcfg.disableEndermanGriefing) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, block.getLocation())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when an enderman places a block.
+     */
+    @Override
+    public void onEndermanPlace(EndermanPlaceEvent event) {
+        if (event.isCancelled()) {
+            return;
+         }
+
+        Entity ent = event.getEntity();
+        Location loc = event.getLocation();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(ent.getWorld());
+
+        if (wcfg.disableEndermanGriefing) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ENDER_BUILD, loc)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void onFoodLevelChange(FoodLevelChangeEvent event) {
+        if (event.getEntity() instanceof Player) {
+            Player player = (Player) event.getEntity();
+            if (event.getFoodLevel() < player.getFoodLevel() && isInvincible(player)) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    /**
+     * Check if a player is invincible, via either god mode or region flag. If
+     * the region denies invincibility, the player must have an extra permission
+     * to override it. (worldguard.god.override-regions)
+     * 
+     * @param player
+     * @return
+     */
+    private boolean isInvincible(Player player) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+        boolean god = cfg.hasGodMode(player);
+        if (wcfg.useRegions) {
+            Boolean flag = RegionQueryUtil.isAllowedInvinciblity(plugin, player);
+            boolean allowed = flag == null || flag == true;
+            boolean invincible = RegionQueryUtil.isInvincible(plugin, player);
+
+            if (allowed) {
+                return god || invincible;
+            } else {
+                return (god && plugin.hasPermission(player, "worldguard.god.override-regions"))
+                    || invincible;
+            }
+        } else {
+            return god;
+        }
+    }
 }
@@ -19,31 +19,52 @@
 package com.sk89q.worldguard.bukkit;

 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
 import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Logger;

-import com.sk89q.worldedit.blocks.BlockType;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
 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.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.Event.Priority;
 import org.bukkit.event.Event.Result;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerBedEnterEvent;
+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.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerListener;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.PluginManager;
+
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
+import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
 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.flags.RegionGroupFlag;
 import com.sk89q.worldguard.protection.flags.RegionGroupFlag.RegionGroup;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
@@ -73,7 +94,7 @@ public class WorldGuardPlayerListener extends PlayerListener {
     * Register events.
     */
    public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
+//        PluginManager pm = plugin.getServer().getPluginManager();

        registerEvent("PLAYER_INTERACT", Priority.High);
        registerEvent("PLAYER_DROP_ITEM", Priority.High);
@@ -83,11 +104,13 @@ public class WorldGuardPlayerListener extends PlayerListener {
        registerEvent("PLAYER_QUIT", Priority.Normal);
        registerEvent("PLAYER_BUCKET_FILL", Priority.High);
        registerEvent("PLAYER_BUCKET_EMPTY", Priority.High);
-        registerEvent("PLAYER_RESPAWN", Priority.High);
+        registerEvent("PLAYER_RESPAWN", Priority.Highest);
        registerEvent("PLAYER_ITEM_HELD", Priority.High);
        registerEvent("PLAYER_BED_ENTER", Priority.High);
-        registerEvent("PLAYER_MOVE", Priority.High);
-        registerEvent("PLAYER_COMMAND_PREPROCESS", Priority.High);
+        registerEvent("PLAYER_COMMAND_PREPROCESS", Priority.Lowest);
+        if (plugin.getGlobalStateManager().usePlayerMove) {
+            registerEvent("PLAYER_MOVE", Priority.High);
+        }
    }

    /**
@@ -109,6 +132,7 @@ public class WorldGuardPlayerListener extends PlayerListener {
    /**
     * Called when a player attempts to log in to the server.
     */
+    /*
    @Override
    public void onPlayerLogin(PlayerLoginEvent event) {
        Player player = event.getPlayer();
@@ -126,6 +150,7 @@ public class WorldGuardPlayerListener extends PlayerListener {
            }
        }
    }
+    */

    /**
     * Called when a player joins a server.
@@ -136,7 +161,7 @@ public class WorldGuardPlayerListener extends PlayerListener {
        World world = player.getWorld();

        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
+        WorldConfiguration wcfg = cfg.get(world);

        if (cfg.activityHaltToggle) {
            player.sendMessage(ChatColor.YELLOW
@@ -144,11 +169,8 @@ public class WorldGuardPlayerListener extends PlayerListener {

            int removed = 0;

-            for (Entity entity : player.getWorld().getEntities()) {
-                if (entity instanceof Item
-                        || (entity instanceof LivingEntity
-                        && !(entity instanceof Tameable)
-                        && !(entity instanceof Player))) {
+            for (Entity entity : world.getEntities()) {
+                if (BukkitUtil.isIntensiveEntity(entity)) {
                    entity.remove();
                    removed++;
                }
@@ -165,8 +187,8 @@ public class WorldGuardPlayerListener extends PlayerListener {
                    + "Fire spread is currently globally disabled for this world.");
        }
        
-        if (plugin.inGroup(player, "wg-invincible")
-                || (cfg.autoGodMode && plugin.hasPermission(player, "worldguard.auto-invincible"))) {
+        if (cfg.autoGodMode && (plugin.inGroup(player, "wg-invincible")
+                || plugin.hasPermission(player, "worldguard.auto-invincible"))) {
            cfg.enableGodMode(player);
        }
        
@@ -275,7 +297,8 @@ public class WorldGuardPlayerListener extends PlayerListener {
        
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(world);
-        
+
+        if (player.getVehicle() != null) return; // handled in vehicle listener
        if (wcfg.useRegions) {
            // Did we move a block?
            if (event.getFrom().getBlockX() != event.getTo().getBlockX()
@@ -422,6 +445,30 @@ public class WorldGuardPlayerListener extends PlayerListener {
                    return;
                }
            }
+
+            if (block.getRelative(event.getBlockFace()).getType() == Material.FIRE) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    event.setUseInteractedBlock(Result.DENY);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+        }
+
+        if (type == Material.TNT && player.getItemInHand().getType() == Material.FLINT_AND_STEEL) {
+            if (wcfg.getBlacklist() != null) {
+                if (!wcfg.getBlacklist().check(
+                        new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
+                        toVector(event.getClickedBlock()),
+                        event.getClickedBlock().getTypeId()), false, false)) {
+                    event.setUseInteractedBlock(Result.DENY);
+                    event.setUseItemInHand(Result.DENY);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
        }
    }

@@ -478,7 +525,10 @@ public class WorldGuardPlayerListener extends PlayerListener {
                || type == Material.JUKEBOX
                || type == Material.DISPENSER
                || type == Material.FURNACE
-                || type == Material.BURNING_FURNACE)
+                || type == Material.BURNING_FURNACE
+                || type == Material.BREWING_STAND
+                || type == Material.ENCHANTMENT_TABLE
+                || type == Material.CAULDRON)
                && wcfg.removeInfiniteStacks
                && !plugin.hasPermission(player, "worldguard.override.infinite-stack")) {
            for (int slot = 0; slot < 40; slot++) {
@@ -517,6 +567,17 @@ public class WorldGuardPlayerListener extends PlayerListener {
                event.setCancelled(true);
                return;
            }
+
+            if (item.getType() == Material.TNT) {
+                Block placedOn = block.getRelative(event.getBlockFace());
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !plugin.getGlobalRegionManager().allows(
+                        DefaultFlag.TNT, placedOn.getLocation())) {
+                    event.setUseItemInHand(Result.DENY);
+                    event.setCancelled(true);
+                }
+            }
+
            if (item.getType() == Material.INK_SACK
                    && item.getData() != null
                    && item.getData().getData() == 15 // bonemeal
@@ -524,33 +585,53 @@ public class WorldGuardPlayerListener extends PlayerListener {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)) {
                    event.setCancelled(true);
-                    event.setUseInteractedBlock(Result.DENY);
                    event.setUseItemInHand(Result.DENY);
                }
            }

+            if (type == Material.BED_BLOCK) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.allows(DefaultFlag.SLEEP)) {
+                    player.sendMessage(ChatColor.DARK_RED + "You're not allowed to use that bed.");
+                    event.setUseInteractedBlock(Result.DENY);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
            if (type == Material.CHEST
                    || type == Material.JUKEBOX //stores the (arguably) most valuable item
                    || type == Material.DISPENSER
                    || type == Material.FURNACE
-                    || type == Material.BURNING_FURNACE) {
+                    || type == Material.BURNING_FURNACE
+                    || type == Material.BREWING_STAND) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.allows(DefaultFlag.CHEST_ACCESS)
                        && !set.canBuild(localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to open that in this area.");
+                    event.setUseInteractedBlock(Result.DENY);
                    event.setCancelled(true);
                    return;
                }
            }
-    
+
            if (type == Material.LEVER
-                   || type == Material.STONE_BUTTON
-                   || type == Material.NOTE_BLOCK
-                   || type == Material.DIODE_BLOCK_OFF
-                   || type == Material.DIODE_BLOCK_ON
-                   || type == Material.WOODEN_DOOR
-                   || type == Material.TRAP_DOOR
-                   || type == Material.WORKBENCH) {
+                    || type == Material.STONE_BUTTON
+                    || type == Material.NOTE_BLOCK
+                    || type == Material.DIODE_BLOCK_OFF
+                    || type == Material.DIODE_BLOCK_ON
+                    || type == Material.WOODEN_DOOR
+                    || type == Material.TRAP_DOOR
+                    || type == Material.FENCE_GATE
+                    || type == Material.JUKEBOX //stores the (arguably) most valuable item
+                    || type == Material.DISPENSER
+                    || type == Material.FURNACE
+                    || type == Material.BURNING_FURNACE
+                    || type == Material.WORKBENCH
+                    || type == Material.BREWING_STAND
+                    || type == Material.ENCHANTMENT_TABLE
+                    || type == Material.CAULDRON
+                    || type == Material.DRAGON_EGG) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.allows(DefaultFlag.USE)
                        && !set.canBuild(localPlayer)) {
@@ -565,17 +646,18 @@ public class WorldGuardPlayerListener extends PlayerListener {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
+                    event.setUseInteractedBlock(Result.DENY);
                    event.setCancelled(true);
                    return;
                }
            }
-            
-            if ((type == Material.RAILS || type == Material.POWERED_RAIL || type == Material.DETECTOR_RAIL)
-                   && item.getType() == Material.MINECART) {
+
+            if (BlockType.isRailBlock(type.getId()) && item.getType() == Material.MINECART) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.canBuild(localPlayer)
                        && !set.allows(DefaultFlag.PLACE_VEHICLE)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
+                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
                    return;
                }
@@ -586,6 +668,7 @@ public class WorldGuardPlayerListener extends PlayerListener {
                        && !set.canBuild(localPlayer)
                        && !set.allows(DefaultFlag.PLACE_VEHICLE)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
+                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
                    return;
                }
@@ -593,35 +676,53 @@ public class WorldGuardPlayerListener extends PlayerListener {
        }

        if (wcfg.getBlacklist() != null) {
-            if((block.getType() != Material.CHEST
-                && block.getType() != Material.DISPENSER
-                && block.getType() != Material.FURNACE
-                && block.getType() != Material.BURNING_FURNACE)) {
+            if(type != Material.CHEST
+                    && type != Material.DISPENSER
+                    && type != Material.FURNACE
+                    && type != Material.BURNING_FURNACE
+                    && type != Material.BREWING_STAND
+                    && type != Material.ENCHANTMENT_TABLE
+                    && type != Material.CAULDRON) {
                if (!wcfg.getBlacklist().check(
                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
-                        item.getTypeId()), false, false)) {
+                                item.getTypeId()), false, false)) {
+                    event.setUseItemInHand(Result.DENY);
                    event.setCancelled(true);
                    return;
                }
-
-                if (!wcfg.getBlacklist().check(
-                        new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
-                        block.getTypeId()), false, false)) {
-                    event.setCancelled(true);
-                    return;
-                }
-
            }

+            if (!wcfg.getBlacklist().check(
+                    new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
+                            block.getTypeId()), false, false)) {
+                event.setUseInteractedBlock(Result.DENY);
+                event.setCancelled(true);
+                return;
+            }
+
+            // Workaround for http://leaky.bukkit.org/issues/1034
+            if (item.getType() == Material.TNT) {
+                Block placedOn = block.getRelative(event.getBlockFace());
+                if (!wcfg.getBlacklist().check(
+                        new BlockPlaceBlacklistEvent(plugin.wrapPlayer(player), toVector(placedOn),
+                              item.getTypeId()), false, false)) {
+                    event.setUseItemInHand(Result.DENY);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
        }

-        if ((block.getType() == Material.CHEST
-                || block.getType() == Material.DISPENSER
-                || block.getType() == Material.FURNACE
-                || block.getType() == Material.BURNING_FURNACE)) {
+        if ((type == Material.CHEST
+                || type == Material.DISPENSER
+                || type == Material.FURNACE
+                || type == Material.BURNING_FURNACE
+                || type == Material.ENCHANTMENT_TABLE
+                || type == Material.BREWING_STAND)) {
            
            if (wcfg.isChestProtected(block, player)) {
                player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
+                event.setUseInteractedBlock(Result.DENY);
                event.setCancelled(true);
                return;
            }
@@ -842,7 +943,15 @@ public class WorldGuardPlayerListener extends PlayerListener {
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(world);
        
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlockClicked())) {
+        if (event.getItemStack().getType() == Material.MILK_BUCKET) {
+        	if (!plugin.getGlobalRegionManager().allows(DefaultFlag.USE, player.getLocation().add(0, 1, 0))) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use this in this area.");
+                event.setCancelled(true);
+                return;
+        	}
+        	
+        } else if (!plugin.getGlobalRegionManager().canBuild(
+                player, event.getBlockClicked().getRelative(event.getBlockFace()))) {
            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
            event.setCancelled(true);
            return;
@@ -869,7 +978,8 @@ public class WorldGuardPlayerListener extends PlayerListener {
        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(world);
        
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlockClicked())) {
+        if (!plugin.getGlobalRegionManager().canBuild(
+                player, event.getBlockClicked().getRelative(event.getBlockFace()))) {
            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
            event.setCancelled(true);
            return;
@@ -984,17 +1094,25 @@ public class WorldGuardPlayerListener extends PlayerListener {
            Vector pt = toVector(player.getLocation());
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            ProtectedRegion globalRegion = mgr.getRegion("__global__");

            String[] parts = event.getMessage().split(" ");

            Set<String> allowedCommands = set.getFlag(DefaultFlag.ALLOWED_CMDS);
+            if (allowedCommands == null && globalRegion != null) {
+                allowedCommands = globalRegion.getFlag(DefaultFlag.ALLOWED_CMDS);
+            }
            if (allowedCommands != null && !allowedCommands.contains(parts[0].toLowerCase())) {
+
                player.sendMessage(ChatColor.RED + parts[0].toLowerCase() + " is not allowed in this area.");
                event.setCancelled(true);
                return;
            }

            Set<String> blockedCommands = set.getFlag(DefaultFlag.BLOCKED_CMDS);
+            if (blockedCommands == null && globalRegion != null) {
+                blockedCommands = globalRegion.getFlag(DefaultFlag.BLOCKED_CMDS);
+            }
            if (blockedCommands != null && blockedCommands.contains(parts[0].toLowerCase())) {
                player.sendMessage(ChatColor.RED + parts[0].toLowerCase() + " is blocked in this area.");
                event.setCancelled(true);
@@ -19,7 +19,21 @@

 package com.sk89q.worldguard.bukkit;

-import com.sk89q.worldguard.protection.managers.RegionManager;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.jar.JarFile;
+import java.util.logging.Filter;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -27,23 +41,26 @@ import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
-import com.sk89q.bukkit.migration.*;
-import com.sk89q.minecraft.util.commands.*;
+
+import com.sk89q.bukkit.migration.PermissionsResolverManager;
+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.WrappedCommandException;
+import com.sk89q.minecraft.util.commands.Injector;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.TickSyncDelayLoggerFilter;
 import com.sk89q.worldguard.bukkit.commands.GeneralCommands;
 import com.sk89q.worldguard.bukkit.commands.ProtectionCommands;
 import com.sk89q.worldguard.bukkit.commands.ToggleCommands;
-import com.sk89q.worldguard.protection.*;
-import java.io.*;
-import java.util.*;
-import java.util.logging.Filter;
-import java.util.logging.Logger;
+import com.sk89q.worldguard.protection.GlobalRegionManager;
+import com.sk89q.worldguard.protection.managers.RegionManager;

 /**
 * The main class for WorldGuard as a Bukkit plugin.
@@ -54,7 +71,7 @@ public class WorldGuardPlugin extends JavaPlugin {
    /**
     * Logger for messages.
     */
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+    static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
    
    /**
     * Manager for commands. This automatically handles nested commands,
@@ -101,6 +118,16 @@ public class WorldGuardPlugin extends JavaPlugin {
                return plugin.hasPermission(player, perm);
            }
        };
+        commands.setInjector(new Injector() {
+            public Object getInstance(Class<?> cls) throws InvocationTargetException, IllegalAccessException, InstantiationException {
+                try {
+                    return cls.getConstructor(WorldGuardPlugin.class).newInstance(plugin);
+                } catch (NoSuchMethodException e) {
+                    e.printStackTrace();
+                    return null;
+                }
+            }
+        });
        
        // Register command classes
        commands.register(ToggleCommands.class);
@@ -116,8 +143,7 @@ public class WorldGuardPlugin extends JavaPlugin {
        getDataFolder().mkdirs();

        // Set up permissions
-        perms = new PermissionsResolverManager(
-                getConfiguration(), getServer(), "WorldGuard", logger);
+        perms = new PermissionsResolverManager(this, getDescription().getName(), logger);
        perms.load();

        // This must be done before configuration is laoded
@@ -131,14 +157,10 @@ public class WorldGuardPlugin extends JavaPlugin {
        // the migration code reuses the loaded region managers
        LegacyWorldGuardMigration.migrateRegions(this);

-        // Load permissions
-        (new PermissionsResolverServerListener(perms)).register(this);
-
        flagStateManager = new FlagStateManager(this);
-        
-        if (configuration.useRegionsScheduler) { 
-            getServer().getScheduler().scheduleAsyncRepeatingTask(this,
-                    flagStateManager, FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
+
+        if (configuration.useRegionsScheduler) {
+            getServer().getScheduler().scheduleAsyncRepeatingTask(this, flagStateManager, FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
        }

        if (configuration.suppressTickSyncWarnings) {
@@ -156,8 +178,23 @@ public class WorldGuardPlugin extends JavaPlugin {
        (new WorldGuardBlockListener(this)).registerEvents();
        (new WorldGuardEntityListener(this)).registerEvents();
        (new WorldGuardWeatherListener(this)).registerEvents();
-        (new WorldGuardWorldListener(this)).registerEvents();
-        
+        (new WorldGuardVehicleListener(this)).registerEvents();
+
+        // handle worlds separately to initialize already loaded worlds
+        WorldGuardWorldListener worldListener = (new WorldGuardWorldListener(this));
+        for (World world : getServer().getWorlds()) {
+            worldListener.initWorld(world);
+        }
+        worldListener.registerEvents();
+
+        // Check god mode for existing players, if any
+        for (Player player : getServer().getOnlinePlayers()) {
+            if (inGroup(player, "wg-invincible") ||
+                    (configuration.autoGodMode && hasPermission(player, "worldguard.auto-invincible"))) {
+                configuration.enableGodMode(player);
+            }
+        }
+
        logger.info("WorldGuard " + this.getDescription().getVersion() + " enabled.");
    }

@@ -167,6 +204,7 @@ public class WorldGuardPlugin extends JavaPlugin {
    public void onDisable() {
        globalRegionManager.unload();
        configuration.unload();
+        this.getServer().getScheduler().cancelTasks(this);

        logger.info("WorldGuard " + getDescription().getVersion() + " disabled.");
    }
@@ -178,7 +216,7 @@ public class WorldGuardPlugin extends JavaPlugin {
    public boolean onCommand(CommandSender sender, Command cmd, String label,
            String[] args) {
        try {
-            commands.execute(cmd.getName(), args, sender, this, sender);
+            commands.execute(cmd.getName(), args, sender, sender);
        } catch (CommandPermissionsException e) {
            sender.sendMessage(ChatColor.RED + "You don't have permission.");
        } catch (MissingNestedCommandException e) {
@@ -319,7 +357,8 @@ public class WorldGuardPlugin extends JavaPlugin {
        
        // Invoke the permissions resolver
        if (sender instanceof Player) {
-            return perms.hasPermission(((Player) sender).getName(), perm);
+            Player player = (Player) sender;
+            return perms.hasPermission(player.getWorld().getName(), player.getName(), perm);
        }
        
        return false;
@@ -530,7 +569,7 @@ public class WorldGuardPlugin extends JavaPlugin {
        if (filter.equalsIgnoreCase("#console")
                || filter.equalsIgnoreCase("*console*")
                || filter.equalsIgnoreCase("!")) {
-            return new ConsoleCommandSender(getServer());
+            return getServer().getConsoleSender();
        }
        
        return matchSinglePlayer(sender, filter);
@@ -642,7 +681,7 @@ public class WorldGuardPlugin extends JavaPlugin {
     * @param actual 
     * @param defaultName 
     */
-    public static void createDefaultConfiguration(File actual,
+    public void createDefaultConfiguration(File actual,
            String defaultName) {
        
        // Make parent directories
@@ -655,8 +694,16 @@ public class WorldGuardPlugin extends JavaPlugin {
            return;
        }

-        InputStream input = WorldGuardPlugin.class
-                .getResourceAsStream("/defaults/" + defaultName);
+        InputStream input =
+                    null;
+            try {
+                JarFile file = new JarFile(getFile());
+                ZipEntry copy = file.getEntry("defaults/" + defaultName);
+                if (copy == null) throw new FileNotFoundException();
+                input = file.getInputStream(copy);
+            } catch (IOException e) {
+                logger.severe(getDescription().getName() + ": Unable to read default configuration: " + defaultName);
+            }
        
        if (input != null) {
            FileOutputStream output = null;
@@ -0,0 +1,210 @@
+// $Id$
+/*
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ * All rights reserved.
+*/
+package com.sk89q.worldguard.bukkit;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import java.util.logging.Logger;
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.event.Event;
+import org.bukkit.event.vehicle.VehicleDestroyEvent;
+import org.bukkit.event.vehicle.VehicleListener;
+import org.bukkit.event.vehicle.VehicleMoveEvent;
+import org.bukkit.plugin.PluginManager;
+
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.bukkit.FlagStateManager.PlayerFlagState;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+public class WorldGuardVehicleListener extends VehicleListener {
+
+    /**
+     * Logger for messages.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin
+     */
+    public WorldGuardVehicleListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        registerEvent("VEHICLE_MOVE", Event.Priority.Normal);
+        registerEvent("VEHICLE_DESTROY", Event.Priority.Normal);
+    }
+
+    /**
+     * Register an event, but not failing if the event is not implemented.
+     *
+     * @param typeName
+     * @param priority
+     */
+    private void registerEvent(String typeName, Event.Priority priority) {
+        try {
+            Event.Type type = Event.Type.valueOf(typeName);
+            PluginManager pm = plugin.getServer().getPluginManager();
+            pm.registerEvent(type, this, priority, plugin);
+        } catch (IllegalArgumentException e) {
+            logger.info("WorldGuard: Unable to register missing event type " + typeName);
+        }
+    }
+
+    /**
+     * Called when a vehicle is destroyed.
+     */
+    @Override
+    public void onVehicleDestroy(VehicleDestroyEvent event) {
+        Vehicle vehicle = event.getVehicle();
+        Entity destroyer = event.getAttacker();
+
+        if (!(destroyer instanceof Player)) return; // don't care
+        Player player = (Player) destroyer;
+        World world = vehicle.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.useRegions) {
+            Vector pt = toVector(vehicle.getLocation());
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                    && !set.canBuild(localPlayer)
+                    && !set.allows(DefaultFlag.DESTROY_VEHICLE)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission to destroy vehicles here.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a vehicle moves.
+     */
+    @Override
+    public void onVehicleMove(VehicleMoveEvent event) {
+        Vehicle vehicle = event.getVehicle();
+        if (vehicle.getPassenger() == null
+                || !(vehicle.getPassenger() instanceof Player)) return;
+        Player player = (Player) vehicle.getPassenger();
+        World world = vehicle.getWorld();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        // unfortunate code duplication
+        if (wcfg.useRegions) {
+            // Did we move a block?
+            if (event.getFrom().getBlockX() != event.getTo().getBlockX()
+                    || event.getFrom().getBlockY() != event.getTo().getBlockY()
+                    || event.getFrom().getBlockZ() != event.getTo().getBlockZ()) {
+                PlayerFlagState state = plugin.getFlagStateManager().getState(player);
+                LocalPlayer localPlayer = plugin.wrapPlayer(player);
+                boolean hasBypass = plugin.getGlobalRegionManager().hasBypass(player, world);
+
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                Vector pt = new Vector(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
+                ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+                boolean entryAllowed = set.allows(DefaultFlag.ENTRY, localPlayer);
+                if (!hasBypass && !entryAllowed) {
+
+                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
+                    vehicle.teleport(event.getFrom());
+                    return;
+                }
+
+                // Have to set this state
+                if (state.lastExitAllowed == null) {
+                    state.lastExitAllowed = mgr.getApplicableRegions(toVector(event.getFrom()))
+                            .allows(DefaultFlag.EXIT, localPlayer);
+                }
+
+                boolean exitAllowed = set.allows(DefaultFlag.EXIT, localPlayer);
+                if (!hasBypass && exitAllowed && !state.lastExitAllowed) {
+                    player.sendMessage(ChatColor.DARK_RED + "You are not permitted to leave this area.");
+
+                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
+                    vehicle.teleport(event.getFrom());
+                    return;
+                }
+
+                String greeting = set.getFlag(DefaultFlag.GREET_MESSAGE);
+                String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE);
+                Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER);
+                Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE);
+                
+                if (state.lastFarewell != null && (farewell == null 
+                        || !state.lastFarewell.equals(farewell))) {
+                    String replacedFarewell = plugin.replaceMacros(
+                            player, BukkitUtil.replaceColorMacros(state.lastFarewell));
+                    player.sendMessage(ChatColor.AQUA + " ** " + replacedFarewell);
+                }
+                
+                if (greeting != null && (state.lastGreeting == null
+                        || !state.lastGreeting.equals(greeting))) {
+                    String replacedGreeting = plugin.replaceMacros(
+                            player, BukkitUtil.replaceColorMacros(greeting));
+                    player.sendMessage(ChatColor.AQUA + " ** " + replacedGreeting);
+                }
+                
+                if ((notifyLeave == null || !notifyLeave)
+                        && state.notifiedForLeave != null && state.notifiedForLeave) {
+                    plugin.broadcastNotification(ChatColor.GRAY + "WG: " 
+                            + ChatColor.LIGHT_PURPLE + player.getName()
+                            + ChatColor.GOLD + " left NOTIFY region");
+                }
+                
+                if (notifyEnter != null && notifyEnter && (state.notifiedForEnter == null
+                        || !state.notifiedForEnter)) {
+                    StringBuilder regionList = new StringBuilder();
+                    
+                    for (ProtectedRegion region : set) {
+                        if (regionList.length() != 0) {
+                            regionList.append(", ");
+                        }
+                        regionList.append(region.getId());
+                    }
+                    
+                    plugin.broadcastNotification(ChatColor.GRAY + "WG: " 
+                            + ChatColor.LIGHT_PURPLE + player.getName()
+                            + ChatColor.GOLD + " entered NOTIFY region: "
+                            + ChatColor.WHITE
+                            + regionList);
+                }
+
+                state.lastGreeting = greeting;
+                state.lastFarewell = farewell;
+                state.notifiedForEnter = notifyEnter;
+                state.notifiedForLeave = notifyLeave;
+                state.lastExitAllowed = exitAllowed;
+                state.lastWorld = event.getTo().getWorld();
+                state.lastBlockX = event.getTo().getBlockX();
+                state.lastBlockY = event.getTo().getBlockY();
+                state.lastBlockZ = event.getTo().getBlockZ();
+            }
+        }
+    }
+}
@@ -19,6 +19,9 @@
 package com.sk89q.worldguard.bukkit;

 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import java.util.logging.Logger;
+
 import org.bukkit.Location;
 import org.bukkit.event.Event;
 import org.bukkit.event.Event.Priority;
@@ -27,13 +30,12 @@ import org.bukkit.event.weather.ThunderChangeEvent;
 import org.bukkit.event.weather.WeatherChangeEvent;
 import org.bukkit.event.weather.WeatherListener;
 import org.bukkit.plugin.PluginManager;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;

-import java.util.logging.Logger;
-
 public class WorldGuardWeatherListener extends WeatherListener {

    /**
@@ -56,7 +58,7 @@ public class WorldGuardWeatherListener extends WeatherListener {
    }

    public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
+//        PluginManager pm = plugin.getServer().getPluginManager();

        registerEvent("LIGHTNING_STRIKE", Priority.High);
        registerEvent("THUNDER_CHANGE", Priority.High);
@@ -145,5 +147,4 @@ public class WorldGuardWeatherListener extends WeatherListener {
            }
        }
    }
-
 }
@@ -5,14 +5,16 @@
 */
 package com.sk89q.worldguard.bukkit;

-import org.bukkit.entity.*;
+import java.util.logging.Logger;
+
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.event.world.WorldListener;
+import org.bukkit.event.world.WorldLoadEvent;
 import org.bukkit.plugin.PluginManager;

-import java.util.logging.Logger;
-
 public class WorldGuardWorldListener extends WorldListener {

    /**
@@ -35,9 +37,10 @@ public class WorldGuardWorldListener extends WorldListener {
     * Register events.
     */
    public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
+//        PluginManager pm = plugin.getServer().getPluginManager();

        registerEvent("CHUNK_LOAD", Event.Priority.Normal);
+        registerEvent("WORLD_LOAD", Event.Priority.Normal);
    }

    /**
@@ -66,10 +69,7 @@ public class WorldGuardWorldListener extends WorldListener {
            int removed = 0;

            for (Entity entity : event.getChunk().getEntities()) {
-                if (entity instanceof Item
-                        || (entity instanceof LivingEntity
-                        && !(entity instanceof Tameable)
-                        && !(entity instanceof Player))) {
+                if (BukkitUtil.isIntensiveEntity(entity)) {
                    entity.remove();
                    removed++;
                }
@@ -81,4 +81,26 @@ public class WorldGuardWorldListener extends WorldListener {
            }
        }
    }
+
+    /**
+     * Called when a world is loaded.
+     */
+    public void onWorldLoad(WorldLoadEvent event) {
+        initWorld(event.getWorld());
+    }
+
+    public void initWorld(World world) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+        if (wcfg.alwaysRaining && !wcfg.disableWeather) {
+            world.setStorm(true);
+        } else if (wcfg.disableWeather && !wcfg.alwaysRaining) {
+            world.setStorm(false);
+        }
+        if (wcfg.alwaysThundering && !wcfg.disableThunder) {
+            world.setThundering(true);
+        } else if (wcfg.disableThunder && !wcfg.alwaysThundering) {
+            world.setStorm(false);
+        }
+    }
 }
@@ -23,22 +23,25 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldguard.bukkit.ConfigurationManager;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldedit.blocks.ItemType;

 public class GeneralCommands {
+    private final WorldGuardPlugin plugin;
+
+    public GeneralCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
    
-    @Command(aliases = {"god"},
-            usage = "[player]",
-            desc = "Enable godmode on a player",
-            flags = "s", min = 0, max = 1)
-    public static void god(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"god"}, usage = "[player]",
+            desc = "Enable godmode on a player", flags = "s", max = 1)
+    public void god(CommandContext args, CommandSender sender) throws CommandException {
        ConfigurationManager config = plugin.getGlobalStateManager();
        
        Iterable<Player> targets = null;
@@ -81,12 +84,9 @@ public class GeneralCommands {
        }
    }
    
-    @Command(aliases = {"ungod"},
-            usage = "[player]",
-            desc = "Disable godmode on a player",
-            flags = "s", min = 0, max = 1)
-    public static void ungod(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"ungod"}, usage = "[player]",
+            desc = "Disable godmode on a player", flags = "s", max = 1)
+    public void ungod(CommandContext args, CommandSender sender) throws CommandException {
        ConfigurationManager config = plugin.getGlobalStateManager();
        
        Iterable<Player> targets = null;
@@ -128,12 +128,8 @@ public class GeneralCommands {
        }
    }
    
-    @Command(aliases = {"heal"},
-            usage = "[player]",
-            desc = "Heal a player",
-            flags = "s", min = 0, max = 1)
-    public static void heal(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
+    public void heal(CommandContext args,CommandSender sender) throws CommandException {
        
        Iterable<Player> targets = null;
        boolean included = false;
@@ -153,6 +149,7 @@ public class GeneralCommands {

        for (Player player : targets) {
            player.setHealth(20);
+            player.setFoodLevel(20);
            
            // Tell the user
            if (player.equals(sender)) {
@@ -174,12 +171,8 @@ public class GeneralCommands {
        }
    }
    
-    @Command(aliases = {"slay"},
-            usage = "[player]",
-            desc = "Slay a player",
-            flags = "s", min = 0, max = 1)
-    public static void slay(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
+    public void slay(CommandContext args, CommandSender sender) throws CommandException {
        
        Iterable<Player> targets = null;
        boolean included = false;
@@ -220,13 +213,9 @@ public class GeneralCommands {
        }
    }
    
-    @Command(aliases = {"locate"},
-            usage = "[player]",
-            desc = "Locate a player",
-            flags = "", min = 0, max = 1)
+    @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
    @CommandPermissions({"worldguard.locate"})
-    public static void locate(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void locate(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        
@@ -242,15 +231,13 @@ public class GeneralCommands {
        }
    }
    
-    @Command(aliases = {"stack"},
-            usage = "",
-            desc = "Stack items",
-            flags = "", min = 0, max = 0)
+    @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0)
    @CommandPermissions({"worldguard.stack"})
-    public static void stack(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void stack(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
+        boolean ignoreMax = plugin.hasPermission(player, "worldguard.stack.illegitimate");
+        boolean ignoreDamaged = plugin.hasPermission(player, "worldguard.stack.damaged");
        
        ItemStack[] items = player.getInventory().getContents();
        int len = items.length;
@@ -262,17 +249,14 @@ public class GeneralCommands {

            // Avoid infinite stacks and stacks with durability
            if (item == null || item.getAmount() <= 0
-                    || ItemType.shouldNotStack(item.getTypeId())) {
+                    || (!ignoreMax && item.getMaxStackSize() == 1)) {
                continue;
            }

-            // Ignore buckets
-            if (item.getTypeId() >= 325 && item.getTypeId() <= 327) {
-                continue;
-            }
+            int max = ignoreMax ? 64 : item.getMaxStackSize();

-            if (item.getAmount() < 64) {
-                int needed = 64 - item.getAmount(); // Number of needed items until 64
+            if (item.getAmount() < max) {
+                int needed = max - item.getAmount(); // Number of needed items until max

                // Find another stack of the same type
                for (int j = i + 1; j < len; j++) {
@@ -280,15 +264,16 @@ public class GeneralCommands {

                    // Avoid infinite stacks and stacks with durability
                    if (item2 == null || item2.getAmount() <= 0
-                            || ItemType.shouldNotStack(item.getTypeId())) {
+                            || (!ignoreMax && item.getMaxStackSize() == 1)) {
                        continue;
                    }

                    // Same type?
                    // Blocks store their color in the damage value
                    if (item2.getTypeId() == item.getTypeId() &&
-                            (!ItemType.usesDamageValue(item.getTypeId())
-                                    || item.getDurability() == item2.getDurability())) {
+                            ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged)
+                                    || item.getDurability() == item2.getDurability()) &&
+                            item.getEnchantments().equals(item2.getEnchantments())) {
                        // This stack won't fit in the parent stack
                        if (item2.getAmount() > needed) {
                            item.setAmount(64);
@@ -20,21 +20,25 @@
 package com.sk89q.worldguard.bukkit.commands;

 import org.bukkit.command.CommandSender;
-import com.sk89q.minecraft.util.commands.*;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.NestedCommand;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

 public class ProtectionCommands {
-    @Command(aliases = {"region"},
-            desc = "Region management commands")
-    @NestedCommand({RegionCommands.class, RegionMemberCommands.class})
-    public static void region(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @SuppressWarnings("unused")
+    private final WorldGuardPlugin plugin;
+
+    public ProtectionCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
    }

-    @Command(aliases = {"worldguard"},
-            desc = "WorldGuard commands")
+    @Command(aliases = {"region"}, desc = "Region management commands")
+    @NestedCommand({RegionCommands.class, RegionMemberCommands.class})
+    public void region(CommandContext args, CommandSender sender) {}
+
+    @Command(aliases = {"worldguard"}, desc = "WorldGuard commands")
    @NestedCommand({WorldGuardCommands.class})
-    public static void worldGuard(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
-    }
+    public void worldGuard(CommandContext args, CommandSender sender) {}
 }
@@ -22,15 +22,23 @@ package com.sk89q.worldguard.bukkit.commands;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
+
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import com.sk89q.minecraft.util.commands.*;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.minecraft.util.commands.CommandPermissionsException;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.bukkit.selections.*;
+import com.sk89q.worldedit.bukkit.selections.CuboidSelection;
+import com.sk89q.worldedit.bukkit.selections.Polygonal2DSelection;
+import com.sk89q.worldedit.bukkit.selections.Selection;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.WorldConfiguration;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
@@ -40,19 +48,24 @@ import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.*;
+import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
 import com.sk89q.worldguard.util.RegionUtil;

 public class RegionCommands {
+    private final WorldGuardPlugin plugin;
+
+    public RegionCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
    
-    @Command(aliases = {"define", "def", "d"},
-            usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
-            desc = "Defines a region",
-            flags = "", min = 1, max = -1)
+    @Command(aliases = {"define", "def", "d"}, usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
+            desc = "Defines a region", min = 1)
    @CommandPermissions({"worldguard.region.define"})
-    public static void define(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void define(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        WorldEditPlugin worldEdit = plugin.getWorldEdit();
@@ -73,8 +86,13 @@ public class RegionCommands {
            throw new CommandException("Select a region with WorldEdit first.");
        }
        
-        ProtectedRegion region;
+        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
+        if (mgr.hasRegion(id)) {
+            throw new CommandException("That region is already defined. Use redefine instead.");
+        }
        
+        ProtectedRegion region;
+
        // Detect the type of region from WorldEdit
        if (sel instanceof Polygonal2DSelection) {
            Polygonal2DSelection polySel = (Polygonal2DSelection) sel;
@@ -95,7 +113,6 @@ public class RegionCommands {
            region.setOwners(RegionUtil.parseDomainString(args.getSlice(1), 1));
        }
        
-        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
        mgr.addRegion(region);
        
        try {
@@ -107,12 +124,9 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"redefine", "update", "move"},
-            usage = "<id>",
-            desc = "Re-defines the shape of a region",
-            flags = "", min = 1, max = 1)
-    public static void redefine(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"redefine", "update", "move"}, usage = "<id>",
+            desc = "Re-defines the shape of a region", min = 1, max = 1)
+    public void redefine(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
@@ -184,13 +198,10 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"claim"},
-            usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
-            desc = "Claim a region",
-            flags = "", min = 1, max = -1)
+    @Command(aliases = {"claim"}, usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
+            desc = "Claim a region", min = 1)
    @CommandPermissions({"worldguard.region.claim"})
-    public static void claim(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void claim(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        LocalPlayer localPlayer = plugin.wrapPlayer(player);
@@ -212,8 +223,14 @@ public class RegionCommands {
            throw new CommandException("Select a region with WorldEdit first.");
        }
        
-        ProtectedRegion region;
+        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
+
+        if (mgr.hasRegion(id)) {
+            throw new CommandException("That region already exists. Please choose a different name.");
+        }
        
+        ProtectedRegion region;
+
        // Detect the type of region from WorldEdit
        if (sel instanceof Polygonal2DSelection) {
            Polygonal2DSelection polySel = (Polygonal2DSelection) sel;
@@ -235,12 +252,12 @@ public class RegionCommands {
        }

        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld());
-        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
        
        if (!plugin.hasPermission(sender, "worldguard.region.unlimited")) {
            // Check whether the player has created too many regions 
-            if (wcfg.maxRegionCountPerPlayer >= 0
-                    && mgr.getRegionCountOfPlayer(localPlayer) >= wcfg.maxRegionCountPerPlayer) {
+            int maxRegionCount = wcfg.getMaxRegionCount(player);
+            if (maxRegionCount >= 0
+                    && mgr.getRegionCountOfPlayer(localPlayer) >= maxRegionCount) {
                throw new CommandException("You own too many regions, delete one first to claim a new one.");
            }
        }
@@ -264,7 +281,7 @@ public class RegionCommands {
        } else {
            if (wcfg.claimOnlyInsideExistingRegions) {
                throw new CommandException("You may only claim regions inside " +
-                		"existing regions that you or your group own.");
+                        "existing regions that you or your group own.");
            }
        }

@@ -312,12 +329,9 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"select", "sel", "s"},
-            usage = "<id>",
-            desc = "Load a region as a WorldEdit selection",
-            flags = "", min = 1, max = 1)
-    public static void select(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"select", "sel", "s"}, usage = "<id>",
+            desc = "Load a region as a WorldEdit selection", min = 1, max = 1)
+    public void select(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
@@ -361,12 +375,9 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"info", "i"},
-            usage = "[world] <id>",
-            desc = "Get information about a region",
-            flags = "", min = 1, max = 2)
-    public static void info(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"info", "i"}, usage = "[world] <id>",
+            desc = "Get information about a region", min = 1, max = 2)
+    public void info(CommandContext args, CommandSender sender) throws CommandException {

        Player player = null;
        LocalPlayer localPlayer = null;
@@ -384,13 +395,12 @@ public class RegionCommands {
            id = args.getString(1).toLowerCase();
        }
        
-        if (!ProtectedRegion.isValidId(id)) {
-            throw new CommandException("Invalid region ID specified!");
-        }
-        
        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
        
        if (!mgr.hasRegion(id)) {
+            if (!ProtectedRegion.isValidId(id)) {
+                throw new CommandException("Invalid region ID specified!");
+            }
            throw new CommandException("A region with ID '" + id + "' doesn't exist.");
        }

@@ -413,6 +423,10 @@ public class RegionCommands {

        sender.sendMessage(ChatColor.YELLOW + "Region: " + id
                + ChatColor.GRAY + " (type: " + region.getTypeName() + ")");
+        if (!ProtectedRegion.isValidId(id)) {
+            sender.sendMessage(ChatColor.RED + "This region has an invalid ID. "
+                    + "Please ask the owner to delete it and recreate it.");
+        }
        sender.sendMessage(ChatColor.BLUE + "Priority: " + region.getPriority());

        StringBuilder s = new StringBuilder();
@@ -445,13 +459,10 @@ public class RegionCommands {
        sender.sendMessage(ChatColor.LIGHT_PURPLE + "Bounds: " + c);
    }
    
-    @Command(aliases = {"list"},
-            usage = "[.player] [page] [world]",
-            desc = "Get a list of regions",
-            flags = "", min = 0, max = 3)
+    @Command(aliases = {"list"}, usage = "[.player] [page] [world]",
+            desc = "Get a list of regions", max = 3)
 //    @CommandPermissions({"worldguard.region.list"})
-    public static void list(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void list(CommandContext args, CommandSender sender) throws CommandException {

        World world;
        int page = 0;
@@ -536,7 +547,7 @@ public class RegionCommands {
        int pages = (int) Math.ceil(size / (float) listSize);

        sender.sendMessage(ChatColor.RED
-                + (name == "" ? "Regions (page " : "Regions for " + name + " (page ")
+                + (name.equals("") ? "Regions (page " : "Regions for " + name + " (page ")
                + (page + 1) + " of " + pages + "):");

        if (page < pages) {
@@ -550,12 +561,9 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"flag", "f"},
-            usage = "<id> <flag> [value]",
-            desc = "Set flags",
-            flags = "", min = 2, max = -1)
-    public static void flag(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"flag", "f"}, usage = "<id> <flag> [value]",
+            desc = "Set flags", min = 2)
+    public void flag(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
@@ -580,14 +588,20 @@ public class RegionCommands {
                throw new CommandException("Could not find a region by that ID.");
            }
        }
-        
+
+        // @TODO deprecate "flag.[own./member./blank]"
+        boolean hasPerm = false;
        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.flag.own." + id.toLowerCase());
+            if (plugin.hasPermission(sender, "worldguard.region.flag.own." + id.toLowerCase())) hasPerm = true;
+            else if (plugin.hasPermission(sender, "worldguard.region.flag.regions.own." + id.toLowerCase())) hasPerm = true;
        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.flag.member." + id.toLowerCase());
+            if (plugin.hasPermission(sender, "worldguard.region.flag.member." + id.toLowerCase())) hasPerm = true;
+            else if (plugin.hasPermission(sender, "worldguard.region.flag.regions.member." + id.toLowerCase())) hasPerm = true;
        } else {
-            plugin.checkPermission(sender, "worldguard.region.flag." + id.toLowerCase());
-        } 
+            if (plugin.hasPermission(sender, "worldguard.region.flag." + id.toLowerCase())) hasPerm = true;
+            else if (plugin.hasPermission(sender, "worldguard.region.flag.regions." + id.toLowerCase())) hasPerm = true;
+        }
+        if (!hasPerm) throw new CommandPermissionsException();
        
        Flag<?> foundFlag = null;
        
@@ -609,9 +623,12 @@ public class RegionCommands {
                    list.append(", ");
                }

+                // @TODO deprecate inconsistant "owner" permission
                if (region.isOwner(localPlayer)) {
                    if (!plugin.hasPermission(sender, "worldguard.region.flag.flags."
-                            + flag.getName() + ".owner." + id.toLowerCase())) {
+                            + flag.getName() + ".owner." + id.toLowerCase())
+                            && !plugin.hasPermission(sender, "worldguard.region.flag.flags."
+                                    + flag.getName() + ".own." + id.toLowerCase())) {
                        continue;
                    }
                } else if (region.isMember(localPlayer)) {
@@ -647,7 +664,7 @@ public class RegionCommands {
        
        if (value != null) {
            try {
-                setFlag(region, foundFlag, plugin, sender, value);
+                setFlag(region, foundFlag, sender, value);
            } catch (InvalidFlagFormat e) {
                throw new CommandException(e.getMessage());
            }
@@ -670,18 +687,15 @@ public class RegionCommands {
        }
    }
    
-    public static <V> void setFlag(ProtectedRegion region,
-            Flag<V> flag, WorldGuardPlugin plugin, CommandSender sender, String value)
+    public <V> void setFlag(ProtectedRegion region,
+            Flag<V> flag, CommandSender sender, String value)
                throws InvalidFlagFormat {
        region.setFlag(flag, flag.parseInput(plugin, sender, value));
    }
    
-    @Command(aliases = {"setpriority", "priority", "pri"},
-            usage = "<id> <priority>",
-            desc = "Set the priority of a region",
-            flags = "", min = 2, max = 2)
-    public static void setPriority(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"setpriority", "priority", "pri"}, usage = "<id> <priority>",
+            desc = "Set the priority of a region", min = 2, max = 2)
+    public void setPriority(CommandContext args, CommandSender sender) throws CommandException {
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
        LocalPlayer localPlayer = plugin.wrapPlayer(player);
@@ -722,12 +736,9 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"setparent", "parent", "par"},
-            usage = "<id> [parent-id]",
-            desc = "Set the parent of a region",
-            flags = "", min = 1, max = 2)
-    public static void setParent(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"setparent", "parent", "par"}, usage = "<id> [parent-id]",
+            desc = "Set the parent of a region", min = 1, max = 2)
+    public void setParent(CommandContext args, CommandSender sender) throws CommandException {
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
        LocalPlayer localPlayer = plugin.wrapPlayer(player);
@@ -796,12 +807,9 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"remove", "delete", "del", "rem"},
-            usage = "<id>",
-            desc = "Remove a region",
-            flags = "", min = 1, max = 1)
-    public static void remove(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"remove", "delete", "del", "rem"}, usage = "<id>",
+            desc = "Remove a region", min = 1, max = 1)
+    public void remove(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
@@ -837,12 +845,9 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"load", "reload"},
-            usage = "[world]",
-            desc = "Reload regions from file",
-            flags = "", min = 0, max = 1)
-    public static void load(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"load", "reload"}, usage = "[world]",
+            desc = "Reload regions from file", max = 1)
+    public void load(CommandContext args, CommandSender sender) throws CommandException {
        
        World world = null;
        
@@ -878,12 +883,9 @@ public class RegionCommands {
        }
    }
    
-    @Command(aliases = {"save", "write"},
-            usage = "[world]",
-            desc = "Re-save regions to file",
-            flags = "", min = 0, max = 1)
-    public static void save(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"save", "write"}, usage = "[world]",
+            desc = "Re-save regions to file", max = 1)
+    public void save(CommandContext args, CommandSender sender) throws CommandException {
        
        World world = null;
        
@@ -20,15 +20,19 @@
 package com.sk89q.worldguard.bukkit.commands;

 import java.io.IOException;
+
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.util.RegionUtil;
@@ -36,13 +40,15 @@ import com.sk89q.worldguard.util.RegionUtil;
 // @TODO: A lot of code duplication here! Need to fix.

 public class RegionMemberCommands {
+    private final WorldGuardPlugin plugin;
+
+    public RegionMemberCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
    
-    @Command(aliases = {"addmember", "addmember"},
-            usage = "<id> <members...>",
-            desc = "Add a member to a region",
-            flags = "", min = 2, max = -1)
-    public static void addMember(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"addmember", "addmember"}, usage = "<id> <members...>",
+            desc = "Add a member to a region", min = 2)
+    public void addMember(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
@@ -78,12 +84,9 @@ public class RegionMemberCommands {
        }
    }
    
-    @Command(aliases = {"addowner", "addowner"},
-            usage = "<id> <owners...>",
-            desc = "Add an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void addOwner(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @Command(aliases = {"addowner", "addowner"}, usage = "<id> <owners...>",
+            desc = "Add an owner to a region", min = 2)
+    public void addOwner(CommandContext args, CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
        World world = player.getWorld();
@@ -97,13 +100,26 @@ public class RegionMemberCommands {
        if (region == null) {
            throw new CommandException("Could not find a region by that ID.");
        }
-        
-        if (region.isOwner(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
-        } else if (region.isMember(localPlayer)) {
-            plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
+
+        Boolean flag = region.getFlag(DefaultFlag.BUYABLE);
+        DefaultDomain owners = region.getOwners();
+        if (flag != null && flag == true && owners != null && owners.size() == 0) {
+            if (!plugin.hasPermission(player, "worldguard.region.unlimited")) {
+                int maxRegionCount = plugin.getGlobalStateManager().get(world).getMaxRegionCount(player);
+                if (maxRegionCount >= 0 && mgr.getRegionCountOfPlayer(localPlayer)
+                        >= maxRegionCount) {
+                    throw new CommandException("You already own the maximum allowed amount of regions.");
+                }
+            }
+            plugin.checkPermission(sender, "worldguard.region.addowner.unclaimed." + id.toLowerCase());
        } else {
-            plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
+            if (region.isOwner(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
+            } else if (region.isMember(localPlayer)) {
+                plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
+            } else {
+                plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
+            }
        }

        RegionUtil.addToDomain(region.getOwners(), args.getPaddedSlice(2, 0), 0);
@@ -119,12 +135,9 @@ public class RegionMemberCommands {
        }
    }
    
-    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
-            usage = "<id> <owners...>",
-            desc = "Remove an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void removeMember(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    @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();
@@ -160,11 +173,9 @@ public class RegionMemberCommands {
        }
    }
    
-    @Command(aliases = {"removeowner", "remowner"},
-            usage = "<id> <owners...>",
-            desc = "Remove an owner to a region",
-            flags = "", min = 2, max = -1)
-    public static void removeOwner(CommandContext args, WorldGuardPlugin plugin,
+    @Command(aliases = {"removeowner", "remowner"}, usage = "<id> <owners...>",
+            desc = "Remove an owner to a region", min = 2)
+    public void removeOwner(CommandContext args,
            CommandSender sender) throws CommandException {
        
        Player player = plugin.checkPlayer(sender);
@@ -19,23 +19,32 @@

 package com.sk89q.worldguard.bukkit.commands;

-import com.sk89q.worldguard.bukkit.ConfigurationManager;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
-import com.sk89q.minecraft.util.commands.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.worldguard.bukkit.BukkitUtil;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
 import com.sk89q.worldguard.bukkit.WorldConfiguration;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import org.bukkit.entity.*;

 public class ToggleCommands {
+    private final WorldGuardPlugin plugin;

-    @Command(aliases = {"stopfire"},
-            usage = "[<world>]", desc = "Disables all fire spread temporarily",
-            flags = "", min = 0, max = 1)
+    public ToggleCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"stopfire"}, usage = "[<world>]",
+            desc = "Disables all fire spread temporarily", max = 1)
    @CommandPermissions({"worldguard.fire-toggle.stop"})
-    public static void stopFire(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void stopFire(CommandContext args, CommandSender sender) throws CommandException {
        
        World world;
        
@@ -61,12 +70,10 @@ public class ToggleCommands {
        wcfg.fireSpreadDisableToggle = true;
    }

-    @Command(aliases = {"allowfire"},
-            usage = "[<world>]", desc = "Allows all fire spread temporarily",
-            flags = "", min = 0, max = 1)
+    @Command(aliases = {"allowfire"}, usage = "[<world>]",
+            desc = "Allows all fire spread temporarily", max = 1)
    @CommandPermissions({"worldguard.fire-toggle.stop"})
-    public static void allowFire(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void allowFire(CommandContext args, CommandSender sender) throws CommandException {
        
        World world;
        
@@ -91,11 +98,9 @@ public class ToggleCommands {
    }

    @Command(aliases = {"halt-activity"},
-            usage = "", desc = "Attempts to cease as much activity in order to stop lag",
-            flags = "c", min = 0, max = 0)
+            desc = "Attempts to cease as much activity in order to stop lag", flags = "c", max = 0)
    @CommandPermissions({"worldguard.halt-activity"})
-    public static void stopLag(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void stopLag(CommandContext args, CommandSender sender) throws CommandException {

        ConfigurationManager configManager = plugin.getGlobalStateManager();

@@ -115,10 +120,7 @@ public class ToggleCommands {
                int removed = 0;

                for (Entity entity : world.getEntities()) {
-                    if (entity instanceof Item
-                            || (entity instanceof LivingEntity
-                            && !(entity instanceof Tameable)
-                            && !(entity instanceof Player))) {
+                    if (BukkitUtil.isIntensiveEntity(entity)) {
                        entity.remove();
                        removed++;
                    }
@@ -23,9 +23,11 @@ import java.io.File;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
@@ -37,26 +39,23 @@ import com.sk89q.worldguard.util.PastebinPoster;
 import com.sk89q.worldguard.util.PastebinPoster.PasteCallback;

 public class WorldGuardCommands {
+    private final WorldGuardPlugin plugin;

-    @Command(aliases = {"version"},
-            usage = "",
-            desc = "Get the WorldGuard version",
-            flags = "", min = 0, max = 0)
-    public static void version(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public WorldGuardCommands(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(aliases = {"version"}, desc = "Get the WorldGuard version", max = 0)
+    public void version(CommandContext args, CommandSender sender) throws CommandException {
        sender.sendMessage(ChatColor.YELLOW
                + "WorldGuard " + plugin.getDescription().getVersion());
        sender.sendMessage(ChatColor.YELLOW
                + "http://www.sk89q.com");
    }

-    @Command(aliases = {"reload"},
-            usage = "",
-            desc = "Reload WorldGuard configuration",
-            flags = "", min = 0, max = 0)
+    @Command(aliases = {"reload"}, desc = "Reload WorldGuard configuration", max = 0)
    @CommandPermissions({"worldguard.reload"})
-    public static void relload(CommandContext args, WorldGuardPlugin plugin,
-            CommandSender sender) throws CommandException {
+    public void reload(CommandContext args, CommandSender sender) throws CommandException {
        
        LoggerToChatHandler handler = null;
        Logger minecraftLogger = null;
@@ -84,13 +83,9 @@ public class WorldGuardCommands {
        }
    }
    
-    @Command(aliases = {"report"},
-            usage = "",
-            desc = "Writes a report on WorldGuard",
-            flags = "p", min = 0, max = 0)
+    @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0)
    @CommandPermissions({"worldguard.report"})
-    public static void report(CommandContext args, WorldGuardPlugin plugin,
-            final CommandSender sender) throws CommandException {
+    public void report(CommandContext args, final CommandSender sender) throws CommandException {
        
        File dest = new File(plugin.getDataFolder(), "report.txt");
        ReportWriter report = new ReportWriter(plugin);
@@ -122,4 +117,21 @@ public class WorldGuardCommands {
        }

    }
+
+    @Command(aliases = {"flushstates", "clearstates"},
+            usage = "[player]", desc = "Flush the state manager", max = 1)
+    @CommandPermissions("worldguard.flushstates")
+    public void flushStates(CommandContext args, CommandSender sender) throws CommandException {
+        if (args.argsLength() == 0) {
+            plugin.getFlagStateManager().forgetAll();
+            sender.sendMessage("Cleared all states.");
+        } else {
+            Player player = plugin.getServer().getPlayer(args.getString(0));
+            if (player != null) {
+                plugin.getFlagStateManager().forget(player);
+                sender.sendMessage("Cleared states for player \"" + player.getName() + "\".");
+            }
+        }
+    }
+
 }
@@ -19,10 +19,14 @@

 package com.sk89q.worldguard.domains;

+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
+
 import com.sk89q.worldguard.LocalPlayer;

 public class DefaultDomain implements Domain {
@@ -86,7 +90,9 @@ public class DefaultDomain implements Domain {
    
    public String toPlayersString() {
        StringBuilder str = new StringBuilder();
-        for (Iterator<String> it = players.iterator(); it.hasNext(); ) {
+        List<String> output = new ArrayList<String>(players);
+        Collections.sort(output, String.CASE_INSENSITIVE_ORDER);
+        for (Iterator<String> it = output.iterator(); it.hasNext();) {
            str.append(it.next());
            if (it.hasNext()) {
                str.append(", ");
@@ -19,8 +19,9 @@

 package com.sk89q.worldguard.domains;

-import java.util.Set;
 import java.util.LinkedHashSet;
+import java.util.Set;
+
 import com.sk89q.worldguard.LocalPlayer;

 public class DomainCollection implements Domain {
@@ -20,8 +20,9 @@
 package com.sk89q.worldguard.domains;

 import java.util.Arrays;
-import java.util.Set;
 import java.util.LinkedHashSet;
+import java.util.Set;
+
 import com.sk89q.worldguard.LocalPlayer;

 public class GroupDomain implements Domain {
@@ -19,8 +19,9 @@

 package com.sk89q.worldguard.domains;

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

 public class PlayerDomain implements Domain {
@@ -18,9 +18,6 @@
 */
 package com.sk89q.worldguard.protection;

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

 /**
 * Represents a set of regions for a particular point or area and the rules
@@ -305,9 +309,11 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
     * @throws IllegalArgumentException if a StateFlag is given
     */
    public <T extends Flag<V>, V> V getFlag(T flag) {
+        /*
        if (flag instanceof StateFlag) {
            throw new IllegalArgumentException("Cannot use StateFlag with getFlag()");
        }
+        */

        int lastPriority = 0;
        boolean found = false;
@@ -341,6 +347,10 @@ public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
        try {
            return needsClear.values().iterator().next();
        } catch (NoSuchElementException e) {
+            if (globalRegion != null) {
+                V gFlag = globalRegion.getFlag(flag);
+                if (gFlag != null) return gFlag;
+            }
            return null;
        }
    }
@@ -19,6 +19,18 @@
 package com.sk89q.worldguard.protection;

 import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.logging.Logger;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.bukkit.BukkitUtil;
 import com.sk89q.worldguard.bukkit.ConfigurationManager;
@@ -28,42 +40,33 @@ import com.sk89q.worldguard.protection.databases.YAMLDatabase;
 import com.sk89q.worldguard.protection.flags.StateFlag;
 import com.sk89q.worldguard.protection.managers.FlatRegionManager;
 import com.sk89q.worldguard.protection.managers.RegionManager;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;

 /**
 * This class keeps track of region information for every world. It loads
 * world region information as needed.
- * 
+ *
 * @author sk89q
 * @author Redecouverte
 */
 public class GlobalRegionManager {

    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
+
    /**
     * Reference to the plugin.
     */
    private WorldGuardPlugin plugin;
-    
+
    /**
     * Reference to the global configuration.
     */
    private ConfigurationManager config;
-    
+
    /**
     * Map of managers per-world.
     */
    private HashMap<String, RegionManager> managers;
-    
+
    /**
     * Stores the list of modification dates for the world files. This allows
     * WorldGuard to reload files as needed.
@@ -72,8 +75,8 @@ public class GlobalRegionManager {

    /**
     * Construct the object.
-     * 
-     * @param plugin 
+     *
+     * @param plugin
     */
    public GlobalRegionManager(WorldGuardPlugin plugin) {
        this.plugin = plugin;
@@ -89,10 +92,10 @@ public class GlobalRegionManager {
        managers.clear();
        lastModified.clear();
    }
-    
+
    /**
     * Get the path for a world's regions file.
-     * 
+     *
     * @param name
     * @return
     */
@@ -103,7 +106,7 @@ public class GlobalRegionManager {

    /**
     * Unload region information for a world.
-     * 
+     *
     * @param name
     */
    public void unload(String name) {
@@ -125,14 +128,14 @@ public class GlobalRegionManager {

    /**
     * Load region information for a world.
-     * 
+     *
     * @param world
-     * @return 
+     * @return
     */
    public RegionManager load(World world) {
        String name = world.getName();
        File file = getPath(name);
-        
+
        try {
            // Create a manager
            RegionManager manager = new FlatRegionManager(new YAMLDatabase(file));
@@ -144,18 +147,23 @@ public class GlobalRegionManager {

            // Store the last modification date so we can track changes
            lastModified.put(name, file.lastModified());
-            
+
            return manager;
-        } catch (FileNotFoundException e) {
+        } catch (FileNotFoundException e) { // this should no longer happen hopefully
+            logger.info("WorldGuard: Region file for world \""
+                    + name + "\" missing or inaccessible.");
        } catch (IOException e) {
-            logger.warning("WorldGuard: Failed to load regions from file "
+            logger.info("WorldGuard: Failed to load regions from file "
                    + file.getAbsolutePath() + " : " + e.getMessage());
+        } catch (Exception e) {
+            logger.info("WorldGuard: Error loading regions for world \""
+                    + name + "\":" + e.getMessage());
        }
-        
-        // @TODO: THIS CREATES PROBLEMS!!
+
+        // @TODO: THIS CREATES PROBLEMS!!one!!1!!eleven!!1!!!
        return null;
    }
-    
+
    /**
     * Preloads region managers for all worlds.
     */
@@ -175,7 +183,7 @@ public class GlobalRegionManager {
            File file = getPath(name);

            Long oldDate = lastModified.get(name);
-            
+
            if (oldDate == null) {
                oldDate = 0L;
            }
@@ -183,7 +191,7 @@ public class GlobalRegionManager {
            try {
                if (file.lastModified() > oldDate) {
                    World world = plugin.getServer().getWorld(name);
-                    
+
                    if (world != null) {
                        load(world);
                    }
@@ -195,7 +203,7 @@ public class GlobalRegionManager {

    /**
     * Get the region manager for a particular world.
-     * 
+     *
     * @param world
     * @return
     */
@@ -220,10 +228,10 @@ public class GlobalRegionManager {
        return player.hasPermission("worldguard.region.bypass."
                        + world.getName());
    }
-    
+
    /**
     * Returns whether the player can bypass.
-     * 
+     *
     * @param player
     * @param world
     * @return
@@ -232,33 +240,33 @@ public class GlobalRegionManager {
        return plugin.hasPermission(player, "worldguard.region.bypass."
                        + world.getName());
    }
-    
+
    /**
     * Check if a player has permission to build at a block.
-     * 
+     *
     * @param player
-     * @param block 
+     * @param block
     * @return
     */
    public boolean canBuild(Player player, Block block) {
        return canBuild(player, block.getLocation());
    }
-    
+
    /**
     * Check if a player has permission to build at a location.
-     * 
+     *
     * @param player
-     * @param loc 
+     * @param loc
     * @return
     */
    public boolean canBuild(Player player, Location loc) {
        World world = loc.getWorld();
        WorldConfiguration worldConfig = config.get(world);
-        
+
        if (!worldConfig.useRegions) {
            return true;
        }
-    
+
        LocalPlayer localPlayer = plugin.wrapPlayer(player);

        if (!hasBypass(player, world)) {
@@ -272,10 +280,10 @@ public class GlobalRegionManager {

        return true;
    }
-    
+
    /**
     * Checks to see whether a flag is allowed.
-     * 
+     *
     * @param flag
     * @param loc
     * @return
@@ -283,11 +291,11 @@ public class GlobalRegionManager {
    public boolean allows(StateFlag flag, Location loc) {
        World world = loc.getWorld();
        WorldConfiguration worldConfig = config.get(world);
-        
+
        if (!worldConfig.useRegions) {
            return true;
        }
-        
+
        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
        return mgr.getApplicableRegions(toVector(loc)).allows(flag);
    }
@@ -20,6 +20,7 @@
 package com.sk89q.worldguard.protection.databases;

 import java.io.IOException;
+
 import com.sk89q.worldguard.protection.managers.RegionManager;

 public abstract class AbstractProtectionDatabase implements ProtectionDatabase {
@@ -19,33 +19,37 @@

 package com.sk89q.worldguard.protection.databases;

-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.flags.StateFlag.State;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.io.*;
+
 import au.com.bytecode.opencsv.CSVReader;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.flags.StateFlag.State;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
 import com.sk89q.worldguard.util.ArrayReader;

 /**
 * Represents a protected area database that uses CSV files.
- * 
+ *
 * @author sk89q
 */
 public class CSVDatabase extends AbstractProtectionDatabase {
    private static Logger logger = Logger.getLogger("Minecraft.WorldGuard");
-    
+
    /**
     * References the CSV file.
     */
@@ -54,11 +58,11 @@ public class CSVDatabase extends AbstractProtectionDatabase {
     * Holds the list of regions.
     */
    private Map<String,ProtectedRegion> regions;
-    
+
    /**
     * Construct the database with a path to a file. No file is read or
     * written at this time.
-     * 
+     *
     * @param file
     */
    public CSVDatabase(File file) {
@@ -80,28 +84,28 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                new HashMap<String,ProtectedRegion>();
        Map<ProtectedRegion,String> parentSets =
                new LinkedHashMap<ProtectedRegion, String>();
-        
+
        CSVReader reader = new CSVReader(new FileReader(file));
-        
+
        try {
            String[] line;
-            
+
            while ((line = reader.readNext()) != null) {
                if (line.length < 2) {
                    logger.warning("Invalid region definition: " + line);
                    continue;
                }
-                
+
                String id = line[0].toLowerCase().replace(".", "");
                String type = line[1];
                ArrayReader<String> entries = new ArrayReader<String>(line);
-                
+
                if (type.equalsIgnoreCase("cuboid")) {
                    if (line.length < 8) {
                        logger.warning("Invalid region definition: " + line);
                        continue;
                    }
-                    
+
                    Vector pt1 = new Vector(
                            Integer.parseInt(line[2]),
                            Integer.parseInt(line[3]),
@@ -113,12 +117,12 @@ public class CSVDatabase extends AbstractProtectionDatabase {

                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
-                    
+
                    int priority = entries.get(8) == null ? 0 : Integer.parseInt(entries.get(8));
                    String ownersData = entries.get(9);
                    String flagsData = entries.get(10);
                    //String enterMessage = nullEmptyString(entries.get(11));
-                    
+
                    ProtectedRegion region = new ProtectedCuboidRegion(id, min, max);
                    region.setPriority(priority);
                    parseFlags(region, flagsData);
@@ -136,7 +140,7 @@ public class CSVDatabase extends AbstractProtectionDatabase {

                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
-                    
+
                    int priority = entries.get(8) == null ? 0 : Integer.parseInt(entries.get(8));
                    String parentId = entries.get(9);
                    String ownersData = entries.get(10);
@@ -144,14 +148,14 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                    String flagsData = entries.get(12);
                    //String enterMessage = nullEmptyString(entries.get(13));
                    //String leaveMessage = nullEmptyString(entries.get(14));
-                    
+
                    ProtectedRegion region = new ProtectedCuboidRegion(id, min, max);
                    region.setPriority(priority);
                    parseFlags(region, flagsData);
                    region.setOwners(this.parseDomains(ownersData));
                    region.setMembers(this.parseDomains(membersData));
                    regions.put(id, region);
-                    
+
                    // Link children to parents later
                    if (parentId.length() > 0) {
                        parentSets.put(region, parentId);
@@ -164,7 +168,7 @@ public class CSVDatabase extends AbstractProtectionDatabase {
            } catch (IOException e) {
            }
        }
-        
+
        for (Map.Entry<ProtectedRegion, String> entry : parentSets.entrySet()) {
            ProtectedRegion parent = regions.get(entry.getValue());
            if (parent != null) {
@@ -178,13 +182,13 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                logger.warning("Unknown region parent: " + entry.getValue());
            }
        }
-        
+
        this.regions = regions;
    }
-    
+
    /**
     * Used to parse the specified domain in the CSV file.
-     * 
+     *
     * @param data
     * @return
     */
@@ -192,19 +196,19 @@ public class CSVDatabase extends AbstractProtectionDatabase {
        if (data == null) {
            return new DefaultDomain();
        }
-        
+
        DefaultDomain domain = new DefaultDomain();
        Pattern pattern = Pattern.compile("^([A-Za-z]):(.*)$");
-        
+
        String[] parts = data.split(",");
-        
+
        for (String part : parts) {
            if (part.trim().length() == 0) {
                continue;
            }
-            
+
            Matcher matcher = pattern.matcher(part);
-            
+
            if (!matcher.matches()) {
                logger.warning("Invalid owner specification: " + part);
                continue;
@@ -221,22 +225,22 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                logger.warning("Unknown owner specification: " + type);
            }
        }
-        
+
        return domain;
    }
-    
+
    /**
     * Used to parse the list of flags.
-     * 
+     *
     * @param data
     */
    private void parseFlags(ProtectedRegion region, String data) {
        if (data == null) {
            return;
        }
-        
+
        State curState = State.ALLOW;
-        
+
        for (int i = 0; i < data.length(); i++) {
            char k = data.charAt(i);
            if (k == '+') {
@@ -258,7 +262,7 @@ public class CSVDatabase extends AbstractProtectionDatabase {
                } else {
                    flagStr = String.valueOf(k);
                }
-                
+
                StateFlag flag = DefaultFlag.getLegacyFlag(flagStr);
                if (flag != null) {
                    region.setFlag(flag, curState);
@@ -271,29 +275,29 @@ public class CSVDatabase extends AbstractProtectionDatabase {

    /**
     * Used to write the list of domains.
-     * 
+     *
     * @param domain
     * @return
     */
 /*    private String writeDomains(DefaultDomain domain) {
        StringBuilder str = new StringBuilder();
-        
+
        for (String player : domain.getPlayers()) {
            str.append("u:" + player + ",");
        }
-        
+
        for (String group : domain.getGroups()) {
            str.append("g:" + group + ",");
        }
-        
+
        return str.length() > 0 ?
                str.toString().substring(0, str.length() - 1) : "";
    }*/
-    
+
    /**
     * Helper method to prepend '+' or '-' in front of a flag according
     * to the flag's state.
-     * 
+     *
     * @param state
     * @param flag
     * @return
@@ -305,14 +309,14 @@ public class CSVDatabase extends AbstractProtectionDatabase {
        } else if (state == State.DENY) {
            return "-" + flag;
        }
-        
+
        return "";
    }
 */

    /**
     * Returns a null if a string is null or empty.
-     * 
+     *
     * @param str
     * @return
     */
@@ -19,53 +19,54 @@

 package com.sk89q.worldguard.protection.databases;

-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import java.io.IOException;
 import java.util.Map;

+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
 /**
 * Represents a database to read and write lists of regions from and to.
- * 
+ *
 * @author sk89q
 */
 public interface ProtectionDatabase {
    /**
     * Load the list of regions. The method should not modify the list returned
     * by getRegions() unless the load finishes successfully.
-     * 
+     *
     * @throws IOException
     */
    public void load() throws IOException;
    /**
     * Save the list of regions.
-     * 
+     *
     * @throws IOException
     */
    public void save() throws IOException;
    /**
     * Load the list of regions into a region manager.
-     * 
-     * @param manager 
+     *
+     * @param manager
     * @throws IOException
     */
    public void load(RegionManager manager) throws IOException;
    /**
     * Save the list of regions from a region manager.
-     * 
-     * @param manager 
+     *
+     * @param manager
     * @throws IOException
     */
    public void save(RegionManager manager) throws IOException;
    /**
     * Get a list of regions.
-     * 
+     *
     * @return
     */
    public Map<String,ProtectedRegion> getRegions();
    /**
     * Set the list of regions.
-     * 
+     *
     * @param regions
     */
    public void setRegions(Map<String,ProtectedRegion> regions);
@@ -21,6 +21,7 @@ package com.sk89q.worldguard.protection.databases;

 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import com.sk89q.worldguard.domains.DefaultDomain;

 /**
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
+
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
@@ -50,6 +51,12 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
    private Map<String, ProtectedRegion> regions;
    
    public YAMLDatabase(File file) {
+        if (!file.exists()) { // shouldn't be necessary, but check anyways
+            try {
+                file.createNewFile();
+            } catch (IOException e) {}
+            // if this is thrown, we can't do anything (caught elsewhere anyway)
+        }
        config = new Configuration(file);
    }

@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;

 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

 /**
@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;

 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

 /**
@@ -18,8 +18,6 @@
 */
 package com.sk89q.worldguard.protection.flags;

-import org.bukkit.command.CommandSender;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import org.bukkit.entity.CreatureType;

 /**
@@ -26,7 +26,7 @@ import org.bukkit.entity.CreatureType;
 * @author sk89q
 */
 public final class DefaultFlag {
-    
+
    public static final StateFlag PASSTHROUGH = new StateFlag("passthrough", 'z', false);
    public static final StateFlag BUILD = new StateFlag("build", 'b', true);
    public static final StateFlag PVP = new StateFlag("pvp", 'p', true);
@@ -45,8 +45,17 @@ public final class DefaultFlag {
    public static final StateFlag LAVA_FLOW = new StateFlag("lava-flow", true);
    public static final StateFlag USE = new StateFlag("use", true);
    public static final StateFlag PLACE_VEHICLE = new StateFlag("vehicle-place", false);
+    public static final StateFlag DESTROY_VEHICLE = new StateFlag("vehicle-destroy", false);
+    public static final StateFlag PISTONS = new StateFlag("pistons", true);
    public static final StateFlag SNOW_FALL = new StateFlag("snow-fall", true);
+    public static final StateFlag SNOW_MELT = new StateFlag("snow-melt", true);
+    public static final StateFlag ICE_FORM = new StateFlag("ice-form", true);
+    public static final StateFlag ICE_MELT = new StateFlag("ice-melt", true);
+    public static final StateFlag MUSHROOMS = new StateFlag("mushroom-growth", true);
    public static final StateFlag LEAF_DECAY = new StateFlag("leaf-decay", true);
+    public static final StateFlag GRASS_SPREAD = new StateFlag("grass-growth", true);
+    public static final StateFlag ENDER_BUILD = new StateFlag("enderman-grief", true);
+    public static final StateFlag INVINCIBILITY = new StateFlag("invincible", false);
    public static final StateFlag ENTRY = new StateFlag("entry", true);
    public static final RegionGroupFlag ENTRY_PERM = new RegionGroupFlag("entry-group", RegionGroupFlag.RegionGroup.NON_MEMBERS);
    public static final StateFlag EXIT = new StateFlag("exit", true);
@@ -58,6 +67,12 @@ public final class DefaultFlag {
    public static final SetFlag<CreatureType> DENY_SPAWN = new SetFlag<CreatureType>("deny-spawn", new CreatureTypeFlag(null));
    public static final IntegerFlag HEAL_DELAY = new IntegerFlag("heal-delay");
    public static final IntegerFlag HEAL_AMOUNT = new IntegerFlag("heal-amount");
+    public static final IntegerFlag MIN_HEAL = new IntegerFlag("heal-min-health");
+    public static final IntegerFlag MAX_HEAL = new IntegerFlag("heal-max-health");
+    public static final IntegerFlag FEED_DELAY = new IntegerFlag("feed-delay");
+    public static final IntegerFlag FEED_AMOUNT = new IntegerFlag("feed-amount");
+    public static final IntegerFlag MIN_FOOD = new IntegerFlag("feed-min-hunger");
+    public static final IntegerFlag MAX_FOOD = new IntegerFlag("feed-max-hunger");
    public static final VectorFlag TELE_LOC = new VectorFlag("teleport");
    public static final RegionGroupFlag TELE_PERM = new RegionGroupFlag("teleport-group", RegionGroupFlag.RegionGroup.MEMBERS);
    public static final VectorFlag SPAWN_LOC = new VectorFlag("spawn");
@@ -68,29 +83,36 @@ public final class DefaultFlag {
    public static final SetFlag<String> ALLOWED_CMDS = new SetFlag<String>("allowed-cmds", new CommandStringFlag(null));

    public static final Flag<?>[] flagsList = new Flag<?>[] {
-        PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION, SLEEP,
-        TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW, LAVA_FLOW,
-        USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER,
-        NOTIFY_LEAVE, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,
-        TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE, SNOW_FALL, LEAF_DECAY,
-        GHAST_FIREBALL, BLOCKED_CMDS, ALLOWED_CMDS, ENTRY, ENTRY_PERM, EXIT, EXIT_PERM
+        PASSTHROUGH, BUILD, PVP, CHEST_ACCESS, PISTONS,
+        TNT, LIGHTER, USE, PLACE_VEHICLE, DESTROY_VEHICLE, SLEEP,
+        MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY,
+        CREEPER_EXPLOSION, GHAST_FIREBALL, ENDER_BUILD,
+        GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
+        EXIT, EXIT_PERM, ENTRY, ENTRY_PERM,
+        HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
+        FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
+        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT,
+        MUSHROOMS, LEAF_DECAY, GRASS_SPREAD,
+        FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
+        TELE_LOC, TELE_PERM, SPAWN_LOC, SPAWN_PERM,
+        BLOCKED_CMDS, ALLOWED_CMDS, PRICE, BUYABLE,
    };

    static {
        ENTRY.setGroupFlag(ENTRY_PERM);
        EXIT.setGroupFlag(EXIT_PERM);
    }
-    
+
    private DefaultFlag() {
    }
-    
+
    public static Flag<?>[] getFlags() {
        return flagsList;
    }
-    
+
    /**
     * Get the legacy flag.
-     * 
+     *
     * @param flagString
     * @return null if not found
     */
@@ -100,7 +122,7 @@ public final class DefaultFlag {
                return (StateFlag) flag;
            }
        }
-        
+
        return null;
    }
 }
@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;

 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

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

 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

 /**
@@ -19,40 +19,41 @@
 package com.sk89q.worldguard.protection.flags;

 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

 /**
 *
 * @author sk89q
- * @param <T> 
+ * @param <T>
 */
 public abstract class Flag<T> {
-    
+
    private String name;
    private Character legacyCode;
-    
+
    public Flag(String name, char legacyCode) {
        this.name = name;
        this.legacyCode = legacyCode;
    }
-    
+
    public Flag(String name) {
        this.name = name;
        this.legacyCode = null;
    }
-    
+
    public String getName() {
        return name;
    }
-    
+
    public Character getLegacyCode() {
        return legacyCode;
    }
-    
+
    public abstract T parseInput(WorldGuardPlugin plugin, CommandSender sender,
            String input) throws InvalidFlagFormat;
-    
+
    public abstract T unmarshal(Object o);
-    
+
    public abstract Object marshal(T o);
 }
@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;

 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

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

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

 /**
 *
@@ -38,7 +39,7 @@ public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {
    }

    private RegionGroup def;
-    
+
    public RegionGroupFlag(String name, char legacyCode, RegionGroup def) {
        super(name, legacyCode);
        this.def = def;
@@ -57,7 +58,7 @@ public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {
    public RegionGroup parseInput(WorldGuardPlugin plugin, CommandSender sender,
            String input) throws InvalidFlagFormat {
        input = input.trim();
-        
+
        if (input.equalsIgnoreCase("members") || input.equalsIgnoreCase("member")) {
            return RegionGroup.MEMBERS;
        } else if (input.equalsIgnoreCase("owners") || input.equalsIgnoreCase("owner")) {
@@ -69,7 +70,7 @@ public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {
        } else if (input.equalsIgnoreCase("everyone") || input.equalsIgnoreCase("anyone")) {
            return null;
        } else {
-            throw new InvalidFlagFormat("Not none/allow/deny: " + input);
+            throw new InvalidFlagFormat("Expected [non]member/[non]owner/anyone but got '" + input + "'");
        }
    }

@@ -148,5 +149,5 @@ public class RegionGroupFlag extends Flag<RegionGroupFlag.RegionGroup> {

        return false;
    }
-    
+
 }
@@ -18,10 +18,15 @@
 */
 package com.sk89q.worldguard.protection.flags;

-import org.bukkit.command.CommandSender;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;

-import java.util.*;
+import org.bukkit.command.CommandSender;
+
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

 /**
 * Represents a flag that consists of a set.
@@ -56,8 +61,8 @@ public class SetFlag<T> extends Flag<Set<T>> {

    @Override
    public Set<T> unmarshal(Object o) {
-        if (o instanceof Collection) {
-            Collection collection = (Collection) o;
+        if (o instanceof Collection<?>) {
+            Collection<?> collection = (Collection<?>) o;
            Set<T> items = new HashSet<T>();

            for (Object sub : collection) {
@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;

 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

 /**
@@ -26,15 +27,15 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 * @author sk89q
 */
 public class StateFlag extends Flag<StateFlag.State> {
-    
+
    public enum State {
        ALLOW,
        DENY
    }
-    
+
    private boolean def;
    private RegionGroupFlag groupFlag;
-    
+
    public StateFlag(String name, char legacyCode, boolean def) {
        super(name, legacyCode);
        this.def = def;
@@ -61,7 +62,7 @@ public class StateFlag extends Flag<StateFlag.State> {
    public State parseInput(WorldGuardPlugin plugin, CommandSender sender,
            String input) throws InvalidFlagFormat {
        input = input.trim();
-        
+
        if (input.equalsIgnoreCase("allow")) {
            return State.ALLOW;
        } else if (input.equalsIgnoreCase("deny")) {
@@ -69,7 +70,7 @@ public class StateFlag extends Flag<StateFlag.State> {
        } else if (input.equalsIgnoreCase("none")) {
            return null;
        } else {
-            throw new InvalidFlagFormat("Not none/allow/deny: " + input);
+            throw new InvalidFlagFormat("Expected none/allow/deny but got '" + input + "'");
        }
    }

@@ -95,5 +96,5 @@ public class StateFlag extends Flag<StateFlag.State> {
            return null;
        }
    }
-    
+
 }
@@ -19,6 +19,7 @@
 package com.sk89q.worldguard.protection.flags;

 import org.bukkit.command.CommandSender;
+
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

 /**
@@ -26,7 +27,7 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 * @author sk89q
 */
 public class StringFlag extends Flag<String> {
-    
+
    public StringFlag(String name, char legacyCode) {
        super(name, legacyCode);
    }
@@ -54,5 +55,5 @@ public class StringFlag extends Flag<String> {
    public Object marshal(String o) {
        return o;
    }
-    
+
 }
@@ -20,7 +20,9 @@ package com.sk89q.worldguard.protection.flags;

 import java.util.HashMap;
 import java.util.Map;
+
 import org.bukkit.command.CommandSender;
+
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.bukkit.BukkitUtil;
@@ -31,7 +33,7 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 * @author sk89q
 */
 public class VectorFlag extends Flag<Vector> {
-    
+
    public VectorFlag(String name, char legacyCode) {
        super(name, legacyCode);
    }
@@ -44,7 +46,7 @@ public class VectorFlag extends Flag<Vector> {
    public Vector parseInput(WorldGuardPlugin plugin, CommandSender sender,
            String input) throws InvalidFlagFormat {
        input = input.trim();
-        
+
        try {
            return BukkitUtil.toVector(plugin.checkPlayer(sender).getLocation());
        } catch (CommandException e) {
@@ -54,20 +56,20 @@ public class VectorFlag extends Flag<Vector> {

    @Override
    public Vector unmarshal(Object o) {
-        if (o instanceof Map) {
+        if (o instanceof Map<?, ?>) {
            Map<?, ?> map  = (Map<?, ?>) o;

            Object rawX = map.get("x");
            Object rawY = map.get("y");
            Object rawZ = map.get("z");
-            
+
            if (rawX == null || rawY == null || rawZ == null) {
                return null;
            }
-            
+
            return new Vector(toNumber(rawX), toNumber(rawY), toNumber(rawZ));
        }
-        
+
        return null;
    }

@@ -79,7 +81,7 @@ public class VectorFlag extends Flag<Vector> {
        vec.put("z", o.getZ());
        return vec;
    }
-    
+
    private double toNumber(Object o) {
        if (o instanceof Integer) {
            return (Integer) o;
@@ -19,23 +19,24 @@
 package com.sk89q.worldguard.protection.managers;

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

 /**
 * A very simple implementation of the region manager that uses a flat list
 * and iterates through the list to identify applicable regions. This method
 * is not very efficient.
- * 
+ *
 * @author sk89q
 */
 public class FlatRegionManager extends RegionManager {
@@ -47,8 +48,8 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Construct the manager.
-     * 
-     * @param regionloader 
+     *
+     * @param regionloader
     */
    public FlatRegionManager(ProtectionDatabase regionloader) {
        super(regionloader);
@@ -75,7 +76,7 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Adds a region.
-     * 
+     *
     * @param region
     */
    @Override
@@ -85,7 +86,7 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Removes a region and its children.
-     * 
+     *
     * @param id
     */
    @Override
@@ -111,7 +112,7 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Return whether a region exists by an ID.
-     * 
+     *
     * @param id
     * @return
     */
@@ -122,7 +123,7 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Get a region by its ID.
-     * 
+     *
     * @param id
     */
    @Override
@@ -132,7 +133,7 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Get an object for a point for rules to be applied with.
-     * 
+     *
     * @param pt
     * @return
     */
@@ -144,16 +145,16 @@ public class FlatRegionManager extends RegionManager {
        for (ProtectedRegion region : regions.values()) {
            if (region.contains(pt)) {
                appRegions.add(region);
-                
+
                ProtectedRegion parent = region.getParent();
-                
+
                while (parent != null) {
                    if (!appRegions.contains(parent)) {
                        appRegions.add(region);
                    }
-                    
+
                    parent = parent.getParent();
-                }       
+                }
            }
        }

@@ -183,7 +184,7 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Get a list of region IDs that contain a point.
-     * 
+     *
     * @param pt
     * @return
     */
@@ -202,7 +203,7 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Get an object for a region for rules to be applied with.
-     * 
+     *
     * @return
     */
    @Override
@@ -212,7 +213,7 @@ public class FlatRegionManager extends RegionManager {
        appRegions.addAll(regions.values());

        List<ProtectedRegion> intersectRegions;
-        
+
        try {
            intersectRegions = checkRegion.getIntersectingRegions(appRegions);
        } catch (Exception e) {
@@ -225,7 +226,7 @@ public class FlatRegionManager extends RegionManager {
    /**
     * Returns true if the provided region overlaps with any other region that
     * is not owned by the player.
-     * 
+     *
     * @param player
     * @return
     */
@@ -253,7 +254,7 @@ public class FlatRegionManager extends RegionManager {

    /**
     * Get the number of regions.
-     * 
+     *
     * @return
     */
    @Override
@@ -18,21 +18,23 @@
 */
 package com.sk89q.worldguard.protection.managers;

+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+
 import org.khelekore.prtree.MBRConverter;
 import org.khelekore.prtree.PRTree;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegionMBRConverter;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
-import java.io.IOException;
-import java.util.Iterator;

 public class PRTreeRegionManager extends RegionManager {

@@ -52,9 +54,9 @@ public class PRTreeRegionManager extends RegionManager {

    /**
     * Construct the manager.
-     * 
-     * @param regionloader 
-     * @throws IOException 
+     *
+     * @param regionloader
+     * @throws IOException
     */
    public PRTreeRegionManager(ProtectionDatabase regionloader) throws IOException {
        super(regionloader);
@@ -85,7 +87,7 @@ public class PRTreeRegionManager extends RegionManager {

    /**
     * Adds a region.
-     * 
+     *
     * @param region
     */
    @Override
@@ -97,7 +99,7 @@ public class PRTreeRegionManager extends RegionManager {

    /**
     * Return whether a region exists by an ID.
-     * 
+     *
     * @param id
     * @return
     */
@@ -108,7 +110,7 @@ public class PRTreeRegionManager extends RegionManager {

    /**
     * Get a region by its ID.
-     * 
+     *
     * @param id
     */
    @Override
@@ -118,7 +120,7 @@ public class PRTreeRegionManager extends RegionManager {

    /**
     * Removes a region and its children.
-     * 
+     *
     * @param id
     */
    @Override
@@ -148,7 +150,7 @@ public class PRTreeRegionManager extends RegionManager {

    /**
     * Get an object for a point for rules to be applied with.
-     * 
+     *
     * @param pt
     * @return
     */
@@ -165,7 +167,7 @@ public class PRTreeRegionManager extends RegionManager {
                appRegions.add(region);
            }
        }
-        
+
        Collections.sort(appRegions);

        return new ApplicableRegionSet(appRegions, regions.get("__global__"));
@@ -188,7 +190,7 @@ public class PRTreeRegionManager extends RegionManager {

    /**
     * Get a list of region IDs that contain a point.
-     * 
+     *
     * @param pt
     * @return
     */
@@ -211,7 +213,7 @@ public class PRTreeRegionManager extends RegionManager {
    /**
     * Returns true if the provided region overlaps with any other region that
     * is not owned by the player.
-     * 
+     *
     * @param player
     * @return
     */
@@ -239,7 +241,7 @@ public class PRTreeRegionManager extends RegionManager {

    /**
     * Get the number of regions.
-     * 
+     *
     * @return
     */
    @Override
@@ -22,6 +22,7 @@ package com.sk89q.worldguard.protection.managers;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
@@ -33,16 +34,16 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 * simple implementation uses a flat list and iterates through the entire list
 * to look for applicable regions, but a more complicated (and more efficient)
 * implementation may use space partitioning techniques.
- * 
+ *
 * @author sk89q
 */
 public abstract class RegionManager {
-    
+
    protected ProtectionDatabase loader;

    /**
     * Construct the object.
-     * 
+     *
     * @param loader
     */
    public RegionManager(ProtectionDatabase loader) {
@@ -71,7 +72,7 @@ public abstract class RegionManager {
    /**
     * Get a map of protected regions. Use one of the region manager methods
     * if possible if working with regions.
-     * 
+     *
     * @return map of regions, with keys being region IDs (lowercase)
     */
    public abstract Map<String, ProtectedRegion> getRegions();
@@ -79,7 +80,7 @@ public abstract class RegionManager {
    /**
     * Set a list of protected regions. Keys should be lowercase in the given
     * map fo regions.
-     * 
+     *
     * @param regions map of regions
     */
    public abstract void setRegions(Map<String, ProtectedRegion> regions);
@@ -87,14 +88,14 @@ public abstract class RegionManager {
    /**
     * Adds a region. If a region by the given name already exists, then
     * the existing region will be replaced.
-     * 
+     *
     * @param region region to add
     */
    public abstract void addRegion(ProtectedRegion region);

    /**
     * Return whether a region exists by an ID.
-     * 
+     *
     * @param id id of the region, can be mixed-case
     * @return whether the region exists
     */
@@ -102,7 +103,7 @@ public abstract class RegionManager {

    /**
     * Get a region by its ID.
-     * 
+     *
     * @param id id of the region, can be mixed-case
     * @return region or null if it doesn't exist
     */
@@ -110,16 +111,26 @@ public abstract class RegionManager {

    /**
     * Removes a region, including inheriting children.
-     * 
+     *
     * @param id id of the region, can be mixed-case
     */
    public abstract void removeRegion(String id);

    /**
-     * Get an object for a point for rules to be applied with. Use this
-     * in order to query for flag data or membership data for a given
-     * point.
-     * 
+     * Get an object for a point for rules to be applied with. Use this in order
+     * to query for flag data or membership data for a given point.
+     *
+     * @param loc Bukkit location
+     * @return applicable region set
+     */
+    public ApplicableRegionSet getApplicableRegions(org.bukkit.Location loc) {
+        return getApplicableRegions(com.sk89q.worldedit.bukkit.BukkitUtil.toVector(loc));
+    }
+
+    /**
+     * Get an object for a point for rules to be applied with. Use this in order
+     * to query for flag data or membership data for a given point.
+     *
     * @param pt point
     * @return applicable region set
     */
@@ -129,17 +140,15 @@ public abstract class RegionManager {
     * Get an object for a point for rules to be applied with. This gets
     * a set for the given reason.
     *
-     * @deprecated not yet fully supported
     * @param region region
     * @return regino set
     */
-    @Deprecated
    public abstract ApplicableRegionSet getApplicableRegions(
            ProtectedRegion region);

    /**
     * Get a list of region IDs that contain a point.
-     * 
+     *
     * @param pt point
     * @return list of region Ids
     */
@@ -148,7 +157,7 @@ public abstract class RegionManager {
    /**
     * Returns true if the provided region overlaps with any other region that
     * is not owned by the player.
-     * 
+     *
     * @param region region to check
     * @param player player to check against
     * @return whether there is an overlap
@@ -21,7 +21,9 @@ package com.sk89q.worldguard.protection.regions;

 import java.util.ArrayList;
 import java.util.List;
+
 import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.protection.UnsupportedIntersectionException;

@@ -29,16 +31,14 @@ public class GlobalProtectedRegion extends ProtectedRegion {

    public GlobalProtectedRegion(String id) {
        super(id);
+        min = new BlockVector(0, 0, 0);
+        max = new BlockVector(0, 0, 0);
    }

-    @Override
-    public BlockVector getMinimumPoint() {
-        return new BlockVector(0, 0, 0);
-    }
-
-    @Override
-    public BlockVector getMaximumPoint() {
-        return new BlockVector(0, 0, 0);
+    public List<BlockVector2D> getPoints() {
+        List<BlockVector2D> pts = new ArrayList<BlockVector2D>();
+        pts.add(new BlockVector2D(min.getBlockX(),min.getBlockZ()));
+        return pts;
    }

    @Override
@@ -18,11 +18,14 @@
 */
 package com.sk89q.worldguard.protection.regions;

-import com.sk89q.worldedit.*;
-import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
 import java.util.ArrayList;
 import java.util.List;

+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
+
 /**
 * Represents a cuboid region that can be protected.
 *
@@ -30,36 +33,29 @@ import java.util.List;
 */
 public class ProtectedCuboidRegion extends ProtectedRegion {

-    /**
-     * Store the first point.
-     */
-    private BlockVector min;
-    /**
-     * Store the second point.
-     */
-    private BlockVector max;
-
    /**
     * Construct a new instance of this cuboid region.
     *
     * @param id
-     * @param min 
-     * @param max 
+     * @param pt1
+     * @param pt2
     */
-    public ProtectedCuboidRegion(String id, BlockVector min, BlockVector max) {
+    public ProtectedCuboidRegion(String id, BlockVector pt1, BlockVector pt2) {
        super(id);
-        this.min = min;
-        this.max = max;
+        setMinMaxPoints(pt1, pt2);
    }

    /**
-     * Get the lower point of the cuboid.
+     * Given any two points, sets the minimum and maximum points
     *
-     * @return min point
+     * @param pt1
+     * @param pt2
     */
-    @Override
-    public BlockVector getMinimumPoint() {
-        return min;
+    private void setMinMaxPoints(BlockVector pt1, BlockVector pt2) {
+        List<Vector> points = new ArrayList<Vector>();
+        points.add(pt1);
+        points.add(pt2);
+        setMinMaxPoints(points);
    }

    /**
@@ -68,17 +64,7 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
     * @param pt
     */
    public void setMinimumPoint(BlockVector pt) {
-        min = pt;
-    }
-
-    /**
-     * Get the upper point of the cuboid.
-     *
-     * @return max point
-     */
-    @Override
-    public BlockVector getMaximumPoint() {
-        return max;
+        setMinMaxPoints(pt, max);
    }

    /**
@@ -87,7 +73,22 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
     * @param pt
     */
    public void setMaximumPoint(BlockVector pt) {
-        max = pt;
+        setMinMaxPoints(min, pt);
+    }
+
+    public List<BlockVector2D> getPoints() {
+        List<BlockVector2D> pts = new ArrayList<BlockVector2D>();
+        int x1 = min.getBlockX();
+        int x2 = max.getBlockX();
+        int z1 = min.getBlockZ();
+        int z2 = max.getBlockZ();
+
+        pts.add(new BlockVector2D(x1, z1));
+        pts.add(new BlockVector2D(x2, z1));
+        pts.add(new BlockVector2D(x1, z2));
+        pts.add(new BlockVector2D(x2, z2));
+
+        return pts;
    }

    /**
@@ -95,18 +96,18 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
     */
    @Override
    public boolean contains(Vector pt) {
-        int x = pt.getBlockX();
-        int y = pt.getBlockY();
-        int z = pt.getBlockZ();
-        return x >= min.getBlockX() && x <= max.getBlockX()
-                && y >= min.getBlockY() && y <= max.getBlockY()
-                && z >= min.getBlockZ() && z <= max.getBlockZ();
+        final double x = pt.getX();
+        final double y = pt.getY();
+        final double z = pt.getZ();
+        return x >= min.getBlockX() && x < max.getBlockX()+1
+                && y >= min.getBlockY() && y < max.getBlockY()+1
+                && z >= min.getBlockZ() && z < max.getBlockZ()+1;
    }


    /*
    public boolean intersectsWith(ProtectedRegion region) throws UnsupportedIntersectionException {
-        
+
        if (region instanceof ProtectedCuboidRegion) {
            ProtectedCuboidRegion r1 = (ProtectedCuboidRegion) this;
            ProtectedCuboidRegion r2 = (ProtectedCuboidRegion) region;
@@ -131,131 +132,35 @@ public class ProtectedCuboidRegion extends ProtectedRegion {

    @Override
    public List<ProtectedRegion> getIntersectingRegions(List<ProtectedRegion> regions) throws UnsupportedIntersectionException {
-        int numRegions = regions.size();
        List<ProtectedRegion> intersectingRegions = new ArrayList<ProtectedRegion>();
-        int i, i2, i3;

-        for (i = 0; i < numRegions; i++) {
-            ProtectedRegion region = regions.get(i);
-            BlockVector rMinPoint = region.getMinimumPoint();
-            BlockVector rMaxPoint = region.getMaximumPoint();
+        for (ProtectedRegion region : regions) {
+            if (!intersectsBoundingBox(region)) continue;

-            // Check whether the region is outside the min and max vector
-            if ((rMinPoint.getBlockX() < min.getBlockX() && rMaxPoint.getBlockX() < min.getBlockX()) 
-                            || (rMinPoint.getBlockX() > max.getBlockX() && rMaxPoint.getBlockX() > max.getBlockX())
-                    && ((rMinPoint.getBlockY() < min.getBlockY() && rMaxPoint.getBlockY() < min.getBlockY())
-                            || (rMinPoint.getBlockY() > max.getBlockY() && rMaxPoint.getBlockY() > max.getBlockY()))
-                    && ((rMinPoint.getBlockZ() < min.getBlockZ() && rMaxPoint.getBlockZ() < min.getBlockZ())
-                            || (rMinPoint.getBlockZ() > max.getBlockZ() && rMaxPoint.getBlockZ() > max.getBlockZ())) ) {
-                //intersectingRegions.add(regions.get(i));
+            // If both regions are Cuboids and their bounding boxes intersect, they intersect
+            if (region instanceof ProtectedCuboidRegion) {
+                intersectingRegions.add(region);
                continue;
-            }
-
-            // Check whether the regions points are inside the other region
-            if (region.contains(new Vector(min.getBlockX(), min.getBlockY(), min.getBlockZ()))
-                    || region.contains(new Vector(min.getBlockX(), min.getBlockY(), max.getBlockZ()))
-                    || region.contains(new Vector(min.getBlockX(), max.getBlockY(), max.getBlockZ()))
-                    || region.contains(new Vector(min.getBlockX(), max.getBlockY(), min.getBlockZ()))
-                    || region.contains(new Vector(max.getBlockX(), max.getBlockY(), max.getBlockZ()))
-                    || region.contains(new Vector(max.getBlockX(), max.getBlockY(), min.getBlockZ()))
-                    || region.contains(new Vector(max.getBlockX(), min.getBlockY(), min.getBlockZ()))
-                    || region.contains(new Vector(max.getBlockX(), min.getBlockY(), max.getBlockZ())) ) {
-                intersectingRegions.add(regions.get(i));
-                continue;
-            }
-
-            // Check whether the other regions points are inside the current region
-            if (region instanceof ProtectedPolygonalRegion) {
-                for (i2 = 0; i2 < ((ProtectedPolygonalRegion)region).getPoints().size(); i2++) {
-                    BlockVector2D pt2Dr = ((ProtectedPolygonalRegion)region).getPoints().get(i2);
-                    int minYr = ((ProtectedPolygonalRegion)region).minY;
-                    int maxYr = ((ProtectedPolygonalRegion)region).maxY;
-                    Vector ptr = new Vector(pt2Dr.getBlockX(), minYr, pt2Dr.getBlockZ());
-                    Vector ptr2 = new Vector(pt2Dr.getBlockX(), maxYr, pt2Dr.getBlockZ());
-
-                    if (this.contains(ptr) || this.contains(ptr2)) {
-                        intersectingRegions.add(regions.get(i));
-                        continue;
-                    }
-                }
-            } else if (region instanceof ProtectedCuboidRegion) {
-                BlockVector ptcMin = region.getMinimumPoint(); 
-                BlockVector ptcMax = region.getMaximumPoint();
-
-                if (this.contains(new Vector(ptcMin.getBlockX(), ptcMin.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMin.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMax.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMax.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMax.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMax.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMin.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMin.getBlockY(), ptcMax.getBlockZ())) ) {
-                    intersectingRegions.add(regions.get(i));
+            } else if (region instanceof ProtectedPolygonalRegion) {
+                // If either region contains the points of the other,
+                // or if any edges intersect, the regions intersect
+                if (containsAny(region.getPoints())
+                        || region.containsAny(getPoints())
+                        || intersectsEdges(region)) {
+                    intersectingRegions.add(region);
                    continue;
                }
            } else {
-                throw new UnsupportedOperationException("Not supported yet."); 
-            }
-
-            // Check whether the current regions edges collide with the regions edges
-            boolean regionIsIntersecting = false;
-            List<BlockVector2D> points = new ArrayList<BlockVector2D>();
-            points.add(new BlockVector2D(min.getBlockX(), min.getBlockZ()));
-            points.add(new BlockVector2D(min.getBlockX(), max.getBlockZ()));
-            points.add(new BlockVector2D(max.getBlockX(), max.getBlockZ()));
-            points.add(new BlockVector2D(max.getBlockX(), min.getBlockZ()));
-
-            for (i2 = 0; i2 < points.size(); i2++) {
-                boolean checkNextPoint = false;
-                BlockVector2D currPoint = points.get(i2);
-                BlockVector2D nextPoint;
-
-                if (i2 == (points.size() - 1)) {
-                    nextPoint = points.get(0);
-                } else {
-                    nextPoint = points.get(i2 + 1);
-                }
-
-                int currX = currPoint.getBlockX();
-                int currZ = currPoint.getBlockZ();
-                while (!checkNextPoint) {
-                    for(i3 = min.getBlockY(); i3 <= max.getBlockY(); i3++) {
-                        if (region.contains(new Vector(currX, i3, currZ))) {
-                            intersectingRegions.add(regions.get(i));
-                            regionIsIntersecting = true;
-                            break;
-                        }
-                    }
-
-                    if (currX == nextPoint.getBlockX() || currZ == nextPoint.getBlockZ() || regionIsIntersecting) {
-                        checkNextPoint = true;
-                    }
-
-                    if (nextPoint.getBlockX() > currPoint.getBlockX()) {
-                        currX++;
-                    } else {
-                        currX--;
-                    }
-                    if (nextPoint.getBlockZ() > currPoint.getBlockZ()) {
-                        currZ++;
-                    } else {
-                        currZ--;
-                    }
-                }
-
-                if (regionIsIntersecting) {
-                    break;
-                }
+                throw new UnsupportedOperationException("Not supported yet.");
            }
        }
-
        return intersectingRegions;
    }


    /**
     * Return the type of region as a user-friendly name.
-     * 
+     *
     * @return type of region
     */
    @Override
@@ -265,7 +170,7 @@ public class ProtectedCuboidRegion extends ProtectedRegion {

    /**
     * Get the number of Blocks in this region
-     * 
+     *
     * @return
     */
    @Override
@@ -277,6 +182,4 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
        int volume = xLength * yLength * zLength;
        return volume;
    }
-
-
-}
+}
@@ -18,9 +18,9 @@
 */
 package com.sk89q.worldguard.protection.regions;

-import java.util.List;
 import java.util.ArrayList;
-import com.sk89q.worldedit.BlockVector;
+import java.util.List;
+
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
@@ -30,55 +30,36 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
    protected List<BlockVector2D> points;
    protected int minY;
    protected int maxY;
-    private BlockVector min;
-    private BlockVector max;

    public ProtectedPolygonalRegion(String id, List<BlockVector2D> points, int minY, int maxY) {
        super(id);
        this.points = points;
-        this.minY = minY;
-        this.maxY = maxY;
+        setMinMaxPoints(points, minY, maxY);
+        this.minY = min.getBlockY();
+        this.maxY = max.getBlockY();
+    }

-        int minX = points.get(0).getBlockX();
-        int minZ = points.get(0).getBlockZ();
-        int maxX = points.get(0).getBlockX();
-        int maxZ = points.get(0).getBlockZ();
-
-        for (BlockVector2D v : points) {
-            int x = v.getBlockX();
-            int z = v.getBlockZ();
-            if (x < minX) {
-                minX = x;
-            }
-            if (z < minZ) {
-                minZ = z;
-            }
-            if (x > maxX) {
-                maxX = x;
-            }
-            if (z > maxZ) {
-                maxZ = z;
-            }
+    /**
+     * Sets the min and max points from all the 2d points and the min/max Y values
+     *
+     * @param points2D
+     * @param minY
+     * @param maxY
+     */
+    private void setMinMaxPoints(List<BlockVector2D> points2D, int minY, int maxY) {
+        List<Vector> points = new ArrayList<Vector>();
+        int y = minY;
+        for (BlockVector2D point2D : points2D) {
+            points.add(new Vector(point2D.getBlockX(), y, point2D.getBlockZ()));
+            y = maxY;
        }
-
-        min = new BlockVector(minX, minY, minZ);
-        max = new BlockVector(maxX, maxY, maxZ);
+        setMinMaxPoints(points);
    }

    public List<BlockVector2D> getPoints() {
        return points;
    }

-    @Override
-    public BlockVector getMinimumPoint() {
-        return min;
-    }
-
-    @Override
-    public BlockVector getMaximumPoint() {
-        return max;
-    }
-
    /**
     * Checks to see if a point is inside this region.
     */
@@ -101,6 +82,7 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
        int xOld, zOld;
        int x1, z1;
        int x2, z2;
+        long crossproduct;
        int i;

        xOld = points.get(npoints - 1).getBlockX();
@@ -124,10 +106,14 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
                z1 = zNew;
                z2 = zOld;
            }
-            if ((xNew < targetX) == (targetX <= xOld)
-                    && ((long) targetZ - (long) z1) * (long) (x2 - x1) <= ((long) z2 - (long) z1)
-                    * (long) (targetX - x1)) {
-                inside = !inside;
+            if (x1 <= targetX && targetX <= x2) {
+                crossproduct = ((long) targetZ - (long) z1) * (long) (x2 - x1)
+                    - ((long) z2 - (long) z1) * (long) (targetX - x1);
+                if (crossproduct == 0) {
+                    if ((z1 <= targetZ) == (targetZ <= z2)) return true; // on edge
+                } else if (crossproduct < 0 && (x1 != targetX)) {
+                    inside = !inside;
+                }
            }
            xOld = xNew;
            zOld = zNew;
@@ -138,124 +124,31 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {

    @Override
    public List<ProtectedRegion> getIntersectingRegions(List<ProtectedRegion> regions) throws UnsupportedIntersectionException {
-        int numRegions = regions.size();
-        int numPoints = points.size();
        List<ProtectedRegion> intersectingRegions = new ArrayList<ProtectedRegion>();
-        int i, i2, i3;

-        for (i = 0; i < numRegions; i++) {
-            ProtectedRegion region = regions.get(i);
-            BlockVector rMinPoint = region.getMinimumPoint();
-            BlockVector rMaxPoint = region.getMaximumPoint();
+        for (ProtectedRegion region : regions) {
+            if (!intersectsBoundingBox(region)) continue;

-            // Check whether the region is outside the min and max vector
-            if ((rMinPoint.getBlockX() < min.getBlockX() && rMaxPoint.getBlockX() < min.getBlockX()) 
-                            || (rMinPoint.getBlockX() > max.getBlockX() && rMaxPoint.getBlockX() > max.getBlockX())
-                    && ((rMinPoint.getBlockY() < min.getBlockY() && rMaxPoint.getBlockY() < min.getBlockY())
-                            || (rMinPoint.getBlockY() > max.getBlockY() && rMaxPoint.getBlockY() > max.getBlockY()))
-                    && ((rMinPoint.getBlockZ() < min.getBlockZ() && rMaxPoint.getBlockZ() < min.getBlockZ())
-                            || (rMinPoint.getBlockZ() > max.getBlockZ() && rMaxPoint.getBlockZ() > max.getBlockZ())) ) {
-                intersectingRegions.add(regions.get(i));
-                continue;
-            }
-
-            // Check whether the regions points are inside the other region
-            for (i2 = 0; i < numPoints; i++) {
-                Vector pt = new Vector(points.get(i2).getBlockX(), minY, points.get(i2).getBlockZ());
-                Vector pt2 = new Vector(points.get(i2).getBlockX(), maxY, points.get(i2).getBlockZ());
-                if (region.contains(pt) || region.contains(pt2)) {
-                    intersectingRegions.add(regions.get(i));
-                    continue;
-                }
-            }
-
-            // Check whether the other regions points are inside the current region
-            if (region instanceof ProtectedPolygonalRegion) {
-                for (i2 = 0; i < ((ProtectedPolygonalRegion)region).getPoints().size(); i++) {
-                    BlockVector2D pt2Dr = ((ProtectedPolygonalRegion)region).getPoints().get(i2);
-                    int minYr = ((ProtectedPolygonalRegion)region).minY;
-                    int maxYr = ((ProtectedPolygonalRegion)region).maxY;
-                    Vector ptr = new Vector(pt2Dr.getBlockX(), minYr, pt2Dr.getBlockZ());
-                    Vector ptr2 = new Vector(pt2Dr.getBlockX(), maxYr, pt2Dr.getBlockZ());
-
-                    if (this.contains(ptr) || this.contains(ptr2)) {
-                        intersectingRegions.add(regions.get(i));
-                        continue;
-                    }
-                }
-            } else if (region instanceof ProtectedCuboidRegion) {
-                BlockVector ptcMin = region.getMinimumPoint(); 
-                BlockVector ptcMax = region.getMaximumPoint();
-
-                if (this.contains(new Vector(ptcMin.getBlockX(), ptcMin.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMin.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMax.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMin.getBlockX(), ptcMax.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMax.getBlockY(), ptcMax.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMax.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMin.getBlockY(), ptcMin.getBlockZ()))
-                        || this.contains(new Vector(ptcMax.getBlockX(), ptcMin.getBlockY(), ptcMax.getBlockZ())) ) {
-                    intersectingRegions.add(regions.get(i));
+            if (region instanceof ProtectedPolygonalRegion || region instanceof ProtectedCuboidRegion) {
+                // If either region contains the points of the other,
+                // or if any edges intersect, the regions intersect
+                if (containsAny(region.getPoints())
+                        || region.containsAny(getPoints())
+                        || intersectsEdges(region)) {
+                    intersectingRegions.add(region);
                    continue;
                }
            } else {
-                throw new UnsupportedOperationException("Not supported yet."); 
-            }
-
-            // Check whether the current regions edges collide with the regions edges
-            boolean regionIsIntersecting = false;
-            for (i2 = 0; i2 < numPoints; i2++) {
-                boolean checkNextPoint = false;
-                BlockVector2D currPoint = points.get(i2);
-                BlockVector2D nextPoint;
-
-                if (i2 == (numPoints - 1)) {
-                    nextPoint = points.get(0);
-                } else {
-                    nextPoint = points.get(i2 + 1);
-                }
-
-                int currX = currPoint.getBlockX();
-                int currZ = currPoint.getBlockZ();
-
-                while (!checkNextPoint) {
-                    for(i3 = this.minY; i3 <= this.maxY; i3++) {
-                        if (region.contains(new Vector(currX, i3, currZ))) {
-                            intersectingRegions.add(regions.get(i));
-                            regionIsIntersecting = true;
-                            break;
-                        }
-                    }
-
-                    if (currX == nextPoint.getBlockX() || currZ == nextPoint.getBlockZ() || regionIsIntersecting) {
-                        checkNextPoint = true;
-                    }
-
-                    if (nextPoint.getBlockX() > currPoint.getBlockX()) {
-                        currX++;
-                    } else {
-                        currX--;
-                    }
-                    if (nextPoint.getBlockZ() > currPoint.getBlockZ()) {
-                        currZ++;
-                    } else {
-                        currZ--;
-                    }
-                }
-
-                if (regionIsIntersecting) {
-                    break;
-                }
+                throw new UnsupportedOperationException("Not supported yet.");
            }
        }
-
        return intersectingRegions;
    }


    /**
     * Return the type of region as a user-friendly name.
-     * 
+     *
     * @return type of region
     */
    @Override
@@ -265,13 +158,14 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {

    /**
     * Get the number of Blocks in this region
-     * 
+     *
     * @return
     */
    @Override
    public int volume() {
        int volume = 0;
-        int numPoints = points.size();
+        // TODO: Fix this
+        /*int numPoints = points.size();
        if (numPoints < 3) {
            return 0;
        }
@@ -279,7 +173,7 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
        double area = 0;
        int xa, z1, z2;

-        for (int i = 0; i <= numPoints - 1; i++) {
+        for (int i = 0; i < numPoints; i++) {
            xa = points.get(i).getBlockX();
            //za = points.get(i).getBlockZ();

@@ -302,7 +196,7 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {

        area = area + (xa * (points.get(1).getBlockZ() - points.get(numPoints - 1).getBlockZ()));

-        volume = (Math.abs(maxY - minY) + 1) * (int) Math.ceil((Math.abs(area) / 2));
+        volume = (Math.abs(maxY - minY) + 1) * (int) Math.ceil((Math.abs(area) / 2));*/

        return volume;
    }
@@ -19,51 +19,57 @@

 package com.sk89q.worldguard.protection.regions;

-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
-import com.sk89q.worldguard.protection.flags.Flag;
+import java.awt.geom.Line2D;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;

+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
+import com.sk89q.worldguard.protection.flags.Flag;
+
 /**
 * Represents a region of any shape and size that can be protected.
- * 
+ *
 * @author sk89q
 */
 public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
-    
+
+    protected BlockVector min;
+    protected BlockVector max;
+
    private static final Pattern idPattern = Pattern.compile("^[A-Za-z0-9_,'\\-\\+/]{1,}$");
-    
+
    /**
     * Holds the region's ID.
     */
    private String id;
-    
+
    /**
     * Priority.
     */
    private int priority = 0;
-    
+
    /**
     * Holds the curParent.
     */
    private ProtectedRegion parent;
-    
+
    /**
     * List of owners.
     */
    private DefaultDomain owners = new DefaultDomain();
-    
+
    /**
     * List of members.
     */
    private DefaultDomain members = new DefaultDomain();
-    
+
    /**
     * List of flags.
     */
@@ -78,6 +84,37 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
        this.id = id;
    }

+    /**
+     * Sets the minimum and maximum points of the bounding box for a region
+     *
+     * @param points
+     */
+    protected void setMinMaxPoints(List<Vector> points) {
+        int minX = points.get(0).getBlockX();
+        int minY = points.get(0).getBlockY();
+        int minZ = points.get(0).getBlockZ();
+        int maxX = minX;
+        int maxY = minY;
+        int maxZ = minZ;
+
+        for (Vector v : points) {
+            int x = v.getBlockX();
+            int y = v.getBlockY();
+            int z = v.getBlockZ();
+
+            if (x < minX) minX = x;
+            if (y < minY) minY = y;
+            if (z < minZ) minZ = z;
+
+            if (x > maxX) maxX = x;
+            if (y > maxY) maxY = y;
+            if (z > maxZ) maxZ = z;
+        }
+        
+        min = new BlockVector(minX, minY, minZ);
+        max = new BlockVector(maxX, maxY, maxZ);
+    }
+
    /**
     * @return the id
     */
@@ -90,14 +127,18 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
     *
     * @return min point
     */
-    public abstract BlockVector getMinimumPoint();
+    public BlockVector getMinimumPoint() {
+        return min;
+    }

    /**
     * Get the upper point of the cuboid.
     *
     * @return max point
     */
-    public abstract BlockVector getMaximumPoint();
+    public BlockVector getMaximumPoint() {
+        return max;
+    }

    /**
     * @return the priority
@@ -112,7 +153,7 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
    public void setPriority(int priority) {
        this.priority = priority;
    }
-    
+
    /**
     * @return the curParent
     */
@@ -123,20 +164,20 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
    /**
     * Set the curParent. This checks to make sure that it will not result
     * in circular inheritance.
-     * 
+     *
     * @param parent the curParent to setFlag
-     * @throws CircularInheritanceException 
+     * @throws CircularInheritanceException
     */
    public void setParent(ProtectedRegion parent) throws CircularInheritanceException {
        if (parent == null) {
            this.parent = null;
            return;
        }
-        
+
        if (parent == this) {
            throw new CircularInheritanceException();
        }
-        
+
        ProtectedRegion p = parent.getParent();
        while (p != null) {
            if (p == this) {
@@ -144,7 +185,7 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
            }
            p = p.getParent();
        }
-        
+
        this.parent = parent;
    }

@@ -180,16 +221,16 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {

    /**
     * Checks whether a region has members or owners.
-     * 
+     *
     * @return whether there are members or owners
     */
    public boolean hasMembersOrOwners() {
        return owners.size() > 0 || members.size() > 0;
    }
-    
+
    /**
     * Checks whether a player is an owner of region or any of its parents.
-     * 
+     *
     * @param player player to check
     * @return whether an owner
     */
@@ -197,23 +238,23 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
        if (owners.contains(player)) {
            return true;
        }
-        
+
        ProtectedRegion curParent = getParent();
        while (curParent != null) {
            if (curParent.getOwners().contains(player)) {
                return true;
            }
-            
+
            curParent = curParent.getParent();
        }
-        
+
        return false;
    }

    /**
     * Checks whether a player is a member OR OWNER of the region
     * or any of its parents.
-     * 
+     *
     * @param player player to check
     * @return whether an owner or member
     */
@@ -221,17 +262,17 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
        if (owners.contains(player) || members.contains(player)) {
            return true;
        }
-        
+
        ProtectedRegion curParent = getParent();
        while (curParent != null) {
            if (curParent.getOwners().contains(player)
                    || curParent.getMembers().contains(player)) {
                return true;
            }
-            
+
            curParent = curParent.getParent();
        }
-        
+
        return false;
    }

@@ -258,10 +299,10 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {

        return false;
    }
-    
+
    /**
     * Get a flag's value.
-     * 
+     *
     * @param <T>
     * @param <V>
     * @param flag
@@ -278,10 +319,10 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
        }
        return val;
    }
-    
+
    /**
     * Set a flag's value.
-     * 
+     *
     * @param <T>
     * @param <V>
     * @param flag
@@ -294,43 +335,87 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
            flags.put(flag, val);
        }
    }
-    
+
    /**
     * Get the map of flags.
-     * 
+     *
     * @return
     */
    public Map<Flag<?>, Object> getFlags() {
        return flags;
    }
-    
+
    /**
     * Get the map of flags.
-     * 
-     * @param flags 
+     *
+     * @param flags
     */
    public void setFlags(Map<Flag<?>, Object> flags) {
        this.flags = flags;
    }

+    /**
+     * Gets the 2D points for this region
+     *
+     * @return
+     */
+    public abstract List<BlockVector2D> getPoints();
+
    /**
     * Get the number of blocks in this region
-     * 
+     *
     * @return
     */
    public abstract int volume();
-    
+
    /**
     * Check to see if a point is inside this region.
-     * 
+     *
     * @param pt
     * @return
     */
    public abstract boolean contains(Vector pt);
-    
+
+    /**
+     * Check to see if a point is inside this region.
+     *
+     * @param pt
+     * @return
+     */
+    public boolean contains(BlockVector2D pt) {
+        return contains(new Vector(pt.getBlockX(), min.getBlockY(), pt.getBlockZ()));
+    }
+
+    /**
+     * Check to see if a point is inside this region.
+     *
+     * @param x
+     * @param y
+     * @param z
+     * @return
+     */
+    public boolean contains(int x, int y, int z) {
+        return contains(new Vector(x, y, z));
+    }
+
+    /**
+     * Check to see if any of the 2D points are inside this region.
+     *
+     * @param pts
+     * @return
+     */
+    public boolean containsAny(List<BlockVector2D> pts) {
+        for (BlockVector2D pt : pts) {
+            if (contains(pt)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
    /**
     * Compares to another region.
-     * 
+     *
     * @param other
     * @return
     */
@@ -348,14 +433,14 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {

    /**
     * Return the type of region as a user-friendly, lowercase name.
-     * 
+     *
     * @return type of region
     */
    public abstract String getTypeName();

    /**
     * Get a list of intersecting regions.
-     * 
+     *
     * @param regions
     * @return
     * @throws UnsupportedIntersectionException
@@ -363,17 +448,75 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
    public abstract List<ProtectedRegion> getIntersectingRegions(
            List<ProtectedRegion> regions)
            throws UnsupportedIntersectionException;
-    
+
+    /**
+     * Checks if the bounding box of a region intersects with with the bounding
+     * box of this region
+     *
+     * @param region
+     */
+    protected boolean intersectsBoundingBox(ProtectedRegion region) {
+        BlockVector rMaxPoint = region.getMaximumPoint();
+        BlockVector min = getMinimumPoint();
+
+        if (rMaxPoint.getBlockX() < min.getBlockX()) return false;
+        if (rMaxPoint.getBlockY() < min.getBlockY()) return false;
+        if (rMaxPoint.getBlockZ() < min.getBlockZ()) return false;
+
+        BlockVector rMinPoint = region.getMinimumPoint();
+        BlockVector max = getMaximumPoint();
+
+        if (rMinPoint.getBlockX() > max.getBlockX()) return false;
+        if (rMinPoint.getBlockY() > max.getBlockY()) return false;
+        if (rMinPoint.getBlockZ() > max.getBlockZ()) return false;
+
+        return true;
+    }
+
+    /**
+     * Compares all edges of two regions to see if any of them intersect
+     *
+     * @param region
+     * @return
+     */
+    protected boolean intersectsEdges(ProtectedRegion region) {
+        List<BlockVector2D> pts1 = getPoints();
+        List<BlockVector2D> pts2 = region.getPoints();
+        BlockVector2D lastPt1 = pts1.get(pts1.size() - 1);
+        BlockVector2D lastPt2 = pts2.get(pts2.size() - 1);
+        for (int i = 0; i < pts1.size(); i++ ) {
+            for (int j = 0; j < pts2.size(); j++) {
+
+                Line2D line1 = new Line2D.Double(
+                        lastPt1.getBlockX(),
+                        lastPt1.getBlockZ(),
+                        pts1.get(i).getBlockX(),
+                        pts1.get(i).getBlockZ());
+
+                if (line1.intersectsLine(
+                                lastPt2.getBlockX(),
+                                lastPt2.getBlockZ(),
+                                pts2.get(j).getBlockX(),
+                                pts2.get(j).getBlockZ())) {
+                    return true;
+                }
+                lastPt2 = pts2.get(j);
+            }
+            lastPt1 = pts1.get(i);
+        }
+        return false;
+    }
+
    /**
     * Checks to see if the given ID is accurate.
-     * 
+     *
     * @param id
     * @return
     */
    public static boolean isValidId(String id) {
        return idPattern.matcher(id).matches();
    }
-    
+
    /**
     * Returns the hash code.
     */
@@ -381,7 +524,7 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
    public int hashCode(){
        return id.hashCode();
    }
-    
+
    /**
     * Returns whether this region has the same ID as another region.
     */
@@ -390,15 +533,15 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
        if (!(obj instanceof ProtectedRegion)) {
            return false;
        }
-        
+
        ProtectedRegion other = (ProtectedRegion) obj;
        return other.getId().equals(getId());
    }
-    
+
    /**
     * Thrown when setting a curParent would create a circular inheritance
     * situation.
-     * 
+     *
     */
    public static class CircularInheritanceException extends Exception {
        private static final long serialVersionUID = 7479613488496776022L;
@@ -37,5 +37,4 @@ public class ProtectedRegionMBRConverter implements MBRConverter<ProtectedRegion
    public double getMaxY(ProtectedRegion t) {
        return t.getMaximumPoint().getBlockZ();
    }
-
 }
@@ -19,8 +19,8 @@

 package com.sk89q.worldguard.util;

-import java.util.Map;
 import java.util.LinkedHashMap;
+import java.util.Map;

 public class LogListBlock {
    private LinkedHashMap <String, Object> items
@@ -21,6 +21,7 @@ package com.sk89q.worldguard.util;

 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import com.sk89q.worldguard.domains.DefaultDomain;

 /**
@@ -26,8 +26,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.util.HashMap;
 import java.util.Map;
-import com.sk89q.worldguard.util.yaml.ConfigurationException;
-import com.sk89q.worldguard.util.yaml.ConfigurationNode;
+
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
@@ -39,10 +38,10 @@ import org.yaml.snakeyaml.representer.Representer;
 * a file and call its load() method. For specifying node paths in the
 * various get*() methods, they support SK's path notation, allowing you to
 * select child nodes by delimiting node names with periods.
- * 
+ *
 * <p>
 * For example, given the following configuration file:</p>
- * 
+ *
 * <pre>members:
 *     - Hollie
 *     - Jason
@@ -57,41 +56,41 @@ import org.yaml.snakeyaml.representer.Representer;
 *     cool: false
 *     eats:
 *         babies: true</pre>
- * 
+ *
 * <p>Calling code could access sturmeh's baby eating state by using
 * <code>getBoolean("sturmeh.eats.babies", false)</code>. For lists, there are
 * methods such as <code>getStringList</code> that will return a type safe list.
- * 
+ *
 * <p>This class is currently incomplete. It is not yet possible to get a node.
 * </p>
- * 
+ *
 * @author sk89q
 */
 public class Configuration extends ConfigurationNode {
    private Yaml yaml;
    private File file;
    private String header = null;
-    
+
    public Configuration(File file) {
        super(new HashMap<String, Object>());
-        
+
        DumperOptions options = new DumperOptions();
        options.setIndent(2);
        options.setDefaultFlowStyle(DumperOptions.FlowStyle.AUTO);

        yaml = new Yaml(new SafeConstructor(), new Representer(), options);
-        
+
        this.file = file;
    }
-    
+
    /**
     * Loads the configuration file.
-     * 
-     * @throws IOException 
+     *
+     * @throws IOException
     */
-    public void load() throws IOException {        
+    public void load() throws IOException {
        FileInputStream stream = null;
-        
+
        try {
            stream = new FileInputStream(file);
            read(yaml.load(new UnicodeReader(stream)));
@@ -180,7 +179,7 @@ public class Configuration extends ConfigurationNode {

        return false;
    }
-    
+
    @SuppressWarnings("unchecked")
    private void read(Object input) throws ConfigurationException {
        try {
@@ -193,9 +192,9 @@ public class Configuration extends ConfigurationNode {
            throw new ConfigurationException("Root document must be an key-value structure");
        }
    }
-    
+
    /**
-     * This method returns an empty ConfigurationNode for using as a 
+     * This method returns an empty ConfigurationNode for using as a
     * default in methods that select a node from a node list.
     * @return
     */
@@ -23,37 +23,37 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
-import com.sk89q.worldguard.util.yaml.ConfigurationNode;

 /**
 * Represents a configuration node.
- * 
+ *
 * @author sk89q
 */
 public class ConfigurationNode {
    protected Map<String, Object> root;
-    
+
    protected ConfigurationNode(Map<String, Object> root) {
        this.root = root;
    }
-    
+
    /**
     * Clear all nodes.
     */
    public void clear() {
        root.clear();
    }
-    
+
    /**
     * Gets a property at a location. This will either return an Object
     * or null, with null meaning that no configuration value exists at
     * that location. This could potentially return a default value (not yet
     * implemented) as defined by a plugin, if this is a plugin-tied
     * configuration.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return object or null
     */
@@ -66,35 +66,35 @@ public class ConfigurationNode {
            }
            return val;
        }
-        
+
        String[] parts = path.split("\\.");
        Map<String, Object> node = root;
-        
+
        for (int i = 0; i < parts.length; i++) {
            Object o = node.get(parts[i]);
-            
+
            if (o == null) {
                return null;
            }
-            
+
            if (i == parts.length - 1) {
                return o;
            }
-            
+
            try {
                node = (Map<String, Object>)o;
            } catch (ClassCastException e) {
                return null;
            }
        }
-        
+
        return null;
    }
-    
+
    /**
     * Prepare a value for serialization, in case it's not a native type
     * (and we don't want to serialize objects as YAML objects).
-     * 
+     *
     * @param value
     * @return
     */
@@ -107,53 +107,53 @@ public class ConfigurationNode {
            out.put("z", vec.getZ());
            return out;
        }
-        
+
        return value;
    }
-    
+
    /**
     * Set the property at a location. This will override existing
     * configuration data to have it conform to key/value mappings.
-     * 
+     *
     * @param path
     * @param value
     */
    @SuppressWarnings("unchecked")
    public void setProperty(String path, Object value) {
        value = prepareSerialization(value);
-        
+
        if (!path.contains(".")) {
            root.put(path, value);
            return;
        }
-        
+
        String[] parts = path.split("\\.");
        Map<String, Object> node = root;
-        
+
        for (int i = 0; i < parts.length; i++) {
            Object o = node.get(parts[i]);
-            
+
            // Found our target!
            if (i == parts.length - 1) {
                node.put(parts[i], value);
                return;
            }
-            
+
            if (o == null || !(o instanceof Map)) {
                // This will override existing configuration data!
                o = new HashMap<String, Object>();
                node.put(parts[i], o);
            }
-            
+
            node = (Map<String, Object>)o;
        }
    }
-    
+
    /**
     * Adds a new node to the given path. The returned object is a reference
     * to the new node. This method will replace an existing node at
     * the same path. See <code>setProperty</code>.
-     * 
+     *
     * @param path
     * @return
     */
@@ -169,7 +169,7 @@ public class ConfigurationNode {
     * or null, with null meaning that no configuration value exists at
     * that location. If the object at the particular location is not actually
     * a string, it will be converted to its string representation.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return string or null
     */
@@ -185,7 +185,7 @@ public class ConfigurationNode {
     * Gets a vector at a location. This will either return an Vector
     * or a null. If the object at the particular location is not
     * actually a string, it will be converted to its string representation.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return string or default
     */
@@ -194,15 +194,15 @@ public class ConfigurationNode {
        if (o == null) {
            return null;
        }
-        
+
        Double x = o.getDouble("x");
        Double y = o.getDouble("y");
        Double z = o.getDouble("z");
-        
+
        if (x == null || y == null || z == null) {
            return null;
        }
-        
+
        return new Vector(x, y, z);
    }

@@ -210,7 +210,7 @@ public class ConfigurationNode {
     * Gets a 2D vector at a location. This will either return an Vector
     * or a null. If the object at the particular location is not
     * actually a string, it will be converted to its string representation.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return string or default
     */
@@ -219,14 +219,14 @@ public class ConfigurationNode {
        if (o == null) {
            return null;
        }
-        
+
        Double x = o.getDouble("x");
        Double z = o.getDouble("z");
-        
+
        if (x == null || z == null) {
            return null;
        }
-        
+
        return new Vector2D(x, z);
    }

@@ -234,7 +234,7 @@ public class ConfigurationNode {
     * Gets a string at a location. This will either return an Vector
     * or the default value. If the object at the particular location is not
     * actually a string, it will be converted to its string representation.
-     * 
+     *
     * @param path path to node (dot notation)
     * @param def default value
     * @return string or default
@@ -252,7 +252,7 @@ public class ConfigurationNode {
     * Gets a string at a location. This will either return an String
     * or the default value. If the object at the particular location is not
     * actually a string, it will be converted to its string representation.
-     * 
+     *
     * @param path path to node (dot notation)
     * @param def default value
     * @return string or default
@@ -271,7 +271,7 @@ public class ConfigurationNode {
     * or null. If the object at the particular location is not
     * actually a integer, the default value will be returned. However, other
     * number types will be casted to an integer.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return integer or null
     */
@@ -289,7 +289,7 @@ public class ConfigurationNode {
     * or the default value. If the object at the particular location is not
     * actually a integer, the default value will be returned. However, other
     * number types will be casted to an integer.
-     * 
+     *
     * @param path path to node (dot notation)
     * @param def default value
     * @return int or default
@@ -309,7 +309,7 @@ public class ConfigurationNode {
     * or null. If the object at the particular location is not
     * actually a double, the default value will be returned. However, other
     * number types will be casted to an double.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return double or null
     */
@@ -327,7 +327,7 @@ public class ConfigurationNode {
     * or the default value. If the object at the particular location is not
     * actually a double, the default value will be returned. However, other
     * number types will be casted to an double.
-     * 
+     *
     * @param path path to node (dot notation)
     * @param def default value
     * @return double or default
@@ -346,7 +346,7 @@ public class ConfigurationNode {
     * Gets a boolean at a location. This will either return an boolean
     * or null. If the object at the particular location is not
     * actually a boolean, the default value will be returned.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return boolean or null
     */
@@ -363,7 +363,7 @@ public class ConfigurationNode {
     * Gets a boolean at a location. This will either return an boolean
     * or the default value. If the object at the particular location is not
     * actually a boolean, the default value will be returned.
-     * 
+     *
     * @param path path to node (dot notation)
     * @param def default value
     * @return boolean or default
@@ -377,11 +377,11 @@ public class ConfigurationNode {
            return o;
        }
    }
-    
+
    /**
     * Get a list of keys at a location. If the map at the particular location
     * does not exist or it is not a map, null will be returned.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return list of keys
     */
@@ -401,7 +401,7 @@ public class ConfigurationNode {
    /**
     * Gets a list of objects at a location. If the list is not defined,
     * null will be returned. The node must be an actual list.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return boolean or default
     */
@@ -416,7 +416,7 @@ public class ConfigurationNode {
            return null;
        }
    }
-    
+
    /**
     * Gets a list of strings. Non-valid entries will not be in the list.
     * There will be no null slots. If the list is not defined, the
@@ -424,7 +424,7 @@ public class ConfigurationNode {
     * and an empty list will be returned instead. If an item in the list
     * is not a string, it will be converted to a string. The node must be
     * an actual list and not just a string.
-     *  
+     *
     * @param path path to node (dot notation)
     * @param def default value or null for an empty list as default
     * @return list of strings
@@ -440,20 +440,20 @@ public class ConfigurationNode {
            if (o == null) {
                continue;
            }
-            
+
            list.add(o.toString());
        }
-        
+
        return list;
    }
-    
+
    /**
     * Gets a list of integers. Non-valid entries will not be in the list.
     * There will be no null slots. If the list is not defined, the
     * default will be returned. 'null' can be passed for the default
     * and an empty list will be returned instead. The node must be
     * an actual list and not just an integer.
-     *  
+     *
     * @param path path to node (dot notation)
     * @param def default value or null for an empty list as default
     * @return list of integers
@@ -471,17 +471,17 @@ public class ConfigurationNode {
                list.add(i);
            }
        }
-        
+
        return list;
    }
-    
+
    /**
     * Gets a list of doubles. Non-valid entries will not be in the list.
     * There will be no null slots. If the list is not defined, the
     * default will be returned. 'null' can be passed for the default
     * and an empty list will be returned instead. The node must be
     * an actual list and cannot be just a double.
-     *  
+     *
     * @param path path to node (dot notation)
     * @param def default value or null for an empty list as default
     * @return list of integers
@@ -499,17 +499,17 @@ public class ConfigurationNode {
                list.add(i);
            }
        }
-        
+
        return list;
    }
-    
+
    /**
     * Gets a list of booleans. Non-valid entries will not be in the list.
     * There will be no null slots. If the list is not defined, the
     * default will be returned. 'null' can be passed for the default
     * and an empty list will be returned instead. The node must be
     * an actual list and cannot be just a boolean,
-     *  
+     *
     * @param path path to node (dot notation)
     * @param def default value or null for an empty list as default
     * @return list of integers
@@ -527,111 +527,111 @@ public class ConfigurationNode {
                list.add(tetsu);
            }
        }
-        
+
        return list;
    }
-    
+
    /**
     * Gets a list of vectors. Non-valid entries will not be in the list.
     * There will be no null slots. If the list is not defined, the
     * default will be returned. 'null' can be passed for the default
     * and an empty list will be returned instead. The node must be
     * an actual node and cannot be just a vector,
-     *  
+     *
     * @param path path to node (dot notation)
     * @param def default value or null for an empty list as default
     * @return list of integers
     */
    public List<Vector> getVectorList(
            String path, List<Vector> def) {
-        
+
        List<ConfigurationNode> raw = getNodeList(path, null);
        List<Vector> list = new ArrayList<Vector>();
-        
+
        for (ConfigurationNode o : raw) {
            Double x = o.getDouble("x");
            Double y = o.getDouble("y");
            Double z = o.getDouble("z");
-            
+
            if (x == null || y == null || z == null) {
                continue;
            }
-            
+
            list.add(new Vector(x, y, z));
        }
-        
+
        return list;
    }
-    
+
    /**
     * Gets a list of 2D vectors. Non-valid entries will not be in the list.
     * There will be no null slots. If the list is not defined, the
     * default will be returned. 'null' can be passed for the default
     * and an empty list will be returned instead. The node must be
     * an actual node and cannot be just a vector,
-     *  
+     *
     * @param path path to node (dot notation)
     * @param def default value or null for an empty list as default
     * @return list of integers
     */
    public List<Vector2D> getVector2dList(
            String path, List<Vector2D> def) {
-        
+
        List<ConfigurationNode> raw = getNodeList(path, null);
        List<Vector2D> list = new ArrayList<Vector2D>();
-        
+
        for (ConfigurationNode o : raw) {
            Double x = o.getDouble("x");
            Double z = o.getDouble("z");
-            
+
            if (x == null || z == null) {
                continue;
            }
-            
+
            list.add(new Vector2D(x, z));
        }
-        
+
        return list;
    }
-    
+
    /**
     * Gets a list of 2D vectors. Non-valid entries will not be in the list.
     * There will be no null slots. If the list is not defined, the
     * default will be returned. 'null' can be passed for the default
     * and an empty list will be returned instead. The node must be
     * an actual node and cannot be just a vector,
-     *  
+     *
     * @param path path to node (dot notation)
     * @param def default value or null for an empty list as default
     * @return list of integers
     */
    public List<BlockVector2D> getBlockVector2dList(
            String path, List<BlockVector2D> def) {
-        
+
        List<ConfigurationNode> raw = getNodeList(path, null);
        List<BlockVector2D> list = new ArrayList<BlockVector2D>();
-        
+
        for (ConfigurationNode o : raw) {
            Double x = o.getDouble("x");
            Double z = o.getDouble("z");
-            
+
            if (x == null || z == null) {
                continue;
            }
-            
+
            list.add(new BlockVector2D(x, z));
        }
-        
+
        return list;
    }
-    
+
    /**
     * Gets a list of nodes. Non-valid entries will not be in the list.
     * There will be no null slots. If the list is not defined, the
     * default will be returned. 'null' can be passed for the default
     * and an empty list will be returned instead. The node must be
     * an actual node and cannot be just a boolean,
-     *  
+     *
     * @param path path to node (dot notation)
     * @param def default value or null for an empty list as default
     * @return list of integers
@@ -649,15 +649,15 @@ public class ConfigurationNode {
                list.add(new ConfigurationNode((Map<String, Object>)o));
            }
        }
-        
+
        return list;
    }
-    
+
    /**
     * Get a configuration node at a path. If the node doesn't exist or the
     * path does not lead to a node, null will be returned. A node has
     * key/value mappings.
-     * 
+     *
     * @param path
     * @return node or null
     */
@@ -667,14 +667,14 @@ public class ConfigurationNode {
        if (raw instanceof Map) {
            return new ConfigurationNode((Map<String, Object>)raw);
        }
-        
+
        return null;
    }
-    
+
    /**
     * Get a list of nodes at a location. If the map at the particular location
     * does not exist or it is not a map, null will be returned.
-     * 
+     *
     * @param path path to node (dot notation)
     * @return map of nodes
     */
@@ -686,23 +686,23 @@ public class ConfigurationNode {
        } else if (o instanceof Map) {
            Map<String, ConfigurationNode> nodes =
                new HashMap<String, ConfigurationNode>();
-            
+
            for (Map.Entry<String, Object> entry : ((Map<String, Object>)o).entrySet()) {
                if (entry.getValue() instanceof Map) {
                    nodes.put(entry.getKey(),
                            new ConfigurationNode((Map<String, Object>) entry.getValue()));
                }
            }
-            
+
            return nodes;
        } else {
            return null;
        }
    }
-    
+
    /**
     * Casts a value to an integer. May return null.
-     * 
+     *
     * @param o
     * @return
     */
@@ -723,10 +723,10 @@ public class ConfigurationNode {
            return null;
        }
    }
-    
+
    /**
     * Casts a value to a double. May return null.
-     * 
+     *
     * @param o
     * @return
     */
@@ -747,10 +747,10 @@ public class ConfigurationNode {
            return null;
        }
    }
-    
+
    /**
     * Casts a value to a boolean. May return null.
-     * 
+     *
     * @param o
     * @return
     */
@@ -763,11 +763,11 @@ public class ConfigurationNode {
            return null;
        }
    }
-    
+
    /**
     * Remove the property at a location. This will override existing
     * configuration data to have it conform to key/value mappings.
-     * 
+     *
     * @param path
     */
    @SuppressWarnings("unchecked")
@@ -776,19 +776,19 @@ public class ConfigurationNode {
            root.remove(path);
            return;
        }
-        
+
        String[] parts = path.split("\\.");
        Map<String, Object> node = root;
-        
+
        for (int i = 0; i < parts.length; i++) {
            Object o = node.get(parts[i]);
-            
+
            // Found our target!
            if (i == parts.length - 1) {
                node.remove(parts[i]);
                return;
            }
-            
+
            node = (Map<String, Object>)o;
        }
    }
@@ -1,6 +1,7 @@
 name: WorldGuard
 main: com.sk89q.worldguard.bukkit.WorldGuardPlugin
 version: "${project.version}"
+softdepend: [WorldEdit]
 commands:
    stopfire:
        description: Halts all fire spread until it is disabled or the server is restarted
@@ -32,6 +33,10 @@ commands:
        description: Adjust protected regions
        usage: /<command> <action> ...
        aliases: [rg, regions]
+    flushstates:
+        descripton: Clear state manager.
+        usage: /<command> [player]
+        aliases: clearstates
    locate:
        description: Set your compass towards a person
        usage: /<command> <target>
@@ -23,22 +23,9 @@ import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.StateFlag;
 import com.sk89q.worldguard.protection.flags.StringFlag;
-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.ProtectedRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
-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 java.util.ArrayList;
-import java.util.HashSet;

 public class ApplicableRegionSetTest {

@@ -351,7 +338,6 @@ public class ApplicableRegionSetTest {
    @Test
    public void testNoGlobalRegionDefaultBuild() {
        MockApplicableRegionSet mock = new MockApplicableRegionSet();
-        ProtectedRegion region;

        LocalPlayer member = mock.createPlayer();
        LocalPlayer nonMember = mock.createPlayer();
@@ -364,9 +350,8 @@ public class ApplicableRegionSetTest {
    @Test
    public void testGlobalRegionDefaultBuild() {
        MockApplicableRegionSet mock = new MockApplicableRegionSet();
-        ProtectedRegion region;
-
-        region = mock.global();
+        @SuppressWarnings("unused")
+        ProtectedRegion region = mock.global();

        LocalPlayer member = mock.createPlayer();
        LocalPlayer nonMember = mock.createPlayer();
@@ -0,0 +1,82 @@
+package com.sk89q.worldguard.protection;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RegionIntersectTest {
+
+    @Test
+    public void testCuboidGetIntersectingRegions() {
+        ProtectedRegion region = new ProtectedCuboidRegion("square",
+                new BlockVector(100, 40, 0), new BlockVector(140, 128, 40));
+
+        assertIntersection(region, new ProtectedCuboidRegion("normal",
+                new BlockVector(80, 40, -20), new BlockVector(120, 128, 20)),
+                true);
+
+        assertIntersection(region, new ProtectedCuboidRegion("small",
+                new BlockVector(98, 45, 20), new BlockVector(103, 50, 25)),
+                true);
+
+        assertIntersection(region, new ProtectedCuboidRegion("large",
+                new BlockVector(-500, 0, -600), new BlockVector(1000, 128, 1000)),
+                true);
+
+        assertIntersection(region, new ProtectedCuboidRegion("short",
+                new BlockVector(50, 40, -1), new BlockVector(150, 128, 2)),
+                true);
+
+        assertIntersection(region, new ProtectedCuboidRegion("long",
+                new BlockVector(0, 40, 5), new BlockVector(1000, 128, 8)),
+                true);
+
+        List<BlockVector2D> triangle_overlap = new ArrayList<BlockVector2D>();
+        triangle_overlap.add(new BlockVector2D(90, -10));
+        triangle_overlap.add(new BlockVector2D(120, -10));
+        triangle_overlap.add(new BlockVector2D(90, 20));
+
+        assertIntersection(region, new ProtectedPolygonalRegion("triangle_overlap",
+                triangle_overlap, 0, 128),
+                true);
+
+        List<BlockVector2D> triangle_no_overlap = new ArrayList<BlockVector2D>();
+        triangle_no_overlap.add(new BlockVector2D(90, -10));
+        triangle_no_overlap.add(new BlockVector2D(105, -10));
+        triangle_no_overlap.add(new BlockVector2D(90, 5));
+
+        assertIntersection(region, new ProtectedPolygonalRegion("triangle_no_overlap",
+                triangle_no_overlap, 0, 128),
+                false);
+
+        List<BlockVector2D> triangle_overlap_no_points = new ArrayList<BlockVector2D>();
+        triangle_overlap_no_points.add(new BlockVector2D(100, -10));
+        triangle_overlap_no_points.add(new BlockVector2D(120, 50));
+        triangle_overlap_no_points.add(new BlockVector2D(140, -20));
+
+        assertIntersection(region, new ProtectedPolygonalRegion("triangle_overlap_no_points",
+                triangle_overlap_no_points, 60, 80),
+                true);
+    }
+
+    private void assertIntersection(ProtectedRegion region1, ProtectedRegion region2, boolean expected) {
+        boolean actual = false;
+        List<ProtectedRegion> regions = new ArrayList<ProtectedRegion>();
+        regions.add(region2);
+
+        try {
+            actual = (region1.getIntersectingRegions(regions).size() == 1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        assertEquals("Check for '" + region2.getId() + "' region failed.", expected, actual);
+    }
+}
Author	SHA1	Message	Date
zml2008	120fff1fc4	[maven-release-plugin] prepare release 5.4	2011-12-17 20:16:41 -08:00
zml2008	f879bd5e3a	Updated changelog for release	2011-12-17 19:37:24 -08:00
Turtle9598	01f9fd561d	Made WorldGuard check to see if both the attacker & defender are in a pvp area.	2011-12-14 20:15:42 -05:00
DerFlash	6802a7d747	Raised the priority of WorldGuard's respawn event listener.	2011-12-11 08:34:14 -08:00
DerFlash	b918b29014	Fixed not being able to fill milk buckets in build deny regions Though added a check for use flag here	2011-12-11 08:29:42 -08:00
zml2008	4895a3313b	Forgot to update /slay, /wg report, and /stoplag to new commands system	2011-12-10 12:52:32 -08:00
zml2008	59673c9e66	Simplified autogod config check	2011-12-09 17:57:40 -08:00
Turtle9598	b126255be7	Fixed god mode being assigned to ops if auto enable is false and there is no permissions system This fixes Bug #873	2011-12-10 01:15:14 +01:00
TomyLobo	606c9f3fd8	Revert "Readded the legacy console sender." This reverts commit `b1256eedcf`. Reason: this breaks if someone modifies CommandSender The only advantage of having this class is to keep WorldGuard working with old 1.8 builds and pre-1.8 builds.	2011-12-08 14:38:05 +01:00
zml2008	aa306a8df7	Added additional worldguard.stack.damaged permissions to allow stacking of tools with a different damage value	2011-12-07 22:27:00 -08:00
zml2008	b1256eedcf	Readded the legacy console sender.	2011-12-07 22:25:41 -08:00
zml2008	4454df341f	Commented ProtectedPolygonalRegion.volume() out until someone can fix it.	2011-12-07 21:33:47 -08:00
TomyLobo	5bcac17f1c	Fixed compilation with Bukkit >= CB1564. Sorry, this breaks compatibility with builds < CB1193.	2011-12-08 02:34:26 +01:00
TomyLobo	875b9f326c	Removed deprecation of RegionManager.getApplicableRegions. The underlying functionality has since been implemented. Also: woo, no more warnings	2011-12-05 06:03:52 +01:00
zml2008	a0d27c6f86	Added WorldEdit as a softdepend. This may fix some issues where WorldEdit's classes cannot be found.	2011-12-04 21:02:39 +01:00
zml2008	1d47d12189	Hopefully fixed WorldConfiguration.getKeys	2011-12-04 10:02:07 -08:00
zml2008	67f78ae8b5	Added per-group region claim maximums	2011-12-04 00:54:33 -08:00
zml2008	5948855da7	Added some more 1.0.0 blocks I forgot	2011-12-02 18:55:29 -08:00
zml2008	f6ec46cdf6	Now actually registering world events	2011-11-30 20:18:03 -08:00
zml2008	ebd2755eb2	Wrong this.	2011-11-30 19:24:53 -08:00
zml2008	78f5827d3d	Always the imports...	2011-11-30 19:04:50 -08:00
zml2008	0829070c67	Added some OSX filesystem dust to gitignore and fixed pom.xml comment	2011-11-30 19:01:05 -08:00
zml2008	8b4332e842	Updated for new commands format	2011-11-30 18:59:02 -08:00
zml2008	f904c91443	Updated for Bukkit 1.0 and handling new 1.0 block types in USE flag	2011-11-30 18:59:02 -08:00
Eric Puidokas	944539453e	Fixed feed-delay flag	2011-11-29 19:40:08 -08:00
TomyLobo	5856b002df	Added .gitignore	2011-11-28 04:39:03 +01:00
TomyLobo	12f68bc227	Fixed a warning	2011-11-28 04:37:30 +01:00
TomyLobo	de6e20d60a	Improved error messages for group and state flags.	2011-10-30 04:07:37 +01:00
Eric Puidokas	35e6ef5cd8	Implemented edge intersection checking	2011-10-19 23:48:02 +02:00
Eric Puidokas	27251dda2e	Refactored and fixed getIntersectingRegions	2011-10-19 23:47:13 +02:00
Eric Puidokas	4bb967ab4a	Added Cuboid -> Polygonal intersect tests	2011-10-19 16:21:14 +02:00
Eric Puidokas	7c1f878610	Fixed ProtectedCuboidRegion->ProtectedCuboidRegion intersection checking	2011-10-19 16:21:14 +02:00
Wizjany	e8c4c9b218	Fixed sticky pistons not being blocked by the flag in some cases	2011-10-18 17:49:05 -04:00
Eric Puidokas	bc37d365ab	Added unit tests for ProtectedCuboidRegion.getIntersectingRegions	2011-10-18 02:43:00 +02:00
TomyLobo	d9ae1bbd9f	Made LegacyConsoleSender compatible with patched Bukkit versions that add methods to CommandSender again. Don't remove this again, wizjany.	2011-10-16 12:26:22 +02:00
zml2008	e492b30178	Added food level support to godmode and /heal	2011-10-15 23:51:28 -07:00
TomyLobo	920860c298	Fixed some warnings	2011-10-13 15:39:52 -04:00
Wizjany	5f8a6e3423	Workaround for tnt activating as soon as it was placed, regardless of cancellation.	2011-10-11 20:11:07 -04:00
Wizjany	3e7a5056d5	Fixed changelog not getting packaged with the release.	2011-10-09 11:51:43 -04:00
Wizjany	2ec6f04763	Implement non-economy 'buying' of regions via addowner	2011-10-09 11:51:43 -04:00
Wizjany	ecef9c9792	Hopefully fix region managers not being created correctly.	2011-10-04 17:43:27 -04:00
Wizjany	810501a508	Added the missing timer to the food flags.	2011-10-04 16:26:54 -04:00
Wizjany	6285a66d76	Fixed allowed/blocked commands not being checked early enough.	2011-10-02 13:36:09 -04:00
zml2008	72e4922e8e	Fixed config generation for Windows users	2011-10-02 01:30:10 -07:00
sk89q	c1f1885633	[maven-release-plugin] prepare for next development iteration	2011-10-01 20:52:04 -07:00
sk89q	56e514a500	[maven-release-plugin] prepare release 5.3	2011-10-01 20:51:49 -07:00
sk89q	5ede100d56	Changed WorldGuard to use WE 4.7 in the pom.xml.	2011-10-01 20:50:35 -07:00
sk89q	f1456b8101	Updated CHANGELOG.txt for 5.3.	2011-10-01 20:26:07 -07:00
Eric Puidokas	ef8eb76b16	Added protection.disable-obsidian-generators option	2011-10-01 17:16:45 -04:00
Wizjany	b4f2188f72	Added vehicle destroy flag and made players in vehicles subject to movement flags.	2011-10-01 17:16:37 -04:00
zml2008	38c30f5ecd	Should fix broken config generation some people have been getting	2011-10-01 16:17:16 -04:00
Wizjany	94c794de6f	Trailing whitespace removal	2011-09-27 06:13:19 -04:00
Wizjany	fb535e620c	Use per-world permissions if supported.	2011-09-26 01:32:48 -04:00
Wizjany	5a42980d78	Fix hunger flags and death messages.	2011-09-26 00:19:57 -04:00
Wizjany	299d2a1f01	That should probably be there	2011-09-25 23:42:50 -04:00
Wizjany	164ff5ea9a	Added missing dependency	2011-09-25 23:37:25 -04:00
Wizjany	6c89ef908a	Clean up and preparation for release.	2011-09-25 23:31:21 -04:00
Wizjany	3441ae11f2	Added legacy console sender (à la CommandBook).	2011-09-25 22:27:21 -04:00
Wizjany	c028331ef9	Added config option and flag to prevent spread of grass.	2011-09-24 22:51:36 -04:00
Wizjany	9343c300cd	Added command to flush state manager in case of emergency.	2011-09-24 22:01:07 -04:00
zml2008	63693cc529	Updated for Bukkit changes	2011-09-24 15:57:41 -07:00
Wizjany	e6de06aae8	Apply weather settings on world load.	2011-09-22 20:34:38 -04:00
Wizjany	89ce7312d1	Added config options to disable xp drops (even though they should no longer lag) and death messages.	2011-09-21 16:48:56 -04:00
Wizjany	b884787377	Fixed 1.8 chests not being blocked and future-proofed some other things.	2011-09-21 15:29:45 -04:00
Wizjany	a1427e7743	- Added flags for hunger that do the same that the health ones do (but with hunger) - Added a config option and a flag to prevent endermen from picking up or placing blocks."	2011-09-20 15:44:54 -04:00
Wizjany	0c02190e19	Added fence gates to USE flag.	2011-09-19 00:58:48 -04:00
zml2008	1f7cce9535	Added experience orbs to the intensive entities list	2011-09-16 20:02:46 -07:00
Wizjany	9fea677b60	Fixed being able to eat protected cake.	2011-09-16 19:18:08 -04:00
Wizjany	6b9a3aff58	Made priming TNT by punching it with flint and steel throw a block break blacklist event.	2011-08-27 16:00:42 -04:00
Wizjany	b938271b4d	Punching fire in a region without build permissions should no longer douse the fire.	2011-08-27 13:44:40 -04:00
Wizjany	297e06ba71	Fix infinite sign bug.	2011-08-26 22:35:28 -04:00
Wizjany	a521ab76a5	Fixed interact and use blacklist events being grouped together incorrectly when right clicking a container.	2011-08-26 20:03:38 -04:00
Wizjany	b1c8fc82c4	Fixed piston events being cancelled when they shouldn't be	2011-08-25 18:48:17 -04:00
Wizjany	d4ba90c21d	Sort /region info player list alphabetically.	2011-08-24 23:48:09 -04:00
Wizjany	14dc868d45	Fixed polygon region edges being unprotected on certain edges. Thanks Droolio.	2011-08-24 17:50:25 -04:00
Wizjany	61a60ecdd6	Fallback to the global region for flags other than StateFlags. Thanks imjake9.	2011-08-24 17:40:01 -04:00
Wizjany	2b56247e21	Allow '/region info' for existing but now illegally-named regions. Thanks Moo0.	2011-08-20 02:22:45 -04:00
Wizjany	e0066e6173	Disallowed overwriting regions without specifying redefine.	2011-08-20 02:17:39 -04:00
Wizjany	b5b92f91dc	Added flag for pistons and fixed a typo in config.	2011-08-20 01:58:46 -04:00
Wizjany	7b12510182	Made sleep flag proactive enough to keep them from blowing the nether up.	2011-08-16 19:24:13 -04:00
TomyLobo	e2fc6a3ff0	Fixed heal/damage regions being shifted by half a block towards northeast.	2011-08-15 10:13:39 +02:00
TomyLobo	5acd3a7f6c	Fixed warnings.	2011-08-15 09:08:33 +02:00
EduardBaer	ce49ca0998	Fix BlockInteractBlacklistEvent	2011-08-11 22:52:20 -04:00
Wizjany	eacce487ed	Ignore NPE onCreatureSpawn and attempt to get more information about it instead.	2011-08-11 22:52:19 -04:00
Wizjany	602b1d8a27	Bugfixes. Allowed/blocked commands should now respect global flags. Region invincibility/godmode compatibility should now work instead of throwing NPEs.	2011-08-11 22:05:31 -04:00
Wizjany	dec469caef	Added worldguard.region.flag.regions permissions and flags.<flag>.own for consistency. The old ones will probably be deprecated at some point. Also cleaned up /wg report output slightly.	2011-08-10 20:16:05 -04:00
Wizjany	4194b2ca86	Added the option to disable the use of player move events. Note that this also disables features which use it such as the region entry/exit and greeting/farewell flags.	2011-08-10 20:16:05 -04:00
Wizjany	17741822c1	Allow invincibility flag to disable god mode (when set to deny) unless the player has the worldguard.god.override-regions permission.	2011-08-10 17:43:46 -04:00
Wizjany	3757056e46	Fixed up explosion handling.	2011-08-09 21:02:26 -04:00
Wizjany	0eb68ef864	Added min and max health flags to go along with the other healing flags. Also organized the flag list for readability.	2011-08-09 19:48:10 -04:00
Wizjany	3f77a9b721	Made /stack respect max stack sizes unless the user has worldguard.stack.illegitimate which will stack normally unstackable items.	2011-08-08 12:46:18 -04:00
Wizjany	321b3acf0a	Buckets now check the region that the water will end up in, not the block that was clicked	2011-08-08 09:12:10 -04:00
Wizjany	dfbbeeb473	Moved around projectile damage events in accordance to Bukkit	2011-08-07 18:42:32 -04:00
Wizjany	31d3f2e7c6	Cancel scheduled tasks on disable	2011-08-07 17:08:18 -04:00
Wizjany	40a66b9be4	Updated snow fall and added flags for snow/ice forming/melting and mushroom growth	2011-08-06 11:29:14 -04:00
sk89q	049a1fb2ed	Merge pull request #134 from halvors/cleanup Cleanup, commented out some unused fields.	2011-07-17 10:50:36 -07:00
halvors	3fc68af05f	More imports cleanup.	2011-07-16 23:07:29 +02:00
halvors	c3f0c8a7a1	Oops, missed some changes.	2011-07-16 22:39:30 +02:00
halvors	cba1a95838	Cleanup, commented out some unused fields.	2011-07-16 22:26:10 +02:00
sk89q	345f4a2e0e	Removed some debugging messages.	2011-06-29 17:00:58 -07:00
sk89q	162d53b66e	Made TNT blocking more aggressive. Also fixed explosion event.	2011-06-29 16:59:31 -07:00
sk89q	bed6782a00	Made /stoplag handle TNT removal better.	2011-06-29 16:17:36 -07:00
Wizjany	d90b960597	Moved fireball handling to somewhere that actually gets called by it...	2011-06-29 15:43:01 -04:00
Wizjany	3325feb1cb	Re-enable god mode on a reload for those who need it.	2011-06-28 01:05:51 -04:00
Wizjany	62d181eb81	Made it easier for plugins to access the API without using WorldEdit vectors	2011-06-28 00:59:16 -04:00
Wizjany	1e24e9c128	Added config option to block fireball world damage only. Thanks Qalthos	2011-06-28 00:58:13 -04:00
sk89q	cfffba25cf	Added regions.invincibility-removes-mobs so you can turn on invincibility without creating the possibility about farming.	2011-06-27 13:41:27 -07:00
sk89q	671b4fe2db	Added region invincibility flag.	2011-06-27 13:36:43 -07:00
sk89q	5b300bc5d1	Changed the per-world configuration loader to also put configuration entries in the main configuration.	2011-06-27 13:13:31 -07:00
sk89q	a5332c2166	Added player-damage.disable-tnt-damage.	2011-06-27 12:57:33 -07:00
sk89q	141d5ccd25	[maven-release-plugin] prepare for next development iteration	2011-06-27 12:09:57 -07:00