[maven-release-plugin] prepare release 5.1

Updated for 5.1.
Updated the README.html.
2011-06-26 03:02:02 -07:00 · 2011-06-26 02:52:40 -07:00 · 2011-06-26 02:52:13 -07:00 · 2011-06-26 02:24:50 -07:00 · 2011-06-26 01:31:59 -07:00 · 2011-06-26 01:28:24 -07:00
116 changed files with 4231 additions and 3024 deletions
@@ -1,17 +0,0 @@
-/bin
-/build
-/dist
-/release
-/store
-/test
-/lib/Bukkit.jar
-/lib/Craftbukkit.jar
-/lib/truezip.jar
-/lib/WorldEdit.jar
-/nbproject/private
-.classpath
-.project
-manifest.mf
-/oldcmds
-.settings
-*.bat
@@ -1,3 +1,6 @@
+5.1:
+- A lot of changes.
+
 4.0-alpha1:
 - This release is only to fix WorldGuard for Bukkit. Ignore the 4.0
    label. Just move along. Nothing to see.
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>WorldGuard ${version}</title>
+<style>
+body {
+  margin: 0;
+  padding: 20px;
+  background: #efefef;
+  color: #333;
+}
+#wrapper {
+  margin: 20px auto 20px auto;
+  width: 600px;
+  background: #fff;
+  padding: 40px;
+  border: 1px solid #fff;
+  border-radius: 10px;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+  box-shadow: 0 0 2px #999;
+  -webkit-box-shadow: 0 0 3px #999;
+}
+a img {
+  border: 0;
+}
+body, th, td, input {
+  font: 13px/17px "Lucida Grande", "Lucida Sans Unicode", Arial, Verdana, sans-serif;
+}
+a:link, a:visited {
+  color: #00688f;
+  text-decoration: underline;
+}
+a:hover, a:active {
+  color: #000;
+  border: 0;
+}
+h1 {
+  font: 170% "Trebuchet MS", Georgia, serif;
+  font-weight: bold;
+  color: #b90000;
+  margin: 15px 0 5px 0;
+}
+h2 {
+  font: 130% "Trebuchet MS", Georgia, serif;
+  font-weight: bold;
+  color: #6a45ac;
+  margin: 50px 0 5px 0;
+  padding: 0 0 3px 0;
+  border-bottom: 1px solid #ccc;
+}
+.warning {
+  background: #fffedf;
+  padding: 8px;
+  border: 1px dashed #ccc;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  font-size: 90%;
+}
+.subtle {
+  color: #999;
+}
+.optional {
+  background: none repeat scroll 0 0 #FFE081;
+  border-radius: 3px 3px 3px 3px;
+  font-size: 80%;
+	font-weight: normal;
+  padding: 1px 4px;
+}
+</style>
+</head>
+<body>
+
+<div id="wrapper">
+
+<h1>WorldGuard ${version}</h1>
+<p>Thanks for choosing WorldGuard!</p>
+<h2>First Steps</h2>
+
+<p>Now, to begin, you want to:</p>
+<ol>
+  <li><strong>Install the plugin:</strong> Copy WorldGuard.jar into your Bukkit server's &quot;plugins&quot; directory.</li>
+  <li><strong>Change the configuration:</strong> Run your server once (with WorldGuard) to generate the default configuration files. There are <em>two</em> types of configuration files:
+    <ul>
+      <li>The main config.yml file  inside &quot;plugins/WorldGuard&quot; is the main configuration. </li>
+      <li>Each world has a configuration file in &quot;plugins/WorldGuard/worlds&quot; that you can use to override any setting in the main configuration file for that specific world.</li>
+    </ul>
+  </li>
+  Use <em>/wg reload</em> in the console to reload the configuration.
+  <li><strong>Learn how to use WorldGuard:</strong> Check <a href="http://wiki.sk89q.com/wiki/WorldGuard">out the wiki</a> to learn how to disable things like fire and to protect regions.</li>
+</ol>
+<p class="warning"><strong>Note:</strong> Be sure you install <a href="http://www.sk89q.com/projects/worldedit/">WorldEdit</a>. If you don't want WorldEdit, just put WorldEdit.jar into your Bukkit root folder (outside of plugins/). Note that region protection  requires WorldEdit in plugins/.</p>
+<p>Be sure to:</p>
+<ul>
+  <li>Subscribe to <a href="http://minecraftnews.sk89q.com/">SK's Minecraft blog</a> for news about WorldGuard</li>
+  <li>Submit bug reports and suggestions to the <a href="http://redmine.sk89q.com/projects/worldguard/issues">issue tracker</a></li>
+  <li>Check out the <a href="http://wiki.sk89q.com/wiki/WorldGuard">WorldGuard wiki</a></li>
+</ul>
+<h2>Getting Help</h2>
+<p>If you need help, the best two ways to ask are:</p>
+<ul>
+  <li><a href="http://forum.sk89q.com/">Visit the WorldGuard forum</a></li>
+  <li>Ask in IRC chat on <a href="http://skq.me/irc/irc.esper.net/worldguard">irc.esper.net in #worldguard</a> (idle with us!)</li>
+</ul>
+<h2>Contributing</h2>
+<p>WorldGuard is entirely open source! You can download all of the plugin code to learn from it, modify it for your own self, or even contribute back!</p>
+<ul>
+  <li><a href="https://github.com/sk89q/worldguard">Download WorldGuard code from GitHub</a></li>
+  <li>You can also <a href="http://www.sk89q.com/donate/">donate</a></li>
+  </ul>
+<p>The code is covered under the GNU General Public License v3.</p>
+<p class="subtle">Maven information: ${groupId}/${artifactId}/${version}</p>
+</div>
+</body>
+</html>
@@ -0,0 +1,25 @@
+WorldGuard
+==========
+
+WorldGuard protects your Minecraft server. As Minecraft's oldest surviving world protection mod, you know you're in safe hands.
+
+Compiling
+---------
+
+You need to have Maven installed (http://maven.apache.org). Once installed,
+simply run:
+
+    mvn clean install
+    
+Maven will automatically download dependencies for you. Note: For that to work,
+be sure to add Maven to your "PATH".
+
+Contributing
+------------
+
+We happily accept contributions. The best way to do this is to fork WorldGuard
+on GitHub, add your changes, and then submit a pull request. We'll look at it,
+make comments, and merge it into WorldGuard if everything works out.
+
+By submitting code, you agree to place to license your code under the 
+GNU General Public License v3.
@@ -1,23 +0,0 @@
-WorldGuard
-Copyright (c) 2010, 2011 sk89q <http://www.sk89q.com>
-Licensed under the GNU Lesser General Public License v3
-
-Introduction
------------
-
-WorldGuard protects your server!
-
-Documentation can be found at:
-http://wiki.sk89q.com/wiki/WorldGuard
-
-Thanks
------
-
-While I would like to thank everyone for their support, I would like to
-say thanks to the following individuals for their direct
-contributions to WorldGuard:
-
- Sturmeh, for contributing the original durability workaround
- Meaglin, for changing the on flow hook at my request
- Dinnerbone, for implementing the on item pick up hook at my request,
-    and also for figuring out the durability bug in the process
@@ -1,112 +0,0 @@
-<project name="WorldGuard" default="dist" basedir=".">
-  <description>WorldGuard fixes bugs with Minecraft SMP and provides for
-    protection.</description>
-  
-  <property name="src.dir" location="src"/>
-  <property name="build.dir" location="build"/>
-  <property name="dist.dir" location="dist"/>
-  <property name="release.dir" location="release"/>
-  <property name="lib.dir" location="lib"/>
-  <property name="docs.dir" location="docs"/>
-
-  <fileset id="libs" dir="${lib.dir}">
-    <include name="truezip.jar" />
-    <include name="Bukkit.jar" />
-    <include name="WorldEdit.jar" />
-  	<include name="iConomy.jar" />
-    <include name="prtree.jar" />
-    <include name="snakeyaml.jar" />
-  </fileset>
-
-  <target name="init">
-    <mkdir dir="${build.dir}"/>
-  </target>
-
-  <!-- Compile the source files -->
-  <target name="compile" depends="init">
-    <javac srcdir="${src.dir}" deprecation="true" includeantruntime="true" destdir="${build.dir}" debug="true">
-      <classpath>
-        <fileset refid="libs"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- Build the .jar -->
-  <target name="jar" depends="compile">
-    <mkdir dir="${dist.dir}"/>
-    <manifest file="manifest.mf" mode="replace">
-      <attribute name="Implementation-Title" value="WorldGuard"/>
-      <attribute name="Implementation-Version" value="${version}"/>
-      <attribute name="WorldGuard-Version" value="${version}"/>
-      <attribute name="Class-Path" value="WorldEdit.jar WorldGuard/WorldEdit.jar"/>
-    </manifest>
-    <delete file="${build.dir}/plugin.yml"/>
-    <copy tofile="${build.dir}/plugin.yml" file="plugin.yml"/>
-    <replace file="${build.dir}/plugin.yml" token="WGVERSIONMACRO" value="${version}"/>
-    <mkdir dir="${build.dir}/defaults"/>
-    <copy tofile="${build.dir}/defaults/config.yml" file="config.yml"/>
-    <copy tofile="${build.dir}/defaults/config_world.yml" file="config_world.yml"/>
-    <copy tofile="${build.dir}/defaults/blacklist.txt" file="blacklist.txt"/>
-    <jar jarfile="${dist.dir}/WorldGuard.jar" basedir="${build.dir}" manifest="manifest.mf">
-        <zipgroupfileset dir="lib" includes="prtree.jar" />
-    </jar>
-  </target>
-
-  <!-- Create the .jar -->
-  <target name="dist">
-    <property name="version" value="nightly"/>
-    <antcall target="jar"/>
-  </target>
-
-  <!-- Build a release -->
-  <target name="release" depends="clean">
-    <input message="Enter version:" addproperty="version"/>
-    <antcall target="jar"/>
-    <delete dir="${release.dir}"/>
-    <mkdir dir="${release.dir}"/>
-    <copy tofile="${release.dir}/README.txt" file="README.txt"/>
-    <copy tofile="${release.dir}/LICENSE.txt" file="LICENSE.txt"/>
-    <copy tofile="${release.dir}/CHANGELOG.txt" file="CHANGELOG.txt"/>
-    <copy tofile="${release.dir}/blacklist_table.sql" file="blacklist_table.sql"/>
-    <copy tofile="${release.dir}/WorldGuard.jar" file="${dist.dir}/WorldGuard.jar"/>
-    <zip destfile="${release.dir}/worldguard-${version}.zip" basedir="${release.dir}" excludes="*.zip plugin.yml"/>
-    <mkdir dir="${release.dir}/src"/>
-    <copy todir="${release.dir}/src">
-      <fileset dir="${src.dir}"/>
-    </copy>
-    <zip destfile="${release.dir}/worldguard-${version}-src.zip" basedir="${release.dir}" excludes="*.zip plugin.yml"/>
-  </target>
-
-  <!-- Javadoc -->
-  <target name="javadoc">
-    <javadoc access="public" author="true" destdir="${docs.dir}" doctitle="WorldGuard API" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" sourcepath="src" splitindex="true" use="true" version="true">
-      <classpath>
-        <fileset refid="libs"/>
-      </classpath>
-    </javadoc>
-  </target>
-  
-  <!-- Clean the output -->
-  <target name="clean">
-    <delete dir="${build.dir}"/>
-    <delete dir="${dist.dir}"/>
-    <delete dir="${release.dir}"/>
-    <delete dir="${docs.dir}"/>
-  </target>
-  
-  <!--<target name="-get-version-git" if="git-revision">
-    <sequential>
-      <exec executable="git" failifexecutionfails="false" outputproperty="git-revision">
-        <arg value="rev-parse"/>
-        <arg value="HEAD"/>
-      </exec>
-      <exec executable="git" outputproperty="git-revision-dirty">
-        <arg value="diff"/>
-        <arg value="- -shortstat"/>
-      </exec>
-      <condition else="dev-${git-revision}-modified" property="version" value="dev-${git-revision}">
-        <equals arg1="" arg2="${git-revision-dirty}"/>
-      </condition>
-    </sequential>
-  </target>-->
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="javadoc">
-    <target name="javadoc">
-        <javadoc access="public" author="true" classpath="P:\Projects\Minecraft\Libraries\GroupUsers.jar;P:\Projects\Minecraft\Libraries\jnbt.jar;P:\Projects\Minecraft\hMod\build\classes;P:\Projects\Minecraft\WorldEdit\build\classes;P:\Projects\Minecraft\Libraries\snakeyaml.jar;P:\Projects\Minecraft\Libraries\jopt-simple-3.2.jar;P:\Projects\Minecraft\Libraries\Permissions.jar;C:\Program Files\eclipse\plugins\org.hamcrest.core_1.1.0.v20090501071000.jar;P:\Projects\Minecraft\Libraries\json_simple-1.1.jar;P:\Projects\Minecraft\CraftBukkit\bin;P:\Projects\Minecraft\Libraries\truezip.jar;C:\Program Files\eclipse\plugins\org.junit_4.8.1.v4_8_1_v20100427-1100\junit.jar;P:\Projects\Minecraft\Bukkit\bin;P:\Projects\Minecraft\mc-dev" destdir="doc" doctitle="Worldguard API" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="com.sk89q.worldguard.blacklist,com.sk89q.worldguard.domains,com.sk89q.worldguard.bukkit,com.sk89q.worldguard.protection,com.sk89q.worldguard.util,au.com.bytecode.opencsv,com.sk89q.worldguard,com.sk89q.worldguard.blacklist.loggers,com.sk89q.worldguard.blacklist.events" source="1.6" sourcepath="tests;src" splitindex="true" use="true" version="true"/>
-    </target>
-</project>
@@ -1,68 +0,0 @@
-worldguard.god.other
-worldguard.god.self
-
-worldguard.slay.other
-worldguard.slay.self
-
-worldguard.heal.other
-worldguard.heal.self
-
-worldguard.stack
-
-worldguard.stopfire
-
-worldguard.allowfire
-
-worldguard.locate
-
-worldguard.region.flag.ownregions
-worldguard.region.flag.memberregions
-worldguard.region.flag.foreignregions
-
-worldguard.region.info.ownregions
-worldguard.region.info.memberregions
-worldguard.region.info.foreignregions
-
-worldguard.region.list
-
-worldguard.region.load
-
-worldguard.region.addowner.own
-worldguard.region.addowner.all
-
-worldguard.region.addmember.own
-worldguard.region.addmember.all
-
-worldguard.region.removeowner.own
-worldguard.region.removeowner.all
-
-worldguard.region.removemember.own
-worldguard.region.removemember.all
-
-worldguard.region.save
-
-worldguard.region.setparent.own
-worldguard.region.setparent.all
-
-worldguard.region.priority.own
-worldguard.region.priority.all
-
-worldguard.region.bypass
-
-worldguard.reloadwg
-
-worldguard.region.delete.own
-worldguard.region.delete.all
-
-worldguard.region.define
-
-worldguard.region.claim
-
-worldguard.tpregion
-worldguard.tpregion.spawn
-worldguard.tpregion.override
-
-worldguard.buyregion
-
-worldguard.notify
-worldguard.notify_onenter
@@ -0,0 +1,173 @@
+<!--
+  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.1</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 -->
+    <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>
+</project>
@@ -1,307 +0,0 @@
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package au.com.bytecode.opencsv;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple CSV parser released under a commercial-friendly license.
- * This just implements splitting a single line into fields.
- * 
- * @author Glen Smith
- * @author Rainer Pruy
- * 
- */
-public class CSVParser {
-
-    private final char separator;
-
-    private final char quotechar;
-    
-    private final char escape;
-
-    private final boolean strictQuotes;
-
-    private String pending;
-    private boolean inField = false;
-
-    private final boolean ignoreLeadingWhiteSpace;
-    
-    /** The default separator to use if none is supplied to the constructor. */
-    public static final char DEFAULT_SEPARATOR = ',';
-
-    public static final int INITIAL_READ_SIZE = 128;
-
-    /**
-     * The default quote character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_QUOTE_CHARACTER = '"';
-    
-
-    /**
-     * The default escape character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_ESCAPE_CHARACTER = '\\';
-
-   /**
-    * The default strict quote behavior to use if none is supplied to the
-    * constructor
-    */
-    public static final boolean DEFAULT_STRICT_QUOTES = false;
-    
-    /**
-     * The default leading whitespace behavior to use if none is supplied to the
-     * constructor
-     */
-    public static final boolean DEFAULT_IGNORE_LEADING_WHITESPACE = true;
-    
-    /**
-     * Constructs CSVParser using a comma for the separator.
-     */
-    public CSVParser() {
-        this(DEFAULT_SEPARATOR, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVParser with supplied separator.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVParser(char separator) {
-        this(separator, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
-    }
-    
-    
-
-    /**
-     * Constructs CSVParser with supplied separator and quote char.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVParser(char separator, char quotechar) {
-        this(separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     */
-    public CSVParser(char separator, char quotechar, char escape) {
-        this(separator, quotechar, escape, DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * Allows setting the "strict quotes" flag
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param strictQuotes
-     *            if true, characters outside the quotes are ignored
-     */
-    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes) {
-        this(separator, quotechar, escape, strictQuotes, DEFAULT_IGNORE_LEADING_WHITESPACE);
-    }
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * Allows setting the "strict quotes" and "ignore leading whitespace" flags
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param strictQuotes
-     *            if true, characters outside the quotes are ignored
-     * @param ignoreLeadingWhiteSpace
-     *            if true, white space in front of a quote in a field is ignored
-     */
-    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
-        this.separator = separator;
-        this.quotechar = quotechar;
-        this.escape = escape;
-        this.strictQuotes = strictQuotes;
-        this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
-    }
-    /**
-     * 
-     * @return true if something was left over from last call(s)
-     */
-    public boolean isPending() {
-    	return pending != null;
-    }
-
-    public String[] parseLineMulti(String nextLine) throws IOException {
-    	return parseLine(nextLine, true);
-    }
-    
-    public String[]  parseLine(String nextLine) throws IOException {
-    	return parseLine(nextLine, false);
-    }
-    /**
-     * Parses an incoming String and returns an array of elements.
-     * 
-     * @param nextLine
-     *            the string to parse
-     * @param multi
-     * @return the comma-tokenized list of elements, or null if nextLine is null
-     * @throws IOException if bad things happen during the read
-     */
-    private String[] parseLine(String nextLine, boolean multi) throws IOException {
-
-    	if (!multi && pending != null) {
-    		pending = null;
-    	}
-    	
-        if (nextLine == null) {
-        	if (pending != null) {
-        		String s = pending;
-        		pending = null;
-        		return new String[] {s};
-        	} else {
-        		return null;
-        	}
-        }
-
-        List<String>tokensOnThisLine = new ArrayList<String>();
-        StringBuilder sb = new StringBuilder(INITIAL_READ_SIZE);
-        boolean inQuotes = false;
-        if (pending != null) {
-        	sb.append(pending);
-        	pending = null;
-        	inQuotes = true;
-        }
-        for (int i = 0; i < nextLine.length(); i++) {
-        	
-        	char c = nextLine.charAt(i);
-        	if (c == this.escape) {
-        		if( isNextCharacterEscapable(nextLine, inQuotes || inField, i) ){
-        			sb.append(nextLine.charAt(i+1));
-        			i++;
-        		}
-        	} else if (c == quotechar) {
-        		if( isNextCharacterEscapedQuote(nextLine, inQuotes || inField, i) ){
-        			sb.append(nextLine.charAt(i+1));
-        			i++;
-        		}else{
-        			inQuotes = !inQuotes;
-
-        			// the tricky case of an embedded quote in the middle: a,bc"d"ef,g
-                    if (!strictQuotes) {
-                        if(i>2 //not on the beginning of the line
-                                && nextLine.charAt(i-1) != this.separator //not at the beginning of an escape sequence
-                                && nextLine.length()>(i+1) &&
-                                nextLine.charAt(i+1) != this.separator //not at the	end of an escape sequence
-                        ){
-
-                            if (ignoreLeadingWhiteSpace && sb.length() > 0 && isAllWhiteSpace(sb)) {
-                                sb = new StringBuilder(INITIAL_READ_SIZE);  //discard white space leading up to quote
-                            } else {
-                                sb.append(c);
-                            }
-  
-                        }
-                    }
-        		}
-                inField = !inField;
-        	} else if (c == separator && !inQuotes) {
-        		tokensOnThisLine.add(sb.toString());
-        		sb = new StringBuilder(INITIAL_READ_SIZE); // start work on next token
-                inField = false;
-        	} else {
-                if (!strictQuotes || inQuotes){
-                    sb.append(c);
-                    inField = true;
-                }
-        	}
-        }
-        // line is done - check status
-        if (inQuotes) {
-        	if (multi) {
-        		// continuing a quoted section, re-append newline
-        		sb.append("\n");
-        		pending = sb.toString();
-        		sb = null; // this partial content is not to be added to field list yet
-        	} else {
-        		throw new IOException("Un-terminated quoted field at end of CSV line");
-        	}
-        }
-        if (sb != null) {
-        	tokensOnThisLine.add(sb.toString());
-        }
-        return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
-        
-    }
-    
-    /**  
-     * precondition: the current character is a quote or an escape
-	 * @param nextLine the current line
-	 * @param inQuotes true if the current context is quoted
-	 * @param i current index in line
-	 * @return true if the following character is a quote
-	 */
-	private boolean isNextCharacterEscapedQuote(String nextLine, boolean inQuotes, int i) {
-		return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
-		    && nextLine.length() > (i+1)  // there is indeed another character to check.
-		    && nextLine.charAt(i+1) == quotechar;
-	}
-
-	/**  
-	 * precondition: the current character is an escape
-	 * @param nextLine the current line
-	 * @param inQuotes true if the current context is quoted
-	 * @param i current index in line
-	 * @return true if the following character is a quote
-	 */
-	protected boolean isNextCharacterEscapable(String nextLine, boolean inQuotes, int i) {
-		return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
-		    && nextLine.length() > (i+1)  // there is indeed another character to check.
-		    && ( nextLine.charAt(i+1) == quotechar || nextLine.charAt(i+1) == this.escape);
-	}
-	
-	/**
-	 * precondition: sb.length() > 0
-	 * @param sb A sequence of characters to examine
-	 * @return true if every character in the sequence is whitespace
-	 */
-    protected boolean isAllWhiteSpace(CharSequence sb) {
-        boolean result = true;
-        for (int i = 0; i < sb.length(); i++) {
-            char c = sb.charAt(i);
-
-            if ( !Character.isWhitespace(c) ) {
-                return false;
-            }
-        }
-        return result;
-    }
-}
@@ -1,282 +0,0 @@
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package au.com.bytecode.opencsv;
-
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple CSV reader released under a commercial-friendly license.
- * 
- * @author Glen Smith
- * 
- */
-public class CSVReader implements Closeable {
-
-    private BufferedReader br;
-
-    private boolean hasNext = true;
-
-    private CSVParser parser;
-    
-    private int skipLines;
-
-    private boolean linesSkiped;
-
-    /**
-     * The default line to start reading.
-     */
-    public static final int DEFAULT_SKIP_LINES = 0;
-
-    /**
-     * Constructs CSVReader using a comma for the separator.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     */
-    public CSVReader(Reader reader) {
-        this(reader, CSVParser.DEFAULT_SEPARATOR, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVReader(Reader reader, char separator) {
-        this(reader, separator, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVReader(Reader reader, char separator, char quotechar) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator, quote char and quote handling
-     * behavior.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, boolean strictQuotes) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, strictQuotes);
-    }
-
-   /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     */
-
-    public CSVReader(Reader reader, char separator,
-			char quotechar, char escape) {
-        this(reader, separator, quotechar, escape, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
-	}
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param line
-     *            the line number to skip for start reading 
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, int line) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, line, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line) {
-        this(reader, separator, quotechar, escape, line, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes) {
-        this(reader, separator, quotechar, escape, line, strictQuotes, CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     * @param ignoreLeadingWhiteSpace
-     *            it true, parser should ignore white space before a quote in a field
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
-        this.br = new BufferedReader(reader);
-        this.parser = new CSVParser(separator, quotechar, escape, strictQuotes, ignoreLeadingWhiteSpace);
-        this.skipLines = line;
-    }
-
-	/**
-     * Reads the entire file into a List with each element being a String[] of
-     * tokens.
-     * 
-     * @return a List of String[], with each String[] representing a line of the
-     *         file.
-     * 
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    public List<String[]> readAll() throws IOException {
-
-        List<String[]> allElements = new ArrayList<String[]>();
-        while (hasNext) {
-            String[] nextLineAsTokens = readNext();
-            if (nextLineAsTokens != null)
-                allElements.add(nextLineAsTokens);
-        }
-        return allElements;
-
-    }
-
-    /**
-     * Reads the next line from the buffer and converts to a string array.
-     * 
-     * @return a string array with each comma-separated element as a separate
-     *         entry.
-     * 
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    public String[] readNext() throws IOException {
-    	
-    	String[] result = null;
-    	do {
-    		String nextLine = getNextLine();
-    		if (!hasNext) {
-    			return result; // should throw if still pending?
-    		}
-    		String[] r = parser.parseLineMulti(nextLine);
-    		if (r.length > 0) {
-    			if (result == null) {
-    				result = r;
-    			} else {
-    				String[] t = new String[result.length+r.length];
-    				System.arraycopy(result, 0, t, 0, result.length);
-    				System.arraycopy(r, 0, t, result.length, r.length);
-    				result = t;
-    			}
-    		}
-    	} while (parser.isPending());
-    	return result;
-    }
-
-    /**
-     * Reads the next line from the file.
-     * 
-     * @return the next line from the file without trailing newline
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    private String getNextLine() throws IOException {
-    	if (!this.linesSkiped) {
-            for (int i = 0; i < skipLines; i++) {
-                br.readLine();
-            }
-            this.linesSkiped = true;
-        }
-        String nextLine = br.readLine();
-        if (nextLine == null) {
-            hasNext = false;
-        }
-        return hasNext ? nextLine : null;
-    }
-
-    /**
-     * Closes the underlying reader.
-     * 
-     * @throws IOException if the close fails
-     */
-    public void close() throws IOException{
-    	br.close();
-    }
-    
-}
@@ -1,302 +0,0 @@
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package au.com.bytecode.opencsv;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * A very simple CSV writer released under a commercial-friendly license.
- *
- * @author Glen Smith
- *
- */
-public class CSVWriter implements Closeable {
-    
-    public static final int INITIAL_STRING_SIZE = 128;
-
-	private Writer rawWriter;
-
-    private PrintWriter pw;
-
-    private char separator;
-
-    private char quotechar;
-    
-    private char escapechar;
-    
-    private String lineEnd;
-
-    /** The character used for escaping quotes. */
-    public static final char DEFAULT_ESCAPE_CHARACTER = '"';
-
-    /** The default separator to use if none is supplied to the constructor. */
-    public static final char DEFAULT_SEPARATOR = ',';
-
-    /**
-     * The default quote character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_QUOTE_CHARACTER = '"';
-    
-    /** The quote constant to use when you wish to suppress all quoting. */
-    public static final char NO_QUOTE_CHARACTER = '\u0000';
-    
-    /** The escape constant to use when you wish to suppress all escaping. */
-    public static final char NO_ESCAPE_CHARACTER = '\u0000';
-    
-    /** Default line terminator uses platform encoding. */
-    public static final String DEFAULT_LINE_END = "\n";
-
-    private ResultSetHelper resultService = new ResultSetHelperService();
-    
-    /**
-     * Constructs CSVWriter using a comma for the separator.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     */
-    public CSVWriter(Writer writer) {
-        this(writer, DEFAULT_SEPARATOR);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVWriter(Writer writer, char separator) {
-        this(writer, separator, DEFAULT_QUOTE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar) {
-    	this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escapechar
-     *            the character to use for escaping quotechars or escapechars
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar) {
-        this(writer, separator, quotechar, escapechar, DEFAULT_LINE_END);
-    }
-    
-    
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param lineEnd
-     * 			  the line feed terminator to use
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, String lineEnd) {
-        this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER, lineEnd);
-    }   
-    
-    
-    
-    /**
-     * Constructs CSVWriter with supplied separator, quote char, escape char and line ending.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escapechar
-     *            the character to use for escaping quotechars or escapechars
-     * @param lineEnd
-     * 			  the line feed terminator to use
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar, String lineEnd) {
-        this.rawWriter = writer;
-        this.pw = new PrintWriter(writer);
-        this.separator = separator;
-        this.quotechar = quotechar;
-        this.escapechar = escapechar;
-        this.lineEnd = lineEnd;
-    }
-    
-    /**
-     * Writes the entire list to a CSV file. The list is assumed to be a
-     * String[]
-     *
-     * @param allLines
-     *            a List of String[], with each String[] representing a line of
-     *            the file.
-     */
-    public void writeAll(List<String[]> allLines)  {
-    	for (String[] line : allLines) {
-			writeNext(line);
-		}
-    }
-
-    protected void writeColumnNames(ResultSet rs)
-    	throws SQLException {
-
-    	writeNext(resultService.getColumnNames(rs));
-    }
-    
-    /**
-     * Writes the entire ResultSet to a CSV file.
-     *
-     * The caller is responsible for closing the ResultSet.
-     *
-     * @param rs the recordset to write
-     * @param includeColumnNames true if you want column names in the output, false otherwise
-     *
-     * @throws java.io.IOException thrown by getColumnValue
-     * @throws java.sql.SQLException thrown by getColumnValue
-     */
-    public void writeAll(java.sql.ResultSet rs, boolean includeColumnNames)  throws SQLException, IOException {
-    	
-    	
-    	if (includeColumnNames) {
-			writeColumnNames(rs);
-		}
-    	
-    	while (rs.next())
-    	{
-    		writeNext(resultService.getColumnValues(rs));
-    	}
-    }
-
-    
-    /**
-     * Writes the next line to the file.
-     *
-     * @param nextLine
-     *            a string array with each comma-separated element as a separate
-     *            entry.
-     */
-    public void writeNext(String[] nextLine) {
-    	
-    	if (nextLine == null)
-    		return;
-    	
-        StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
-        for (int i = 0; i < nextLine.length; i++) {
-
-            if (i != 0) {
-                sb.append(separator);
-            }
-
-            String nextElement = nextLine[i];
-            if (nextElement == null)
-                continue;
-            if (quotechar !=  NO_QUOTE_CHARACTER)
-            	sb.append(quotechar);
-            
-            sb.append(stringContainsSpecialCharacters(nextElement) ? processLine(nextElement) : nextElement);
-
-            if (quotechar != NO_QUOTE_CHARACTER)
-            	sb.append(quotechar);
-        }
-        
-        sb.append(lineEnd);
-        pw.write(sb.toString());
-
-    }
-
-	private boolean stringContainsSpecialCharacters(String line) {
-	    return line.indexOf(quotechar) != -1 || line.indexOf(escapechar) != -1;
-    }
-
-	protected StringBuilder processLine(String nextElement)
-    {
-		StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
-	    for (int j = 0; j < nextElement.length(); j++) {
-	        char nextChar = nextElement.charAt(j);
-	        if (escapechar != NO_ESCAPE_CHARACTER && nextChar == quotechar) {
-	        	sb.append(escapechar).append(nextChar);
-	        } else if (escapechar != NO_ESCAPE_CHARACTER && nextChar == escapechar) {
-	        	sb.append(escapechar).append(nextChar);
-	        } else {
-	            sb.append(nextChar);
-	        }
-	    }
-	    
-	    return sb;
-    }
-
-    /**
-     * Flush underlying stream to writer.
-     * 
-     * @throws IOException if bad things happen
-     */
-    public void flush() throws IOException {
-
-        pw.flush();
-
-    } 
-
-    /**
-     * Close the underlying stream writer flushing any buffered content.
-     *
-     * @throws IOException if bad things happen
-     *
-     */
-    public void close() throws IOException {
-        flush();
-        pw.close();
-        rawWriter.close();
-    }
-
-    /**
-     *  Checks to see if the there has been an error in the printstream. 
-     */
-    public boolean checkError() {
-        return pw.checkError();
-    }
-
-    public void setResultService(ResultSetHelper resultService) {
-        this.resultService = resultService;
-    }
-
-}
@@ -1,34 +0,0 @@
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package au.com.bytecode.opencsv;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * 
- * 
- * 
- * 
- * 
- */
-public interface ResultSetHelper {
-    public String[] getColumnNames(ResultSet rs) throws SQLException;
-
-    public String[] getColumnValues(ResultSet rs) throws SQLException, IOException;
-}
@@ -1,185 +0,0 @@
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package au.com.bytecode.opencsv;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.sql.*;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 
- * 
- *  helper class for processing JDBC ResultSet objects
- * 
- * 
- */
-public class ResultSetHelperService implements ResultSetHelper {
-    public static final int CLOBBUFFERSIZE = 2048;
-    
-    // note: we want to maintain compatibility with Java 5 VM's
-    // These types don't exist in Java 5
-	private static final int NVARCHAR = -9;
-	private static final int NCHAR = -15; 
-	private static final int LONGNVARCHAR = -16;
-	private static final int NCLOB = 2011;
-
-    public String[] getColumnNames(ResultSet rs) throws SQLException {
-        List<String> names = new ArrayList<String>();
-        ResultSetMetaData metadata = rs.getMetaData();
-
-        for (int i = 0; i < metadata.getColumnCount(); i++) {
-            names.add(metadata.getColumnName(i+1));
-        }
-
-        String[] nameArray = new String[names.size()];
-        return names.toArray(nameArray);
-    }
-
-    public String[] getColumnValues(ResultSet rs) throws SQLException, IOException {
-
-        List<String> values = new ArrayList<String>();
-        ResultSetMetaData metadata = rs.getMetaData();
-
-        for (int i = 0; i < metadata.getColumnCount(); i++) {
-            values.add(getColumnValue(rs, metadata.getColumnType(i + 1), i + 1));
-        }
-
-        String[] valueArray = new String[values.size()];
-        return values.toArray(valueArray);
-    }
-
-    private String handleObject(Object obj){
-        return obj == null ? "" : String.valueOf(obj);
-    }
-
-    private String handleBigDecimal(BigDecimal decimal) {
-        return decimal == null ? "" : decimal.toString();
-    }
-
-    private String handleLong(ResultSet rs, int columnIndex) throws SQLException {
-        long lv = rs.getLong(columnIndex);
-        return rs.wasNull() ? "" : Long.toString(lv);
-    }
-
-    private String handleInteger(ResultSet rs, int columnIndex) throws SQLException {
-        int i = rs.getInt(columnIndex);
-        return rs.wasNull() ? "" : Integer.toString(i);
-    }
-
-    private String handleDate(ResultSet rs, int columnIndex) throws SQLException {
-        java.sql.Date date = rs.getDate(columnIndex);
-        String value = null;
-        if (date != null) {
-            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yyyy");
-            value =  dateFormat.format(date);
-        }
-        return value;
-    }
-
-    private String handleTime(Time time) {
-        return time == null ? null : time.toString();
-    }
-
-    private String handleTimestamp(Timestamp timestamp) {
-        SimpleDateFormat timeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
-        return timestamp == null ? null : timeFormat.format(timestamp);
-    }
-
-    private String getColumnValue(ResultSet rs, int colType, int colIndex)
-    		throws SQLException, IOException {
-
-    	String value = "";
-
-		switch (colType)
-		{
-			case Types.BIT:
-            case Types.JAVA_OBJECT:
-				value = handleObject(rs.getObject(colIndex));
-			    break;
-			case Types.BOOLEAN:
-				boolean b = rs.getBoolean(colIndex);
-				value = Boolean.valueOf(b).toString();
-			    break;
-			case NCLOB: // todo : use rs.getNClob
-			case Types.CLOB:
-				Clob c = rs.getClob(colIndex);
-				if (c != null) {
-					value = read(c);
-				}
-			    break;
-			case Types.BIGINT:
-				value = handleLong(rs, colIndex);
-				break;
-			case Types.DECIMAL:
-			case Types.DOUBLE:
-			case Types.FLOAT:
-			case Types.REAL:
-			case Types.NUMERIC:
-				value = handleBigDecimal(rs.getBigDecimal(colIndex));
-			    break;
-			case Types.INTEGER:
-			case Types.TINYINT:
-			case Types.SMALLINT:
-                value = handleInteger(rs, colIndex);
-			    break;
-			case Types.DATE:
-				value = handleDate(rs, colIndex);
-			    break;
-			case Types.TIME:
-				value = handleTime(rs.getTime(colIndex));
-			    break;
-			case Types.TIMESTAMP:
-				value = handleTimestamp(rs.getTimestamp(colIndex));
-			    break;
-			case NVARCHAR: // todo : use rs.getNString
-			case NCHAR: // todo : use rs.getNString
-			case LONGNVARCHAR: // todo : use rs.getNString
-			case Types.LONGVARCHAR:
-			case Types.VARCHAR:
-			case Types.CHAR:
-				value = rs.getString(colIndex);
-			    break;
-			default:
-				value = "";
-		}
-
-
-		if (value == null)
-		{
-			value = "";
-		}
-
-		return value;
-
-    }
-
-    private static String read(Clob c) throws SQLException, IOException
-	{
-		StringBuilder sb = new StringBuilder( (int) c.length());
-		Reader r = c.getCharacterStream();
-		char[] cbuf = new char[CLOBBUFFERSIZE];
-		int n;
-		while ((n = r.read(cbuf, 0, cbuf.length)) != -1) {
-				sb.append(cbuf, 0, n);
-		}
-		return sb.toString();
-	}
-}
@@ -1,61 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import java.util.List;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-
-public class BukkitUtil {
-
-
-    private BukkitUtil()  {
-    }
-    
-    public static BlockVector toVector(Block block) {
-        return new BlockVector(block.getX(), block.getY(), block.getZ());
-    }
-    
-    public static Vector toVector(Location loc) {
-        return new Vector(loc.getX(), loc.getY(), loc.getZ());
-    }
-    
-    public static Vector toVector(org.bukkit.util.Vector vector) {
-        return new Vector(vector.getX(), vector.getY(), vector.getZ());
-    }
-    
-    public static Player matchSinglePlayer(Server server, String name) {
-        List<Player> players = server.matchPlayer(name);
-        if (players.size() == 0) {
-            return null;
-        }
-        return players.get(0);
-    }
-
-    public static Location toLocation(World world, Vector vec) {
-        return new Location(world, vec.getX(), vec.getY(), vec.getZ());
-    }
-
-}
@@ -1,292 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit;
-
-import com.sk89q.worldguard.blacklist.Blacklist;
-import com.sk89q.worldguard.blacklist.BlacklistLogger;
-import com.sk89q.worldguard.blacklist.loggers.ConsoleLoggerHandler;
-import com.sk89q.worldguard.blacklist.loggers.DatabaseLoggerHandler;
-import com.sk89q.worldguard.blacklist.loggers.FileLoggerHandler;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.bukkit.entity.CreatureType;
-import org.bukkit.util.config.Configuration;
-
-/**
- * Holds the configuration for individual worlds.
- * 
- * @author sk89q
- * @author Michael
- */
-public class WorldConfiguration {
-
-    private static final Logger logger = Logger
-            .getLogger("Minecraft.WorldGuard");
-
-    private WorldGuardPlugin plugin;
-
-    private String worldName;
-    private File configFile;
-    private File blacklistFile;
-
-    private Blacklist blacklist;
-
-    /* Configuration data start */
-    public boolean fireSpreadDisableToggle;
-    public boolean enforceOneSession;
-    public boolean itemDurability;
-    public boolean classicWater;
-    public boolean simulateSponge;
-    public int spongeRadius;
-    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 blockCreeperExplosions;
-    public boolean blockCreeperBlockDamage;
-    public int loginProtection;
-    public int spawnProtection;
-    public boolean kickOnDeath;
-    public boolean exactRespawn;
-    public boolean teleportToHome;
-    public boolean disableContactDamage;
-    public boolean disableFallDamage;
-    public boolean disableLavaDamage;
-    public boolean disableFireDamage;
-    public boolean disableDrowningDamage;
-    public boolean disableSuffocationDamage;
-    public boolean teleportOnSuffocation;
-    public boolean useRegions;
-    public boolean highFreqFlags;
-    public int regionWand = 287;
-    public Set<CreatureType> blockCreatureSpawn;
-    public boolean useiConomy;
-    public boolean buyOnClaim;
-    public double buyOnClaimPrice;
-    public int maxClaimVolume;
-    public boolean claimOnlyInsideExistingRegions;
-    public int maxRegionCountPerPlayer;
-    public boolean antiWolfDumbness;
-
-    /* Configuration data end */
-
-    /**
-     * Construct the object.
-     * 
-     * @param plugin 
-     * @param worldName 
-     */
-    public WorldConfiguration(WorldGuardPlugin plugin, String worldName) {
-        File baseFolder = new File(plugin.getDataFolder(), "worlds/" + worldName);
-        configFile = new File(baseFolder, "config.yml");
-        blacklistFile = new File(baseFolder, "blacklist.txt");
-        
-        this.plugin = plugin;
-        this.worldName = worldName;
-        
-        WorldGuardPlugin.createDefaultConfiguration(configFile, "config_world.yml");
-        WorldGuardPlugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
-
-        loadConfiguration();
-
-        logger.info("WorldGuard: Loaded configuration for world '" + worldName + '"');
-    }
-
-    /**
-     * Load the configuration.
-     */
-    private void loadConfiguration() {
-        Configuration config = new Configuration(this.configFile);
-        config.load();
- 
-        enforceOneSession = config.getBoolean("protection.enforce-single-session", true);
-        itemDurability = config.getBoolean("protection.item-durability", true);
-
-        classicWater = config.getBoolean("simulation.classic-water", false);
-        simulateSponge = config.getBoolean("simulation.sponge.enable", true);
-        spongeRadius = Math.max(1, config.getInt("simulation.sponge.radius", 3)) - 1;
-        redstoneSponges = config.getBoolean("simulation.sponge.redstone", false);
-        
-        pumpkinScuba = config.getBoolean("pumpkin-scuba", false);
-
-        noPhysicsGravel = config.getBoolean("physics.no-physics-gravel", false);
-        noPhysicsSand = config.getBoolean("physics.no-physics-sand", false);
-        allowPortalAnywhere = config.getBoolean("physics.allow-portal-anywhere", false);
-        preventWaterDamage = new HashSet<Integer>(config.getIntList("physics.disable-water-damage-blocks", null));
-
-        blockTNT = config.getBoolean("ignition.block-tnt", false);
-        blockLighter = config.getBoolean("ignition.block-lighter", false);
-
-        preventLavaFire = config.getBoolean("fire.disable-lava-fire-spread", true);
-        disableFireSpread = config.getBoolean("fire.disable-all-fire-spread", false);
-        disableFireSpreadBlocks = new HashSet<Integer>(config.getIntList("fire.disable-fire-spread-blocks", null));
-        allowedLavaSpreadOver = new HashSet<Integer>(config.getIntList("fire.lava-spread-blocks", null));
-
-        blockCreeperExplosions = config.getBoolean("mobs.block-creeper-explosions", false);
-        blockCreeperBlockDamage = config.getBoolean("mobs.block-creeper-block-damage", false);
-        antiWolfDumbness = config.getBoolean("mobs.anti-wolf-dumbness", false);
-
-        loginProtection = config.getInt("spawn.login-protection", 3);
-        spawnProtection = config.getInt("spawn.spawn-protection", 0);
-        kickOnDeath = config.getBoolean("spawn.kick-on-death", false);
-        exactRespawn = config.getBoolean("spawn.exact-respawn", false);
-        teleportToHome = config.getBoolean("spawn.teleport-to-home-on-death", false);
-
-        disableFallDamage = config.getBoolean("player-damage.disable-fall-damage", false);
-        disableLavaDamage = config.getBoolean("player-damage.disable-lava-damage", false);
-        disableFireDamage = config.getBoolean("player-damage.disable-fire-damage", false);
-        disableDrowningDamage = config.getBoolean("player-damage.disable-drowning-damage", false);
-        disableSuffocationDamage = config.getBoolean("player-damage.disable-suffocation-damage", false);
-        disableContactDamage = config.getBoolean("player-damage.disable-contact-damage", false);
-        teleportOnSuffocation = config.getBoolean("player-damage.teleport-on-suffocation", false);
-
-        useRegions = config.getBoolean("regions.enable", true);
-        highFreqFlags = config.getBoolean("regions.high-frequency-flags", false);
-        regionWand = config.getInt("regions.wand", 287);
-        maxClaimVolume = config.getInt("regions.max-claim-volume", 30000);
-        claimOnlyInsideExistingRegions = config.getBoolean("regions.claim-only-inside-existing-regions", false);
-        maxRegionCountPerPlayer = config.getInt("regions.max-region-count-per-player", 7);
-
-        useiConomy = config.getBoolean("iconomy.enable", false);
-        buyOnClaim = config.getBoolean("iconomy.buy-on-claim", false);
-        buyOnClaimPrice = config.getDouble("iconomy.buy-on-claim-price", 1.0);
-
-        blockCreatureSpawn = new HashSet<CreatureType>();
-        for (String creatureName : config.getStringList("mobs.block-creature-spawn", null)) {
-            CreatureType creature = CreatureType.fromName(creatureName);
-            
-            if (creature == null) {
-                logger.warning("WorldGuard: Unknown mob type '" + creatureName + "'");
-            } else {
-                blockCreatureSpawn.add(creature);
-            }
-        }
-
-        boolean useBlacklistAsWhitelist = config.getBoolean("blacklist.use-as-whitelist", false);
-
-        // Console log configuration
-        boolean logConsole = config.getBoolean("blacklist.logging.console.enable", true);
-
-        // Database log configuration
-        boolean logDatabase = config.getBoolean("blacklist.logging.database.enable", false);
-        String dsn = config.getString("blacklist.logging.database.dsn", "jdbc:mysql://localhost:3306/minecraft");
-        String user = config.getString("blacklist.logging.database.user", "root");
-        String pass = config.getString("blacklist.logging.database.pass", "");
-        String table = config.getString("blacklist.logging.database.table", "blacklist_events");
-
-        // File log configuration
-        boolean logFile = config.getBoolean("blacklist.logging.file.enable", false);
-        String logFilePattern = config.getString("blacklist.logging.file.path", "worldguard/logs/%Y-%m-%d.log");
-        int logFileCacheSize = Math.max(1, config.getInt("blacklist.logging.file.open-files", 10));
-
-        // Load the blacklist
-        try {
-            // If there was an existing blacklist, close loggers
-            if (blacklist != null) {
-                blacklist.getLogger().close();
-            }
-
-            // First load the blacklist data from worldguard-blacklist.txt
-            Blacklist blist = new BukkitBlacklist(useBlacklistAsWhitelist, plugin);
-            blist.load(blacklistFile);
-
-            // If the blacklist is empty, then set the field to null
-            // and save some resources
-            if (blist.isEmpty()) {
-                this.blacklist = null;
-            } else {
-                this.blacklist = blist;
-                logger.log(Level.INFO, "WorldGuard: Blacklist loaded.");
-
-                BlacklistLogger blacklistLogger = blist.getLogger();
-
-                if (logDatabase) {
-                    blacklistLogger.addHandler(new DatabaseLoggerHandler(dsn, user, pass, table, worldName));
-                }
-
-                if (logConsole) {
-                    blacklistLogger.addHandler(new ConsoleLoggerHandler(worldName));
-                }
-
-                if (logFile) {
-                    FileLoggerHandler handler =
-                            new FileLoggerHandler(logFilePattern, logFileCacheSize, worldName);
-                    blacklistLogger.addHandler(handler);
-                }
-            }
-        } catch (FileNotFoundException e) {
-            logger.log(Level.WARNING, "WorldGuard blacklist does not exist.");
-        } catch (IOException e) {
-            logger.log(Level.WARNING, "Could not load WorldGuard blacklist: "
-                    + e.getMessage());
-        }
-
-        // Print an overview of settings
-        if (config.getBoolean("summary-on-start", true)) {
-            logger.log(Level.INFO, enforceOneSession
-                    ? "WorldGuard: (" + worldName + ") Single session is enforced."
-                    : "WorldGuard: (" + worldName + ") Single session is NOT ENFORCED.");
-            logger.log(Level.INFO, blockTNT
-                    ? "WorldGuard: (" + worldName + ") TNT ignition is blocked."
-                    : "WorldGuard: (" + worldName + ") TNT ignition is PERMITTED.");
-            logger.log(Level.INFO, blockLighter
-                    ? "WorldGuard: (" + worldName + ") Lighters are blocked."
-                    : "WorldGuard: (" + worldName + ") Lighters are PERMITTED.");
-            logger.log(Level.INFO, preventLavaFire
-                    ? "WorldGuard: (" + worldName + ") Lava fire is blocked."
-                    : "WorldGuard: (" + worldName + ") Lava fire is PERMITTED.");
-            
-            if (disableFireSpread) {
-                logger.log(Level.INFO, "WorldGuard: (" + worldName + ") All fire spread is disabled.");
-            } else {
-                if (disableFireSpreadBlocks.size() > 0) {
-                    logger.log(Level.INFO, "WorldGuard: (" + worldName
-                            + ") Fire spread is limited to "
-                            + disableFireSpreadBlocks.size() + " block types.");
-                } else {
-                    logger.log(Level.INFO, "WorldGuard: (" + worldName
-                            + ") Fire spread is UNRESTRICTED.");
-                }
-            }
-        }
-    }
-
-    public Blacklist getBlacklist() {
-        return this.blacklist;
-    }
-
-    public String getWorldName() {
-        return this.worldName;
-    }
-
-}
@@ -1,573 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.sk89q.worldguard.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-import java.util.Iterator;
-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.Item;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.*;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.PluginManager;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
-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.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag.RegionGroup;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
-/**
- * Handles all events thrown in relation to a Player
- */
-public class WorldGuardPlayerListener extends PlayerListener {
-
-    /**
-     * Plugin.
-     */
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Construct the object;
-     * 
-     * @param plugin
-     */
-    public WorldGuardPlayerListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-
-    public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
-
-        pm.registerEvent(Event.Type.PLAYER_INTERACT, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_PICKUP_ITEM, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_JOIN, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.PLAYER_LOGIN, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.PLAYER_QUIT, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.PLAYER_BUCKET_FILL, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_BUCKET_EMPTY, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.PLAYER_RESPAWN, this, Priority.High, plugin);
-    }
-
-    /**
-     * Called when a player interacts with an item.
-     * 
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            handleBlockRightClick(event);
-        } else if (event.getAction() == Action.RIGHT_CLICK_AIR) {
-            handleAirRightClick(event);
-        }
-    }
-    
-    /**
-     * Called when a block is damaged.
-     * 
-     * @param event 
-     */
-    public void handleAirRightClick(PlayerInteractEvent event) {
-        /*if (event.isCancelled()) {
-            return;
-        }*/
-
-        Player player = event.getPlayer();
-        World world = player.getWorld();
-        ItemStack item = player.getItemInHand();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                            toVector(player.getLocation()),
-                    item.getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-    
-    /**
-     * Called when a block is damaged.
-     * 
-     * @param event 
-     */
-    public void handleBlockRightClick(PlayerInteractEvent event) {
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Block block = event.getClickedBlock();
-        World world = block.getWorld();
-        Material type = block.getType();
-        Player player = event.getPlayer();
-        ItemStack item = player.getItemInHand();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-        
-        if (wcfg.useRegions) {
-            Vector pt = toVector(block);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-            LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-            if (item.getTypeId() == wcfg.regionWand) {
-                if (set.size() > 0) {
-                    player.sendMessage(ChatColor.YELLOW + "Can you build? "
-                            + (set.canBuild(localPlayer) ? "Yes" : "No"));
-
-                    StringBuilder str = new StringBuilder();
-                    for (Iterator<ProtectedRegion> it = set.iterator(); it.hasNext();) {
-                        str.append(it.next().getId());
-                        if (it.hasNext()) {
-                            str.append(", ");
-                        }
-                    }
-
-                    player.sendMessage(ChatColor.YELLOW + "Applicable regions: " + str.toString());
-                } else {
-                    player.sendMessage(ChatColor.YELLOW + "WorldGuard: No defined regions here!");
-                }
-
-                event.setCancelled(true);
-                return;
-            }
-
-            if (item.getType() == Material.FLINT_AND_STEEL) {
-                if (!set.allows(DefaultFlag.LIGHTER)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if ((block.getType() == Material.CHEST
-                    || block.getType() == Material.DISPENSER
-                    || block.getType() == Material.FURNACE
-                    || block.getType() == Material.BURNING_FURNACE
-                    || block.getType() == Material.NOTE_BLOCK)) {
-                
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.allows(DefaultFlag.CHEST_ACCESS)
-                        && !set.canBuild(localPlayer)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-    
-            if (type == Material.LEVER || type == Material.STONE_BUTTON) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                        && !set.allows(DefaultFlag.USE)
-                        && !set.canBuild(localPlayer)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if (type == Material.CAKE_BLOCK) {
-                if (!set.canBuild(localPlayer)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            
-            if (type == Material.RAILS && item.getType() == Material.MINECART) {
-                if (!set.canBuild(localPlayer)
-                        && !set.allows(DefaultFlag.PLACE_VEHICLE)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            
-            if (item.getType() == Material.BOAT) {
-                if (!set.canBuild(localPlayer)
-                        && !set.allows(DefaultFlag.PLACE_VEHICLE)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to place vehicles here.");
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
-                    item.getTypeId()), false, false)) {
-                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.useRegions && wcfg.useiConomy && cfg.getiConomy() != null
-                    && (type == Material.SIGN_POST || type == Material.SIGN || type == Material.WALL_SIGN)) {
-            BlockState block = blockClicked.getState();
-
-            if (((Sign)block).getLine(0).equalsIgnoreCase("[WorldGuard]")
-                    && ((Sign)block).getLine(1).equalsIgnoreCase("For sale")) {
-                String regionId = ((Sign)block).getLine(2);
-                //String regionComment = ((Sign)block).getLine(3);
-
-                if (regionId != null && regionId != "") {
-                    RegionManager mgr = cfg.getWorldGuardPlugin().getGlobalRegionManager().get(player.getWorld().getName());
-                    ProtectedRegion region = mgr.getRegion(regionId);
-
-                    if (region != null) {
-                        RegionFlags flags = region.getFlags();
-
-                        if (flags.getBooleanFlag(DefaultFlag.BUYABLE).getValue(false)) {
-                            if (iConomy.getBank().hasAccount(player.getName())) {
-                                Account account = iConomy.getBank().getAccount(player.getName());
-                                double balance = account.getBalance();
-                                double regionPrice = flags.getDoubleFlag(DefaultFlag.PRICE).getValue();
-
-                                if (balance >= regionPrice) {
-                                    account.subtract(regionPrice);
-                                    player.sendMessage(ChatColor.YELLOW + "You have bought the region " + regionId + " for " +
-                                            iConomy.getBank().format(regionPrice));
-                                    DefaultDomain owners = region.getOwners();
-                                    owners.addPlayer(player.getName());
-                                    region.setOwners(owners);
-                                    flags.getBooleanFlag(DefaultFlag.BUYABLE).setValue(false);
-                                    account.save();
-                                } else {
-                                    player.sendMessage(ChatColor.YELLOW + "You have not enough money.");
-                                }
-                            } else {
-                                player.sendMessage(ChatColor.YELLOW + "You have not enough money.");
-                            }
-                        } else {
-                            player.sendMessage(ChatColor.RED + "Region: " + regionId + " is not buyable");
-                        } 
-                    } else {
-                        player.sendMessage(ChatColor.DARK_RED + "The region " + regionId + " does not exist.");
-                    }
-                } else {
-                    player.sendMessage(ChatColor.DARK_RED + "No region specified.");
-                }
-            }
-        }*/
-    }
-
-    /**
-     * Called when a player joins a server
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-
-        if (wcfg.fireSpreadDisableToggle) {
-            player.sendMessage(ChatColor.YELLOW
-                    + "Fire spread is currently globally disabled for this world.");
-        }
-        
-        if (plugin.inGroup(player, "wg-invincible")) {
-            cfg.enableGodMode(player);
-        }
-        
-        if (plugin.inGroup(player, "wg-amphibious")) {
-            cfg.enableAmphibiousMode(player);
-        }
-    }
-
-    /**
-     * Called when a player leaves a server
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        cfg.forgetPlayer(plugin.wrapPlayer(player));
-    }
-
-    /**
-     * Called when a player uses an item
-     * 
-     * @param event Relevant event details
-     *//*
-    @Override
-    public void onPlayerItem(PlayerItemEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        Block block = event.getBlockClicked();
-        ItemStack item = event.getItem();
-        int itemId = item.getTypeId();
-
-        GlobalConfiguration cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.getWorldConfig(player.getWorld().getName());
-
-        if (wcfg.useRegions
-                && (itemId == 322 || itemId == 320 || itemId == 319 || itemId == 297 || itemId == 260
-                        || itemId == 350 || itemId == 349 || itemId == 354) ) {
-            return;
-        }
-
-        if (!wcfg.itemDurability) {
-            // Hoes
-            if (item.getTypeId() >= 290 && item.getTypeId() <= 294) {
-                item.setDurability((byte) -1);
-                player.setItemInHand(item);
-            }
-        }
-
-        if (wcfg.useRegions && !event.isBlock() && block != null) {
-            Vector pt = toVector(block.getRelative(event.getBlockFace()));
-            if (block.getType() == Material.WALL_SIGN) {
-                pt = pt.subtract(0, 1, 0);
-            }
-
-            if (!cfg.canBuild(player, pt)) {
-                player.sendMessage(ChatColor.DARK_RED
-                        + "You don't have permission for this area.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.getBlacklist() != null && item != null && block != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                    toVector(block.getRelative(event.getBlockFace())),
-                    item.getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.useRegions && item != null && block != null && item.getTypeId() == 259) {
-            Vector pt = toVector(block.getRelative(event.getBlockFace()));
-            RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld().getName());
-
-            if (!mgr.getApplicableRegions(pt).isStateFlagAllowed(DefaultFlag.LIGHTER)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }*/
-
-    /**
-     * Called when a player attempts to log in to the server
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerLogin(PlayerLoginEvent event) {
-        Player player = event.getPlayer();
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-
-        if (wcfg.enforceOneSession) {
-            String name = player.getName();
-
-            for (Player pl : plugin.getServer().getOnlinePlayers()) {
-                if (pl.getName().equalsIgnoreCase(name)) {
-                    pl.kickPlayer("Logged in from another location.");
-                }
-            }
-        }
-    }
-
-    /**
-     * Called when a player attempts to drop an item
-     *
-     * @param event Relevant event details
-     */
-    @Override
-    public void onPlayerDropItem(PlayerDropItemEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getPlayer().getWorld());
-
-        if (wcfg.getBlacklist() != null) {
-            Item ci = event.getItemDrop();
-
-            if (!wcfg.getBlacklist().check(
-                    new ItemDropBlacklistEvent(plugin.wrapPlayer(event.getPlayer()),
-                            toVector(ci.getLocation()), ci.getItemStack().getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Called when a player attempts to pickup an item
-     * 
-     * @param event
-     *            Relevant event details
-     */
-    @Override
-    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getPlayer().getWorld());
-
-        if (wcfg.getBlacklist() != null) {
-            Item ci = event.getItem();
-
-            if (!wcfg.getBlacklist().check(
-                    new ItemAcquireBlacklistEvent(plugin.wrapPlayer(event.getPlayer()),
-                            toVector(ci.getLocation()), ci.getItemStack().getTypeId()), false, true)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Called when a bucket is filled.
-     */
-    @Override
-    public void onPlayerBucketFill(PlayerBucketFillEvent event) {
-        Player player = event.getPlayer();
-        World world = player.getWorld();
-        
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-        
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlockClicked())) {
-            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-            event.setCancelled(true);
-            return;
-        }
-        
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                            toVector(player.getLocation()), event.getBucket().getId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Called when a bucket is empty.
-     */
-    @Override
-    public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
-        Player player = event.getPlayer();
-        World world = player.getWorld();
-        
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-        
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlockClicked())) {
-            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-            event.setCancelled(true);
-            return;
-        }
-        
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                            toVector(player.getLocation()), event.getBucket().getId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-    
-    @Override
-    public void onPlayerRespawn(PlayerRespawnEvent event) {
-        Player player = event.getPlayer();
-        Location location = player.getLocation();
-        
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-        
-        if (wcfg.useRegions) {
-            Vector pt = toVector(location);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-    
-            Vector spawn = set.getFlag(DefaultFlag.SPAWN_LOC);
-    
-            if (spawn != null) {
-                RegionGroup group = set.getFlag(DefaultFlag.SPAWN_PERM);
-                Location spawnLoc = BukkitUtil.toLocation(player.getWorld(), spawn);
-                
-                if (group != null) {
-                    LocalPlayer localPlayer = plugin.wrapPlayer(player);
-                    
-                    if (group == RegionGroup.OWNERS) {
-                        if (set.isOwnerOfAll(localPlayer)) {
-                            event.setRespawnLocation(spawnLoc);
-                        }
-                    } else if (group == RegionGroup.MEMBERS) {
-                        if (set.isMemberOfAll(localPlayer)) {
-                            event.setRespawnLocation(spawnLoc);
-                        }
-                    }
-                } else {
-                    event.setRespawnLocation(spawnLoc);
-                }
-            }
-        }
-    }
-}
@@ -1,41 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-/**
- *
- * @author Redecouverte
- */
-public class TimedFlagPlayerInfo {
-
-    public long lastHealTick;
-    public Long sheduledHealTick;
-    public int sheduledHealAmount;
-    public String lastRegion;
-    public String lastFarewellMsg;
-
-    public TimedFlagPlayerInfo()
-    {
-        this.sheduledHealTick = null;
-        this.lastRegion = null;
-        this.lastFarewellMsg = null;
-    }
-
-}
@@ -1,174 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.BukkitPlayer;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import java.util.HashMap;
-import java.util.Map;
-import org.bukkit.entity.Player;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
-
-/**
- * Timer for handling flags that require a constant timer..
- * 
- * @author Michael
- */
-public class TimedFlagsTimer implements Runnable {
-
-    private WorldGuardPlugin plugin;
-
-    private Map<String, TimedFlagPlayerInfo> playerData;
-
-    /**
-     * Construct the object.
-     * 
-     * @param plugin
-     */
-    public TimedFlagsTimer(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-        this.playerData = new HashMap<String, TimedFlagPlayerInfo>();
-    }
-
-    private TimedFlagPlayerInfo getPlayerInfo(String name) {
-        TimedFlagPlayerInfo ret = playerData.get(name);
-        if (ret == null) {
-            ret = new TimedFlagPlayerInfo();
-            playerData.put(name, ret);
-        }
-
-        return ret;
-    }
-
-    public void run() {
-/*
-        // get players
-        Player[] players = plugin.getServer().getOnlinePlayers();
-
-        for (Player player : players) {
-
-            TimedFlagPlayerInfo nfo = getPlayerInfo(player.getName());
-            long now = System.currentTimeMillis();
-
-            // check healing flag
-            if (nfo.sheduledHealTick != null && now >= nfo.sheduledHealTick) {
-                player.setHealth(player.getHealth() + nfo.sheduledHealAmount);
-                nfo.sheduledHealTick = null;
-                nfo.lastHealTick = now;
-            }
-
-            if (player.getWorld().getName() == null) {
-                continue;
-            }
-            RegionManager mgr = plugin.getGlobalRegionManager().get(
-                    player.getWorld().getName());
-            ApplicableRegionSet regions = mgr
-                    .getApplicableRegions(toVector(player.getLocation()));
-
-            Integer healDelay = regions.getFlag(DefaultFlag.HEAL_DELAY);
-
-            if (healDelay > 0) {
-                healDelay *= 1000;
-                int healAmount = regions.getIntegerFlag(
-                        DefaultFlag.HEAL_AMOUNT, true).getValue(1);
-                if (now - nfo.lastHealTick > healDelay) {
-                    if (player.getHealth() < 20) {
-                        if (player.getHealth() + healAmount > 20) {
-                            player.setHealth(20);
-                        } else {
-                            player.setHealth(player.getHealth() + healAmount);
-                        }
-                    }
-                } else {
-                    nfo.sheduledHealTick = now + healDelay;
-                    nfo.sheduledHealAmount = healAmount;
-                }
-            }
-
-            // check greeting/farewell flag
-            String newRegionName = regions.getAffectedRegionId();
-
-            if (newRegionName != null) {
-
-                if (nfo.lastRegion == null
-                        || !newRegionName.equals(nfo.lastRegion)) {
-                    String newGreetMsg = regions.getStringFlag(
-                            DefaultFlag.GREET_MESSAGE, true).getValue();
-                    String farewellMsg = regions.getStringFlag(
-                            DefaultFlag.FAREWELL_MESSAGE, true).getValue();
-
-                    if (nfo.lastFarewellMsg != null) {
-                        player.sendMessage(nfo.lastFarewellMsg);
-                        nfo.lastFarewellMsg = null;
-                    }
-                    if (newGreetMsg != null) {
-                        player.sendMessage(newGreetMsg);
-                    }
-                    if (regions.getBooleanFlag(DefaultFlag.NOTIFY_GREET, false)
-                            .getValue(false)) {
-                        broadcastNotification(ChatColor.YELLOW + "Player "
-                                + player.getName() + " entered region "
-                                + newRegionName);
-                    }
-                    nfo.lastFarewellMsg = farewellMsg;
-                    nfo.lastRegion = newRegionName;
-                }
-            } else {
-                if (nfo.lastRegion != null) {
-                    if (nfo.lastFarewellMsg != null) {
-                        player.sendMessage(nfo.lastFarewellMsg);
-                        nfo.lastFarewellMsg = null;
-                    }
-                    if (regions.getBooleanFlag(DefaultFlag.NOTIFY_FAREWELL,
-                            false).getValue(false)) {
-                        broadcastNotification(ChatColor.YELLOW + "Player "
-                                + player.getName() + " left region "
-                                + nfo.lastRegion);
-                    }
-                    nfo.lastRegion = null;
-                }
-            }
-
-            // check passthrough flag
-            LocalPlayer lplayer = BukkitPlayer.wrapPlayer(plugin, player);
-            if (!regions.isStateFlagAllowed(DefaultFlag.PASSTHROUGH, lplayer)) {
-                Location newLoc = player.getLocation().clone();
-                newLoc.setX(newLoc.getBlockX() - 30);
-                newLoc.setY(newLoc.getWorld().getHighestBlockYAt(newLoc) + 1);
-                player.teleportTo(newLoc);
-            }
-
-        }*/
-    }
-
-    public void broadcastNotification(String msg) {
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            if (plugin.hasPermission(player, "notify_onenter")) {
-                player.sendMessage(msg);
-            }
-        }
-    }
-
-}
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>default</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <files>
+    <file>
+      <source>${project.build.directory}/${artifactId}-${project.version}.jar</source>
+      <destName>WorldGuard.jar</destName>
+      <outputDirectory>/</outputDirectory>
+      <filtered>false</filtered>
+    </file>
+    <file>
+      <source>README.html</source>
+      <outputDirectory>/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+  </files>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
+        <include>blacklist_table.sql</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
@@ -19,7 +19,6 @@

 package com.sk89q.worldguard.bukkit;

-import org.bukkit.entity.Player;
 import com.sk89q.worldguard.blacklist.Blacklist;

 public class BukkitBlacklist extends Blacklist {
@@ -32,11 +31,7 @@ public class BukkitBlacklist extends Blacklist {
    
    @Override
    public void broadcastNotification(String msg) {
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            if (plugin.hasPermission(player, "worldguard.notify")) {
-                player.sendMessage(msg);
-            }
-        }
+        plugin.broadcastNotification(msg);
    }

 }
@@ -0,0 +1,142 @@
+// $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 java.util.List;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.World;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+
+public class BukkitUtil {
+
+
+    private BukkitUtil()  {
+    }
+    
+    /**
+     * Converts the location of a Bukkit block to a WorldEdit vector.
+     * 
+     * @param block
+     * @return
+     */
+    public static BlockVector toVector(Block block) {
+        return new BlockVector(block.getX(), block.getY(), block.getZ());
+    }
+    
+    /**
+     * Converts a Bukkit location to a WorldEdit vector.
+     * 
+     * @param loc
+     * @return
+     */
+    public static Vector toVector(Location loc) {
+        return new Vector(loc.getX(), loc.getY(), loc.getZ());
+    }
+    
+    /**
+     * Converts a Bukkit vector to a WorldEdit vector.
+     * 
+     * @param vector
+     * @return
+     */
+    public static Vector toVector(org.bukkit.util.Vector vector) {
+        return new Vector(vector.getX(), vector.getY(), vector.getZ());
+    }
+
+    /**
+     * Converts a WorldEdit vector to a Bukkit location.
+     * 
+     * @param world
+     * @param vec 
+     * @return
+     */
+    public static Location toLocation(World world, Vector vec) {
+        return new Location(world, vec.getX(), vec.getY(), vec.getZ());
+    }
+    
+    /**
+     * Matches one player based on name.
+     * 
+     * @param server
+     * @param name
+     * @return
+     */
+    public static Player matchSinglePlayer(Server server, String name) {
+        List<Player> players = server.matchPlayer(name);
+        if (players.size() == 0) {
+            return null;
+        }
+        return players.get(0);
+    }
+    
+    /**
+     * Drops a sign item and removes a sign.
+     * 
+     * @param block
+     */
+    public static void dropSign(Block block) {
+        block.setTypeId(0);
+        block.getWorld().dropItemNaturally(block.getLocation(),
+                new ItemStack(Material.SIGN));
+    }
+
+    /**
+     * Sets the given block to fluid water.
+     * Used by addSpongeWater()
+     * 
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     */
+    public static void setBlockToWater(World world, int ox, int oy, int oz) {
+        Block block = world.getBlockAt(ox, oy, oz);
+        int id = block.getTypeId();
+        if (id == 0) {
+            block.setTypeId(8);
+        }
+    }
+
+    /**
+     * Checks if the given block is water
+     * 
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     * @return 
+     */
+    public static boolean isBlockWater(World world, int ox, int oy, int oz) {
+        Block block = world.getBlockAt(ox, oy, oz);
+        int id = block.getTypeId();
+        if (id == 8 || id == 9) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+}
@@ -37,6 +37,23 @@ import org.bukkit.util.config.Configuration;
 * @author Michael
 */
 public class ConfigurationManager {
+    
+    public static final String CONFIG_HEADER = "#\r\n" +
+            "# WorldGuard's configuration file\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" +
+            "#   you use an editor like Notepad++ (recommended for Windows users), you\r\n" +
+            "#   must configure it to \"replace tabs with spaces.\" In Notepad++, this can\r\n" +
+            "#   be changed in Settings > Preferences > Language Menu.\r\n" +
+            "# - Don't get rid of the indents. They are indented so some entries are\r\n" +
+            "#   in categories (like \"enforce-single-session\" is in the \"protection\"\r\n" +
+            "#   category.\r\n" +
+            "# - If you want to check the format of this file before putting it\r\n" +
+            "#   into WorldGuard, paste it into http://yaml-online-parser.appspot.com/\r\n" +
+            "#   and see if it gives \"ERROR:\".\r\n" +
+            "# - Lines starting with # are comments and so they are ignored.\r\n" +
+            "#\r\n";

    /**
     * Reference to the plugin.
@@ -59,6 +76,8 @@ public class ConfigurationManager {
    private Set<String> hasAmphibious = new HashSet<String>();
    
    public boolean suppressTickSyncWarnings;
+    public boolean useRegionsScheduler;
+    public boolean activityHaltToggle = false;

    /**
     * Construct the object.
@@ -83,11 +102,16 @@ public class ConfigurationManager {

        suppressTickSyncWarnings = config.getBoolean(
                "suppress-tick-sync-warnings", false);
+        useRegionsScheduler = config.getBoolean(
+                "regions.use-scheduler", true);

        // Load configurations for each world
        for (World world : plugin.getServer().getWorlds()) {
            get(world);
        }
+
+        config.setHeader(CONFIG_HEADER);
+        config.save();
    }

    /**
@@ -0,0 +1,159 @@
+// $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 java.util.HashMap;
+import java.util.Map;
+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
+ * as a scheduled task.
+ * 
+ * @author sk89q
+ */
+public class FlagStateManager implements Runnable {
+    
+    public static final int RUN_DELAY = 20;
+    
+    private WorldGuardPlugin plugin;
+    private Map<String, PlayerFlagState> states;
+    
+    /**
+     * Construct the object.
+     * 
+     * @param plugin
+     */
+    public FlagStateManager(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+        
+        states = new HashMap<String, PlayerFlagState>();
+    }
+
+    /**
+     * Run the task.
+     */
+    public void run() {
+        Player[] players = plugin.getServer().getOnlinePlayers();
+        ConfigurationManager config = plugin.getGlobalStateManager();
+
+        for (Player player : players) {
+            WorldConfiguration worldConfig = config.get(player.getWorld());
+            
+            if (!worldConfig.useRegions) {
+                continue;
+            }
+            
+            PlayerFlagState state;
+            
+            synchronized (this) {
+                state = states.get(player.getName());
+                
+                if (state == null) {
+                    state = new PlayerFlagState();
+                    states.put(player.getName(), state);
+                }
+            }
+
+            Vector playerLocation = toVector(player.getLocation());
+            RegionManager regionManager = plugin.getGlobalRegionManager()
+                    .get(player.getWorld());
+            ApplicableRegionSet applicable = regionManager
+                    .getApplicableRegions(playerLocation);
+            
+            processHeal(applicable, player, state);
+        }
+    }
+    
+    /**
+     * Process healing for a player.
+     * 
+     * @param applicable
+     * @param player
+     * @param state
+     */
+    private void processHeal(ApplicableRegionSet applicable, Player player,
+            PlayerFlagState state) {
+        
+        if (player.getHealth() >= 20 || player.getHealth() <= 0) {
+            return;
+        }
+        
+        long now = System.currentTimeMillis();
+
+        Integer healAmount = applicable.getFlag(DefaultFlag.HEAL_AMOUNT);
+        Integer healDelay = applicable.getFlag(DefaultFlag.HEAL_DELAY);
+        
+        if (healAmount == null || healDelay == null || healAmount < 1 || healDelay < 0) {
+            return;
+        }
+        
+        if (healDelay <= 0) {
+            player.setHealth(20);
+            state.lastHeal = now;
+        } else if (now - state.lastHeal > healDelay * 1000) {
+            player.setHealth(Math.min(20, player.getHealth() + healAmount));
+            state.lastHeal = now;
+        }
+    }
+    
+    /**
+     * Forget a player.
+     * 
+     * @param player
+     */
+    public synchronized void forget(Player player) {
+        states.remove(player.getName());
+    }
+    
+    /**
+     * Get a player's flag state.
+     * 
+     * @param player
+     * @return
+     */
+    public synchronized PlayerFlagState getState(Player player) {
+        PlayerFlagState state = states.get(player.getName());
+        
+        if (state == null) {
+            state = new PlayerFlagState();
+            states.put(player.getName(), state);
+        }
+        
+        return state;
+    }
+    
+    /**
+     * Keeps state per player.
+     */
+    public static class PlayerFlagState {
+        public long lastHeal;
+        public String lastGreeting;
+        public String lastFarewell;
+        public Boolean notifiedForEnter = false;
+        public Boolean notifiedForLeave = false;
+    }
+
+}
@@ -31,7 +31,6 @@ import java.util.List;
 import java.util.Map;
 import org.bukkit.Server;
 import org.bukkit.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.plugin.Plugin;
 import com.sk89q.worldguard.protection.GlobalRegionManager;
@@ -40,50 +39,71 @@ import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.StateFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.util.LogListBlock;

 public class ReportWriter {

    private static final SimpleDateFormat dateFmt =
        new SimpleDateFormat("yyyy-MM-dd kk:mm Z");
    
-    private WorldGuardPlugin plugin;
    private Date date = new Date();
    private StringBuilder output = new StringBuilder();
    
    public ReportWriter(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-        
-        appendHeader(plugin);
+        appendReportHeader(plugin);
        appendServerInformation(plugin.getServer());
        appendPluginInformation(plugin.getServer().getPluginManager().getPlugins());
        appendWorldInformation(plugin.getServer().getWorlds());
-        appendGlobalConfiguration(plugin.getGlobalConfiguration());
+        appendGlobalConfiguration(plugin.getGlobalStateManager());
        appendWorldConfigurations(plugin, plugin.getServer().getWorlds(),
-                plugin.getGlobalRegionManager(), plugin.getGlobalConfiguration());
-        appendRule();
+                plugin.getGlobalRegionManager(), plugin.getGlobalStateManager());
+        appendln("-------------");
        appendln("END OF REPORT");
        appendln();
    }
    
-    private void appendln(String text) {
+    protected static String repeat(String str, int n) {
+        if(str == null) {
+            return null;
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < n; i++) {
+            sb.append(str);
+        }
+        
+        return sb.toString();
+    }
+    
+    protected void appendln(String text) {
        output.append(text);
        output.append("\r\n");
    }
    
-    private void appendln(String text, Object ... args) {
+    protected void appendln(String text, Object ... args) {
        output.append(String.format(text, args));
        output.append("\r\n");
    }
    
-    private void appendln() {
+    protected void append(LogListBlock log) {
+        output.append(log.toString());
+    }
+    
+    protected void appendln() {
        output.append("\r\n");
    }
    
-    private void appendRule() {
-        output.append("--------------------------------------------------\r\n");
+    protected void appendHeader(String text) {
+        String rule = repeat("-", text.length());
+        output.append(rule);
+        output.append("\r\n");
+        appendln(text);
+        output.append(rule);
+        output.append("\r\n");
+        appendln();
    }
    
-    private void appendHeader(WorldGuardPlugin plugin) {
+    private void appendReportHeader(WorldGuardPlugin plugin) {
        appendln("WorldGuard Configuration Report");
        appendln("Generated " + dateFmt.format(date));
        appendln();
@@ -92,76 +112,103 @@ public class ReportWriter {
    }
    
    private void appendGlobalConfiguration(ConfigurationManager config) {
-        appendRule();
-        appendln("GLOBAL CONFIGURATION:");
-        appendRule();
-        appendln();
+        appendHeader("Global Configuration");
+        
+        LogListBlock log = new LogListBlock();
+        LogListBlock configLog = log.putChild("Configuration");
        
        Class<? extends ConfigurationManager> cls = config.getClass();
        for (Field field : cls.getFields()) {
            try {
                Object val = field.get(config);
-                appendln("%-30s: %s", field.getName(), String.valueOf(val));
+                configLog.put(field.getName(), val);
            } catch (IllegalArgumentException e) {
                e.printStackTrace();
            } catch (IllegalAccessException e) {
            }
        }
        
+        append(log);
        appendln();
    }
    
    private void appendServerInformation(Server server) {
-        appendRule();
-        appendln("SERVER:");
-        appendRule();
-        appendln();
-
-        appendln("%-15s: %s", "Server ID", server.getServerId());
-        appendln("%-15s: %s", "Server name", server.getServerName());
-        appendln("%-15s: %s", "Implementation", server.getVersion());
-        //appendln("%-15s: %s:%d", "Address", server.getIp(), server.getPort());
-        appendln("%-15s: %d/%d", "Player count", 
-                server.getOnlinePlayers().length, server.getMaxPlayers());
+        appendHeader("Server Information");
        
+        LogListBlock log = new LogListBlock();
+        
+        Runtime runtime = Runtime.getRuntime();
+
+        log.put("Java", "%s %s (%s)",
+                System.getProperty("java.vendor"),
+                System.getProperty("java.version"),
+                System.getProperty("java.vendor.url"));
+        log.put("Operating system", "%s %s (%s)",
+                System.getProperty("os.name"),
+                System.getProperty("os.version"),
+                System.getProperty("os.arch"));
+        log.put("Available processors", runtime.availableProcessors());
+        log.put("Free memory", runtime.freeMemory() / 1024 / 1024 + " MB");
+        log.put("Max memory", runtime.maxMemory() / 1024 / 1024 + " MB");
+        log.put("Total memory", runtime.totalMemory() / 1024 / 1024 + " MB");
+        log.put("Server ID", server.getServerId());
+        log.put("Server name", server.getServerName());
+        log.put("Implementation", server.getVersion());
+        //log.put("Address", server.getIp(), server.getPort());
+        log.put("Player count", "%d/%d",
+                server.getOnlinePlayers().length, server.getMaxPlayers());
+
+        append(log);
        appendln();
    }
    
    private void appendPluginInformation(Plugin[] plugins) {
-        appendRule();
-        appendln("PLUGINS (%d)", plugins.length);
-        appendRule();
-        appendln();
+        appendHeader("Plugins");
+        
+        LogListBlock log = new LogListBlock();
        
        for (Plugin plugin : plugins) {
-            appendln("%s %s <%s>:", plugin.getDescription().getName(),
-                    plugin.getDescription().getVersion(),
-                    plugin.getDescription().getWebsite());
-            appendln("    %-15s: %s", "Entry point", plugin.getDescription().getMain());
-            appendln("    %-15s: %s", "Data folder", plugin.getDataFolder().getAbsoluteFile());
+            log.put(plugin.getDescription().getName(), plugin.getDescription().getVersion());
        }
-        
+
+        append(log);
        appendln();
+        
+        /*appendHeader("Plugin Information");
+        
+        log = new LogListBlock();
+        
+        for (Plugin plugin : plugins) {
+            log.putChild(plugin.getDescription().getName())
+                .put("Data folder", plugin.getDataFolder())
+                .put("Website", plugin.getDescription().getWebsite())
+                .put("Entry point", plugin.getDescription().getMain());
+        }
+
+        append(log);
+        appendln();*/
    }
    
    private void appendWorldInformation(List<World> worlds) {
-        appendRule();
-        appendln("WORLDS (%d)", worlds.size());
-        appendRule();
-        appendln();
+        appendHeader("Worlds");
+        
+        LogListBlock log = new LogListBlock();
        
        int i = 0;
        for (World world : worlds) {
            int loadedChunkCount = world.getLoadedChunks().length;
            
-            appendln("%d. %s:", i, world.getName());
-            appendln("    Information:");
-            appendln("        %-15s: %s", "ID", world.getId());
-            appendln("        %-15s: %s", "Environment", world.getEnvironment().toString());
-            appendln("        %-15s: %d", "Player #", world.getPlayers().size());
-            appendln("        %-15s: %d", "Entity #", world.getEntities().size());
-            appendln("        %-15s: %d", "Loaded chunk #", loadedChunkCount);
-            appendln("    Entities:");
+            LogListBlock worldLog = log.putChild(world.getName() + " (" +  i + ")");
+            LogListBlock infoLog = worldLog.putChild("Information");
+            LogListBlock entitiesLog = worldLog.putChild("Entities");
+            
+            infoLog.put("ID", world.getId());
+            infoLog.put("Environment", world.getEnvironment().toString());
+            infoLog.put("Player count", world.getPlayers().size());
+            infoLog.put("Entity count", world.getEntities().size());
+            infoLog.put("Loaded chunk count", loadedChunkCount);
+            infoLog.put("Spawn location", world.getSpawnLocation());
+            infoLog.put("Raw time", world.getFullTime());
            
            Map<Class<? extends Entity>, Integer> entityCounts =
                    new HashMap<Class<? extends Entity>, Integer>();
@@ -180,83 +227,84 @@ public class ReportWriter {
            // Print entities
            for (Map.Entry<Class<? extends Entity>, Integer> entry
                    : entityCounts.entrySet()) {
-                appendln("        %-25s: %d [%f]", entry.getKey().getSimpleName(),
-                        entry.getValue(), (float) (entry.getValue() / (double) loadedChunkCount));
+                entitiesLog.put(entry.getKey().getSimpleName(),
+                        "%d [%f]",
+                        entry.getValue(),
+                        (float) (entry.getValue() / (double) loadedChunkCount));
            }
            
            i++;
        }
-        
+
+        append(log);
        appendln();
    }
    
    private void appendWorldConfigurations(WorldGuardPlugin plugin, List<World> worlds,
            GlobalRegionManager regionMgr, ConfigurationManager mgr) {
-        appendRule();
-        appendln("WORLD CONFIGURATIONS");
-        appendRule();
-        appendln();
+        appendHeader("World Configurations");
+        
+        LogListBlock log = new LogListBlock();

        int i = 0;
        for (World world : worlds) {
-            appendln("%d. %s:", i, world.getName());
+            LogListBlock worldLog = log.putChild(world.getName() + " (" +  i + ")");
+            LogListBlock infoLog = worldLog.putChild("Information");
+            LogListBlock configLog = worldLog.putChild("Configuration");
+            LogListBlock blacklistLog = worldLog.putChild("Blacklist");
+            LogListBlock regionsLog = worldLog.putChild("Region manager");
+
+            infoLog.put("Configuration file", (new File(plugin.getDataFolder(), "worlds/"
+                    + world.getName() + "/config.yml")).getAbsoluteFile());
+
+            infoLog.put("Blacklist file", (new File(plugin.getDataFolder(), "worlds/"
+                    + world.getName() + "/blacklist.txt")).getAbsoluteFile());
+            infoLog.put("Regions file", (new File(plugin.getDataFolder(), "worlds/"
+                    + world.getName() + "/regions.yml")).getAbsoluteFile());
            
            WorldConfiguration config = mgr.get(world);
            
-            appendln("    Configuration:");
-            appendln("        %-30s: %s", "File",
-                    (new File(plugin.getDataFolder(), "worlds/"
-                            + world.getName() + "/config.yml")).getAbsoluteFile());
-            
            Class<? extends WorldConfiguration> cls = config.getClass();
            for (Field field : cls.getFields()) {
                try {
                    Object val = field.get(config);
-                    appendln("        %-30s: %s", field.getName(), String.valueOf(val));
+                    configLog.put(field.getName(), String.valueOf(val));
                } catch (IllegalArgumentException e) {
                    e.printStackTrace();
                } catch (IllegalAccessException e) {
                }
            }
-
-            appendln("    Blacklist:");
-            appendln("        %-15s: %s", "File",
-                    (new File(plugin.getDataFolder(), "worlds/"
-                            + world.getName() + "/blacklist.txt")).getAbsoluteFile());
+            
            if (config.getBlacklist() == null) {
-                appendln("        DISABLED / NO ENTRIES");
+                blacklistLog.put("State", "DISABLED");
            } else {
-                appendln("        %-15s: %s", "Number of items",
+                blacklistLog.put("State", "Enabled");
+                blacklistLog.put("Number of items",
                        config.getBlacklist().getItemCount());
-                appendln("        %-15s: %s", "Is whitelist",
-                        config.getBlacklist().isWhitelist() ? "YES" : "NO");
+                blacklistLog.put("Is whitelist",
+                        config.getBlacklist().isWhitelist());
            }

-            appendln("    Region manager:");
-            appendln("        %-15s: %s", "File",
-                    (new File(plugin.getDataFolder(), "worlds/"
-                            + world.getName() + "/regions.yml")).getAbsoluteFile());
            RegionManager worldRegions = regionMgr.get(world);
-            appendln("        %-15s: %s", "Type",
-                    worldRegions.getClass().getCanonicalName());
-            appendln("        %-15s: %s", "Number of regions",
-                    worldRegions.getRegions().size());
-            appendln("        Global region:");
+
+            regionsLog.put("Type", worldRegions.getClass().getCanonicalName());
+            regionsLog.put("Number of regions", worldRegions.getRegions().size());
+            LogListBlock globalRegionLog = regionsLog.putChild("Global region");
+            
            ProtectedRegion globalRegion = worldRegions.getRegion("__global__");
            if (globalRegion == null) {
-                appendln("            UNDEFINED");
+                globalRegionLog.put("Status", "UNDEFINED");
            } else {
-                appendln("            %-20s: %s", "Type",
-                        globalRegion.getClass().getCanonicalName());
                for (Flag<?> flag : DefaultFlag.getFlags()) {
                    if (flag instanceof StateFlag) {
-                        appendln("            %-20s: %s", flag.getName(),
+                        globalRegionLog.put(flag.getName(),
                                globalRegion.getFlag(flag));
                    }
                }
            }
        }
-        
+
+        append(log);
        appendln();
    }
    
@@ -0,0 +1,124 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+import org.bukkit.World;
+
+public class SpongeUtil {
+
+    /**
+     * Remove water around a sponge.
+     * 
+     * @param plugin 
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     */
+    public static void clearSpongeWater(WorldGuardPlugin plugin, World world, int ox, int oy, int oz) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        for (int cx = -wcfg.spongeRadius; cx <= wcfg.spongeRadius; cx++) {
+            for (int cy = -wcfg.spongeRadius; cy <= wcfg.spongeRadius; cy++) {
+                for (int cz = -wcfg.spongeRadius; cz <= wcfg.spongeRadius; cz++) {
+                    if (isBlockWater(world, ox + cx, oy + cy, oz + cz)) {
+                        world.getBlockAt(ox + cx, oy + cy, oz + cz).setTypeId(0);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Add water around a sponge.
+     * 
+     * @param plugin 
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     */
+    public static void addSpongeWater(WorldGuardPlugin plugin, World world, int ox, int oy, int oz) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        // The negative x edge
+        int cx = ox - wcfg.spongeRadius - 1;
+        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
+            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx + 1, cy, cz);
+                }
+            }
+        }
+
+        // The positive x edge
+        cx = ox + wcfg.spongeRadius + 1;
+        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
+            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx - 1, cy, cz);
+                }
+            }
+        }
+
+        // The negative y edge
+        int cy = oy - wcfg.spongeRadius - 1;
+        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
+            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy + 1, cz);
+                }
+            }
+        }
+
+        // The positive y edge
+        cy = oy + wcfg.spongeRadius + 1;
+        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
+            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy - 1, cz);
+                }
+            }
+        }
+
+        // The negative z edge
+        int cz = oz - wcfg.spongeRadius - 1;
+        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
+            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy, cz + 1);
+                }
+            }
+        }
+
+        // The positive z edge
+        cz = oz + wcfg.spongeRadius + 1;
+        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
+            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy, cz - 1);
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,456 @@
+// $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 com.sk89q.worldguard.blacklist.Blacklist;
+import com.sk89q.worldguard.blacklist.BlacklistLogger;
+import com.sk89q.worldguard.blacklist.loggers.ConsoleLoggerHandler;
+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.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.
+ *
+ * @author sk89q
+ * @author Michael
+ */
+public class WorldConfiguration {
+
+    public static final String CONFIG_HEADER = "#\r\n" +
+            "# WorldGuard's configuration file.\r\n" +
+            "#\r\n" +
+            "# This is the a per-world configuration file. It only affects one\r\n" +
+            "# corresponding world.\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" +
+            "#   you use an editor like Notepad++ (recommended for Windows users), you\r\n" +
+            "#   must configure it to \"replace tabs with spaces.\" In Notepad++, this can\r\n" +
+            "#   be changed in Settings > Preferences > Language Menu.\r\n" +
+            "# - Don't get rid of the indents. They are indented so some entries are\r\n" +
+            "#   in categories (like \"enforce-single-session\" is in the \"protection\"\r\n" +
+            "#   category.\r\n" +
+            "# - If you want to check the format of this file before putting it\r\n" +
+            "#   into WorldGuard, paste it into http://yaml-online-parser.appspot.com/\r\n" +
+            "#   and see if it gives \"ERROR:\".\r\n" +
+            "# - Lines starting with # are comments and so they are ignored.\r\n" +
+            "#\r\n";
+
+    private static final Logger logger = Logger
+            .getLogger("Minecraft.WorldGuard");
+
+    private WorldGuardPlugin plugin;
+
+    private String worldName;
+    private Configuration parentConfig;
+    private Configuration config;
+    private File configFile;
+    private File blacklistFile;
+
+    private Blacklist blacklist;
+    private ChestProtection chestProtection = new SignChestProtection();
+
+    /* Configuration data start */
+    public boolean opPermissions;
+    public boolean fireSpreadDisableToggle;
+    public boolean enforceOneSession;
+    public boolean itemDurability;
+    public boolean classicWater;
+    public boolean simulateSponge;
+    public int spongeRadius;
+    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 blockCreeperExplosions;
+    public boolean blockCreeperBlockDamage;
+    public int loginProtection;
+    public int spawnProtection;
+    public boolean kickOnDeath;
+    public boolean exactRespawn;
+    public boolean teleportToHome;
+    public boolean disableContactDamage;
+    public boolean disableFallDamage;
+    public boolean disableLavaDamage;
+    public boolean disableFireDamage;
+    public boolean disableLightningDamage;
+    public boolean disableDrowningDamage;
+    public boolean disableSuffocationDamage;
+    public boolean teleportOnSuffocation;
+    public boolean disableVoidDamage;
+    public boolean teleportOnVoid;
+    public boolean disableExplosionDamage;
+    public boolean disableMobDamage;
+    public boolean useRegions;
+    public boolean highFreqFlags;
+    public int regionWand = 287;
+    public Set<CreatureType> blockCreatureSpawn;
+    public boolean useiConomy;
+    public boolean buyOnClaim;
+    public double buyOnClaimPrice;
+    public int maxClaimVolume;
+    public boolean claimOnlyInsideExistingRegions;
+    public int maxRegionCountPerPlayer;
+    public boolean antiWolfDumbness;
+    public boolean signChestProtection;
+    public boolean removeInfiniteStacks;
+    public boolean disableCreatureCropTrampling;
+    public boolean disablePlayerCropTrampling;
+    public boolean preventLightningFire;
+    public Set<Integer> disallowedLightningBlocks;
+    public boolean disableThunder;
+    public boolean disableWeather;
+    public boolean alwaysRaining;
+    public boolean alwaysThundering;
+    public boolean disablePigZap;
+    public boolean disableCreeperPower;
+
+    /* Configuration data end */
+
+    /**
+     * Construct the object.
+     *
+     * @param plugin
+     * @param worldName
+     */
+    public WorldConfiguration(WorldGuardPlugin plugin, String worldName) {
+        File baseFolder = new File(plugin.getDataFolder(), "worlds/" + worldName);
+        configFile = new File(baseFolder, "config.yml");
+        blacklistFile = new File(baseFolder, "blacklist.txt");
+
+        this.plugin = plugin;
+        this.worldName = worldName;
+        this.parentConfig = plugin.getConfiguration();
+
+        WorldGuardPlugin.createDefaultConfiguration(configFile, "config_world.yml");
+        WorldGuardPlugin.createDefaultConfiguration(blacklistFile, "blacklist.txt");
+
+        config = new Configuration(this.configFile);
+        loadConfiguration();
+
+        logger.info("WorldGuard: Loaded configuration for world '" + worldName + '"');
+    }
+
+    private boolean getBoolean(String node, boolean def) {
+        if (config.getProperty(node) != null) {
+            return config.getBoolean(node, def);
+        } else {
+            return parentConfig.getBoolean(node, def);
+        }
+    }
+
+    private String getString(String node, String def) {
+        if (config.getProperty(node) != null) {
+            return config.getString(node, def);
+        } else {
+            return parentConfig.getString(node, def);
+        }
+    }
+
+    private int getInt(String node, int def) {
+        if (config.getProperty(node) != null) {
+            return config.getInt(node, def);
+        } else {
+            return parentConfig.getInt(node, def);
+        }
+    }
+
+    private double getDouble(String node, double def) {
+        if (config.getProperty(node) != null) {
+            return config.getDouble(node, def);
+        } else {
+            return parentConfig.getDouble(node, def);
+        }
+    }
+
+    private List<Integer> getIntList(String node, List<Integer> def) {
+        if (config.getProperty(node) != null) {
+            return config.getIntList(node, def);
+        } else {
+            return parentConfig.getIntList(node, def);
+        }
+    }
+
+    private List<String> getStringList(String node, List<String> def) {
+        if (config.getProperty(node) != null) {
+            return config.getStringList(node, def);
+        } else {
+            return parentConfig.getStringList(node, def);
+        }
+    }
+
+    /**
+     * Load the configuration.
+     */
+    private void loadConfiguration() {
+        config.load();
+
+        opPermissions = getBoolean("op-permissions", true);
+
+        enforceOneSession = getBoolean("protection.enforce-single-session", true);
+        itemDurability = getBoolean("protection.item-durability", true);
+        removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
+
+        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);
+
+        noPhysicsGravel = getBoolean("physics.no-physics-gravel", false);
+        noPhysicsSand = getBoolean("physics.no-physics-sand", false);
+        allowPortalAnywhere = getBoolean("physics.allow-portal-anywhere", false);
+        preventWaterDamage = new HashSet<Integer>(getIntList("physics.disable-water-damage-blocks", null));
+
+        blockTNT = getBoolean("ignition.block-tnt", false);
+        blockLighter = getBoolean("ignition.block-lighter", false);
+
+        preventLavaFire = getBoolean("fire.disable-lava-fire-spread", true);
+        disableFireSpread = getBoolean("fire.disable-all-fire-spread", false);
+        disableFireSpreadBlocks = new HashSet<Integer>(getIntList("fire.disable-fire-spread-blocks", null));
+        allowedLavaSpreadOver = new HashSet<Integer>(getIntList("fire.lava-spread-blocks", null));
+
+        blockCreeperExplosions = getBoolean("mobs.block-creeper-explosions", false);
+        blockCreeperBlockDamage = getBoolean("mobs.block-creeper-block-damage", false);
+        antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", 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);
+        disableFireDamage = getBoolean("player-damage.disable-fire-damage", false);
+        disableLightningDamage = getBoolean("player-damage.disable-lightning-damage", false);
+        disableDrowningDamage = getBoolean("player-damage.disable-drowning-damage", false);
+        disableSuffocationDamage = getBoolean("player-damage.disable-suffocation-damage", false);
+        disableContactDamage = getBoolean("player-damage.disable-contact-damage", false);
+        teleportOnSuffocation = getBoolean("player-damage.teleport-on-suffocation", false);
+        disableVoidDamage = getBoolean("player-damage.disable-void-damage", false);
+        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);
+
+        signChestProtection = getBoolean("chest-protection.enable", false);
+
+        disableCreatureCropTrampling = getBoolean("crops.disable-creature-trampling", false);
+        disablePlayerCropTrampling = getBoolean("crops.disable-player-trampling", false);
+
+        disallowedLightningBlocks = new HashSet<Integer>(getIntList("weather.prevent-lightning-strike-blocks", null));
+        preventLightningFire = getBoolean("weather.disable-lightning-strike-fire", false);
+        disableThunder = getBoolean("weather.disable-thunderstorm", false);
+        disableWeather = getBoolean("weather.disable-weather", false);
+        disablePigZap = getBoolean("weather.disable-pig-zombification", false);
+        disableCreeperPower = getBoolean("weather.disable-powered-creepers", false);
+        alwaysRaining = getBoolean("weather.always-raining", false);
+        alwaysThundering = getBoolean("weather.always-thundering", false);
+
+        useRegions = getBoolean("regions.enable", true);
+        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);
+
+        blockCreatureSpawn = new HashSet<CreatureType>();
+        for (String creatureName : getStringList("mobs.block-creature-spawn", null)) {
+            CreatureType creature = CreatureType.fromName(creatureName);
+
+            if (creature == null) {
+                logger.warning("WorldGuard: Unknown mob type '" + creatureName + "'");
+            } else {
+                blockCreatureSpawn.add(creature);
+            }
+        }
+
+        boolean useBlacklistAsWhitelist = getBoolean("blacklist.use-as-whitelist", false);
+
+        // Console log configuration
+        boolean logConsole = getBoolean("blacklist.logging.console.enable", true);
+
+        // Database log configuration
+        boolean logDatabase = getBoolean("blacklist.logging.database.enable", false);
+        String dsn = getString("blacklist.logging.database.dsn", "jdbc:mysql://localhost:3306/minecraft");
+        String user = getString("blacklist.logging.database.user", "root");
+        String pass = getString("blacklist.logging.database.pass", "");
+        String table = getString("blacklist.logging.database.table", "blacklist_events");
+
+        // File log configuration
+        boolean logFile = getBoolean("blacklist.logging.file.enable", false);
+        String logFilePattern = getString("blacklist.logging.file.path", "worldguard/logs/%Y-%m-%d.log");
+        int logFileCacheSize = Math.max(1, getInt("blacklist.logging.file.open-files", 10));
+
+        // Load the blacklist
+        try {
+            // If there was an existing blacklist, close loggers
+            if (blacklist != null) {
+                blacklist.getLogger().close();
+            }
+
+            // First load the blacklist data from worldguard-blacklist.txt
+            Blacklist blist = new BukkitBlacklist(useBlacklistAsWhitelist, plugin);
+            blist.load(blacklistFile);
+
+            // If the blacklist is empty, then set the field to null
+            // and save some resources
+            if (blist.isEmpty()) {
+                this.blacklist = null;
+            } else {
+                this.blacklist = blist;
+                logger.log(Level.INFO, "WorldGuard: Blacklist loaded.");
+
+                BlacklistLogger blacklistLogger = blist.getLogger();
+
+                if (logDatabase) {
+                    blacklistLogger.addHandler(new DatabaseLoggerHandler(dsn, user, pass, table, worldName));
+                }
+
+                if (logConsole) {
+                    blacklistLogger.addHandler(new ConsoleLoggerHandler(worldName));
+                }
+
+                if (logFile) {
+                    FileLoggerHandler handler =
+                            new FileLoggerHandler(logFilePattern, logFileCacheSize, worldName);
+                    blacklistLogger.addHandler(handler);
+                }
+            }
+        } catch (FileNotFoundException e) {
+            logger.log(Level.WARNING, "WorldGuard blacklist does not exist.");
+        } catch (IOException e) {
+            logger.log(Level.WARNING, "Could not load WorldGuard blacklist: "
+                    + e.getMessage());
+        }
+
+        // Print an overview of settings
+        if (getBoolean("summary-on-start", true)) {
+            logger.log(Level.INFO, enforceOneSession
+                    ? "WorldGuard: (" + worldName + ") Single session is enforced."
+                    : "WorldGuard: (" + worldName + ") Single session is NOT ENFORCED.");
+            logger.log(Level.INFO, blockTNT
+                    ? "WorldGuard: (" + worldName + ") TNT ignition is blocked."
+                    : "WorldGuard: (" + worldName + ") TNT ignition is PERMITTED.");
+            logger.log(Level.INFO, blockLighter
+                    ? "WorldGuard: (" + worldName + ") Lighters are blocked."
+                    : "WorldGuard: (" + worldName + ") Lighters are PERMITTED.");
+            logger.log(Level.INFO, preventLavaFire
+                    ? "WorldGuard: (" + worldName + ") Lava fire is blocked."
+                    : "WorldGuard: (" + worldName + ") Lava fire is PERMITTED.");
+
+            if (disableFireSpread) {
+                logger.log(Level.INFO, "WorldGuard: (" + worldName + ") All fire spread is disabled.");
+            } else {
+                if (disableFireSpreadBlocks.size() > 0) {
+                    logger.log(Level.INFO, "WorldGuard: (" + worldName
+                            + ") Fire spread is limited to "
+                            + disableFireSpreadBlocks.size() + " block types.");
+                } else {
+                    logger.log(Level.INFO, "WorldGuard: (" + worldName
+                            + ") Fire spread is UNRESTRICTED.");
+                }
+            }
+        }
+
+        config.setHeader(CONFIG_HEADER);
+        config.save();
+    }
+
+    public Blacklist getBlacklist() {
+        return this.blacklist;
+    }
+
+    public String getWorldName() {
+        return this.worldName;
+    }
+    
+    public boolean isChestProtected(Block block, Player player) {
+        if (!signChestProtection) {
+            return false;
+        }
+        if (plugin.hasPermission(player, "worldguard.chest-protection.override")
+                || plugin.hasPermission(player, "worldguard.override.chest-protection")) {
+            return false;
+        }
+        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;
+        }
+        if (plugin.hasPermission(player, "worldguard.chest-protection.override")
+                || plugin.hasPermission(player, "worldguard.override.chest-protection")) {
+            return false;
+        }
+        return chestProtection.isProtectedPlacement(block, player);
+    }
+
+    public boolean isAdjacentChestProtected(Block block, Player player) {
+        if (!signChestProtection) {
+            return false;
+        }
+        if (plugin.hasPermission(player, "worldguard.chest-protection.override")
+                || plugin.hasPermission(player, "worldguard.override.chest-protection")) {
+            return false;
+        }
+        return chestProtection.isAdjacentChestProtected(block, player);
+    }
+
+    public ChestProtection getChestProtection() {
+        return chestProtection;
+    }
+    
+}
@@ -25,26 +25,38 @@ import org.bukkit.event.Event;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.block.Block;
 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.event.block.BlockIgniteEvent.IgniteCause;
 import org.bukkit.inventory.ItemStack;
 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.protection.ApplicableRegionSet;
+
+import java.util.logging.Logger;
+
 import static com.sk89q.worldguard.bukkit.BukkitUtil.*;

+/**
+ * The listener for block events.
+ * 
+ * @author sk89q
+ */
 public class WorldGuardBlockListener extends BlockListener {
-
    /**
-     * Plugin.
+     * Logger for messages.
     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+
    private WorldGuardPlugin plugin;

    /**
-     * Construct the object;
+     * Construct the object.
     * 
     * @param plugin
     */
@@ -52,25 +64,84 @@ public class WorldGuardBlockListener extends BlockListener {
        this.plugin = plugin;
    }

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

-        pm.registerEvent(Event.Type.BLOCK_BREAK, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.BLOCK_FROMTO, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.BLOCK_IGNITE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.BLOCK_PHYSICS, this, Priority.Normal, plugin);
-        pm.registerEvent(Event.Type.BLOCK_PLACE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.BLOCK_BURN, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.REDSTONE_CHANGE, this, Priority.High, plugin);
+        registerEvent("BLOCK_DAMAGE", Priority.High);
+        registerEvent("BLOCK_BREAK", Priority.High);
+        registerEvent("BLOCK_FROMTO", Priority.Normal);
+        registerEvent("BLOCK_IGNITE", Priority.High);
+        registerEvent("BLOCK_PHYSICS", Priority.Normal);
+        registerEvent("BLOCK_PLACE", Priority.High);
+        registerEvent("BLOCK_BURN", Priority.High);
+        registerEvent("SIGN_CHANGE", Priority.High);
+        registerEvent("REDSTONE_CHANGE", Priority.High);
+        registerEvent("SNOW_FORM", Priority.High);
+        registerEvent("LEAVES_DECAY", Priority.High);
+        registerEvent("BLOCK_FORM", Priority.High);
+        registerEvent("BLOCK_SPREAD", Priority.High);
+    }
+
+    /**
+     * Register an event, but not failing if the event is not implemented.
+     *
+     * @param typeName
+     * @param priority
+     */
+    private void registerEvent(String typeName, Priority priority) {
+        try {
+            Event.Type type = Event.Type.valueOf(typeName);
+            PluginManager pm = plugin.getServer().getPluginManager();
+            pm.registerEvent(type, this, priority, plugin);
+        } catch (IllegalArgumentException e) {
+            logger.info("WorldGuard: Unable to register missing event type " + typeName);
+        }
    }
    
+    /**
+     * Get the world configuration given a world.
+     * 
+     * @param world
+     * @return
+     */
    protected WorldConfiguration getWorldConfig(World world) {
-        return plugin.getGlobalConfiguration().get(world);
+        return plugin.getGlobalStateManager().get(world);
    }
    
+    /**
+     * Get the world configuration given a player.
+     * 
+     * @param player
+     * @return
+     */
    protected WorldConfiguration getWorldConfig(Player player) {
-        return plugin.getGlobalConfiguration().get(player.getWorld());
+        return plugin.getGlobalStateManager().get(player.getWorld());
+    }
+    
+    /**
+     * Called when a block is damaged.
+     */
+    @Override
+    public void onBlockDamage(BlockDamageEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        Block blockDamaged = event.getBlock();
+
+        // Cake are damaged and not broken when they are eaten, so we must
+        // handle them a bit separately
+        if (blockDamaged.getType() == Material.CAKE_BLOCK) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, blockDamaged)) {
+                player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
+                event.setCancelled(true);
+                return;
+            }
+        }
    }
    
    /**
@@ -87,7 +158,9 @@ public class WorldGuardBlockListener extends BlockListener {

        if (!wcfg.itemDurability) {
            ItemStack held = player.getItemInHand();
-            if (held.getTypeId() > 0) {
+            if (held.getTypeId() > 0
+                    && !(ItemType.usesDamageValue(held.getTypeId())
+                    || BlockType.usesData(held.getTypeId()))) {
                held.setDurability((short) -1);
                player.setItemInHand(held);
            }
@@ -116,6 +189,12 @@ public class WorldGuardBlockListener extends BlockListener {
                return;
            }
        }
+        
+        if (wcfg.isChestProtected(event.getBlock(), player)) {
+            player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
+            event.setCancelled(true);
+            return;
+        }
    }

    /**
@@ -134,9 +213,14 @@ public class WorldGuardBlockListener extends BlockListener {
        boolean isWater = blockFrom.getTypeId() == 8 || blockFrom.getTypeId() == 9;
        boolean isLava = blockFrom.getTypeId() == 10 || blockFrom.getTypeId() == 11;

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

+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
        if (wcfg.simulateSponge && isWater) {
            int ox = blockTo.getX();
            int oy = blockTo.getY();
@@ -216,11 +300,21 @@ public class WorldGuardBlockListener extends BlockListener {
        Block block = event.getBlock();
        World world = block.getWorld();

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

+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
        boolean isFireSpread = cause == IgniteCause.SPREAD;

+        if (wcfg.preventLightningFire && cause == IgniteCause.LIGHTNING) {
+            event.setCancelled(true);
+            return;
+        }
+
        if (wcfg.preventLavaFire && cause == IgniteCause.LAVA) {
            event.setCancelled(true);
            return;
@@ -231,7 +325,9 @@ public class WorldGuardBlockListener extends BlockListener {
            return;
        }

-        if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL) {
+        if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL
+                && event.getPlayer() != null
+                && !plugin.hasPermission(event.getPlayer(), "worldguard.override.lighter")) {
            event.setCancelled(true);
            return;
        }
@@ -255,7 +351,7 @@ public class WorldGuardBlockListener extends BlockListener {
                return;
            }
        }
-        
+
        if (wcfg.useRegions) {
            Vector pt = toVector(block);
            Player player = event.getPlayer();
@@ -265,20 +361,21 @@ public class WorldGuardBlockListener extends BlockListener {
            if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
                LocalPlayer localPlayer = plugin.wrapPlayer(player);

-                if (cause == IgniteCause.FLINT_AND_STEEL
-                        && !set.canBuild(localPlayer)) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (cause == IgniteCause.FLINT_AND_STEEL
-                        && !set.allows(DefaultFlag.LIGHTER)) {
-                    event.setCancelled(true);
-                    return;
+                if (cause == IgniteCause.FLINT_AND_STEEL) {
+                    if (!set.canBuild(localPlayer)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                    if (!set.allows(DefaultFlag.LIGHTER)
+                            && !plugin.hasPermission(player, "worldguard.override.lighter")) {
+                        event.setCancelled(true);
+                        return;
+                    }
                }
            }

-            if (wcfg.highFreqFlags && isFireSpread && set.allows(DefaultFlag.FIRE_SPREAD)) {
+            if (wcfg.highFreqFlags && isFireSpread
+                    && !set.allows(DefaultFlag.FIRE_SPREAD)) {
                event.setCancelled(true);
                return;
            }
@@ -293,9 +390,7 @@ public class WorldGuardBlockListener extends BlockListener {
    }

    /**
-     * Called when a block is destroyed from burning
-     *
-     * @param event Relevant event details
+     * Called when a block is destroyed from burning.
     */
    @Override
    public void onBlockBurn(BlockBurnEvent event) {
@@ -304,9 +399,14 @@ public class WorldGuardBlockListener extends BlockListener {
            return;
        }

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

+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
        if (wcfg.disableFireSpread) {
            event.setCancelled(true);
            return;
@@ -325,12 +425,28 @@ public class WorldGuardBlockListener extends BlockListener {
                return;
            }
        }
+
+        if (wcfg.isChestProtected(event.getBlock())) {
+            event.setCancelled(true);
+            return;
+        }
+        
+        if (wcfg.useRegions) {
+            Block block = event.getBlock();
+            Vector pt = toVector(block);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(block.getWorld());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+            if (!set.allows(DefaultFlag.FIRE_SPREAD)) {
+                event.setCancelled(true);
+                return;
+            }
+
+        }
    }

    /**
-     * Called when block physics occurs
-     *
-     * @param event Relevant event details
+     * Called when block physics occurs.
     */
    @Override
    public void onBlockPhysics(BlockPhysicsEvent event) {
@@ -339,9 +455,14 @@ public class WorldGuardBlockListener extends BlockListener {
            return;
        }

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

+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
        int id = event.getChangedTypeId();

        if (id == 13 && wcfg.noPhysicsGravel) {
@@ -361,9 +482,7 @@ public class WorldGuardBlockListener extends BlockListener {
    }

    /**
-     * Called when a player places a block
-     *
-     * @param event Relevant event details
+     * Called when a player places a block.
     */
    @Override
    public void onBlockPlace(BlockPlaceEvent event) {
@@ -376,7 +495,7 @@ public class WorldGuardBlockListener extends BlockListener {
        Player player = event.getPlayer();
        World world = blockPlaced.getWorld();

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

        if (wcfg.useRegions) {
@@ -395,6 +514,14 @@ public class WorldGuardBlockListener extends BlockListener {
                return;
            }
        }
+        
+        if (wcfg.signChestProtection && wcfg.getChestProtection().isChest(blockPlaced.getType())) {
+            if (wcfg.isAdjacentChestProtected(event.getBlock(), player)) {
+                player.sendMessage(ChatColor.DARK_RED + "This spot is for a chest that you don't have permission for.");
+                event.setCancelled(true);
+                return;
+            }
+        }

        if (wcfg.simulateSponge && blockPlaced.getTypeId() == 19) {
            if (wcfg.redstoneSponges && blockPlaced.isBlockIndirectlyPowered()) {
@@ -405,16 +532,12 @@ public class WorldGuardBlockListener extends BlockListener {
            int oy = blockPlaced.getY();
            int oz = blockPlaced.getZ();

-            clearSpongeWater(world, ox, oy, oz);
+            SpongeUtil.clearSpongeWater(plugin, world, ox, oy, oz);
        }
    }

    /**
-     * Called when redstone changes
-     * From: the source of the redstone change
-     * To: The redstone dust that changed
-     *
-     * @param event Relevant event details
+     * Called when redstone changes.
     */
    @Override
    public void onBlockRedstoneChange(BlockRedstoneEvent event) {
@@ -422,7 +545,7 @@ public class WorldGuardBlockListener extends BlockListener {
        Block blockTo = event.getBlock();
        World world = blockTo.getWorld();

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

        if (wcfg.simulateSponge && wcfg.redstoneSponges) {
@@ -436,10 +559,10 @@ public class WorldGuardBlockListener extends BlockListener {
                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
                        if (sponge.getTypeId() == 19
                                && sponge.isBlockIndirectlyPowered()) {
-                            clearSpongeWater(world, ox + cx, oy + cy, oz + cz);
+                            SpongeUtil.clearSpongeWater(plugin, world, ox + cx, oy + cy, oz + cz);
                        } else if (sponge.getTypeId() == 19
                                && !sponge.isBlockIndirectlyPowered()) {
-                            addSpongeWater(world, ox + cx, oy + cy, oz + cz);
+                            SpongeUtil.addSpongeWater(plugin, world, ox + cx, oy + cy, oz + cz);
                        }
                    }
                }
@@ -450,135 +573,136 @@ public class WorldGuardBlockListener extends BlockListener {
    }

    /**
-     * Remove water around a sponge.
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
+     * Called when a sign is changed.
     */
-    private void clearSpongeWater(World world, int ox, int oy, int oz) {
+    @Override
+    public void onSignChange(SignChangeEvent event) {

-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        for (int cx = -wcfg.spongeRadius; cx <= wcfg.spongeRadius; cx++) {
-            for (int cy = -wcfg.spongeRadius; cy <= wcfg.spongeRadius; cy++) {
-                for (int cz = -wcfg.spongeRadius; cz <= wcfg.spongeRadius; cz++) {
-                    if (isBlockWater(world, ox + cx, oy + cy, oz + cz)) {
-                        world.getBlockAt(ox + cx, oy + cy, oz + cz).setTypeId(0);
-                    }
+        Player player = event.getPlayer();
+        WorldConfiguration wcfg = getWorldConfig(player);
+        
+        if (wcfg.signChestProtection) {
+            if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
+                if (wcfg.isChestProtectedPlacement(event.getBlock(), player)) {
+                    player.sendMessage(ChatColor.DARK_RED + "You do not own the adjacent chest.");
+                    dropSign(event.getBlock());
+                    event.setCancelled(true);
+                    return;
                }
-            }
-        }
-    }
+                
+                if (event.getBlock().getType() != Material.SIGN_POST) {
+                    player.sendMessage(ChatColor.RED
+                            + "The [Lock] sign must be a sign post, not a wall sign.");

-    /**
-     * Add water around a sponge.
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    private void addSpongeWater(World world, int ox, int oy, int oz) {
-
-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        // The negative x edge
-        int cx = ox - wcfg.spongeRadius - 1;
-        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx + 1, cy, cz);
+                    dropSign(event.getBlock());
+                    event.setCancelled(true);
+                    return;
                }
-            }
-        }

-        // The positive x edge
-        cx = ox + wcfg.spongeRadius + 1;
-        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx - 1, cy, cz);
+                if (!event.getLine(1).equalsIgnoreCase(player.getName())) {
+                    player.sendMessage(ChatColor.RED
+                            + "The first owner line must be your name.");
+
+                    dropSign(event.getBlock());
+                    event.setCancelled(true);
+                    return;
                }
-            }
-        }
+                
+                Material below = event.getBlock().getRelative(0, -1, 0).getType();

-        // The negative y edge
-        int cy = oy - wcfg.spongeRadius - 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy + 1, cz);
+                if (below == Material.TNT || below == Material.SAND
+                        || below == Material.GRAVEL || below == Material.SIGN_POST) {
+                    player.sendMessage(ChatColor.RED
+                            + "That is not a safe block that you're putting this sign on.");
+
+                    dropSign(event.getBlock());
+                    event.setCancelled(true);
+                    return;
                }
+                
+                event.setLine(0, "[Lock]");
+                player.sendMessage(ChatColor.YELLOW
+                        + "A chest or double chest above is now protected.");
            }
-        }
-
-        // The positive y edge
-        cy = oy + wcfg.spongeRadius + 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy - 1, cz);
-                }
-            }
-        }
-
-        // The negative z edge
-        int cz = oz - wcfg.spongeRadius - 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy, cz + 1);
-                }
-            }
-        }
-
-        // The positive z edge
-        cz = oz + wcfg.spongeRadius + 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy, cz - 1);
-                }
-            }
-        }
-    }
-
-    /**
-     * Sets the given block to fluid water.
-     * Used by addSpongeWater()
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    private void setBlockToWater(World world, int ox, int oy, int oz) {
-        Block block = world.getBlockAt(ox, oy, oz);
-        int id = block.getTypeId();
-        if (id == 0) {
-            block.setTypeId(8);
-        }
-    }
-
-    /**
-     * Checks if the given block is water
-     * 
-     * @param world
-     * @param ox
-     * @param oy
-     * @param oz
-     */
-    private boolean isBlockWater(World world, int ox, int oy, int oz) {
-        Block block = world.getBlockAt(ox, oy, oz);
-        int id = block.getTypeId();
-        if (id == 8 || id == 9) {
-            return true;
        } else {
-            return false;
+            if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
+                player.sendMessage(ChatColor.RED
+                        + "WorldGuard's sign chest protection is disabled.");
+                
+                dropSign(event.getBlock());
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlock())) {
+            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+            event.setCancelled(true);
+            return;
+        }
+    }
+    
+    /**
+     * Called when snow is formed.
+     */
+    @Override
+    public void onSnowForm(SnowFormEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (!plugin.getGlobalRegionManager().allows(DefaultFlag.SNOW_FALL,
+                event.getBlock().getLocation())) {
+            event.setCancelled(true);
+        }
+    }
+
+    @Override
+    public void onLeavesDecay(LeavesDecayEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (!plugin.getGlobalRegionManager().allows(DefaultFlag.LEAF_DECAY, event.getBlock().getLocation())) {
+            event.setCancelled(true);
+        }
+    }
+
+    /**
+     * Called when a block is formed based on world conditions.
+     */
+    public void onBlockForm(BlockFormEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+    }
+
+    /**
+     * Called when a block spreads based on world conditions.
+     */
+    public void onBlockSpread(BlockSpreadEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
        }
    }
 }
@@ -18,34 +18,43 @@
 */
 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 com.sk89q.worldguard.protection.ApplicableRegionSet;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.Skeleton;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
+import org.bukkit.block.Block;
+import org.bukkit.entity.*;
+import org.bukkit.event.Event;
+import org.bukkit.event.Event.Priority;
 import org.bukkit.event.entity.*;
 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.worldedit.blocks.BlockType;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
+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.
+ * 
+ * @author sk89q
+ */
 public class WorldGuardEntityListener extends EntityListener {
-
    /**
-     * Plugin.
+     * Logger for messages.
     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+
    private WorldGuardPlugin plugin;

    /**
@@ -57,27 +66,77 @@ public class WorldGuardEntityListener extends EntityListener {
        this.plugin = plugin;
    }

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

-        pm.registerEvent(Event.Type.ENTITY_DAMAGE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.ENTITY_EXPLODE, this, Priority.High, plugin);
-        pm.registerEvent(Event.Type.CREATURE_SPAWN, this, Priority.High, plugin);
+        registerEvent("ENTITY_DAMAGE", Priority.High);
+        registerEvent("ENTITY_EXPLODE", Priority.High);
+        registerEvent("CREATURE_SPAWN", Priority.High);
+        registerEvent("ENTITY_INTERACT", Priority.High);
+        registerEvent("CREEPER_POWER", Priority.High);
+        registerEvent("PIG_ZAP", Priority.High);
+        registerEvent("PAINTING_BREAK", Priority.High);
+        registerEvent("PAINTING_PLACE", Priority.High);
    }

+    /**
+     * Register an event, but not failing if the event is not implemented.
+     *
+     * @param typeName
+     * @param priority
+     */
+    private void registerEvent(String typeName, Priority priority) {
+        try {
+            Event.Type type = Event.Type.valueOf(typeName);
+            PluginManager pm = plugin.getServer().getPluginManager();
+            pm.registerEvent(type, this, priority, plugin);
+        } catch (IllegalArgumentException e) {
+            logger.info("WorldGuard: Unable to register missing event type " + typeName);
+        }
+    }

-    public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
+    /**
+     * Called when an entity interacts with another object.
+     */
+    @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();

+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(entity.getWorld());
+
+        if (block.getType() == Material.SOIL) {
+            if (entity instanceof Creature && wcfg.disableCreatureCropTrampling) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    /**
+     * Called on entity damage by a block.
+     * 
+     * @param event
+     */
+    private void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
        Entity defender = event.getEntity();
        DamageCause type = event.getCause();

-        if (defender instanceof Player) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(defender.getWorld());
+
+        if (defender instanceof Wolf && ((Wolf) defender).isTamed()) {
+            if (wcfg.antiWolfDumbness && !(type == DamageCause.VOID)) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (defender instanceof Player) {
            Player player = (Player) defender;

-            ConfigurationManager cfg = plugin.getGlobalConfiguration();
-            WorldConfiguration wcfg = cfg.get(player.getWorld());
-            
            if (cfg.hasGodMode(player)) {
                event.setCancelled(true);
                return;
@@ -85,6 +144,7 @@ public class WorldGuardEntityListener extends EntityListener {

            if (wcfg.disableLavaDamage && type == DamageCause.LAVA) {
                event.setCancelled(true);
+                if (cfg.hasGodMode(player)) player.setFireTicks(0);
                return;
            }

@@ -92,18 +152,58 @@ public class WorldGuardEntityListener extends EntityListener {
                event.setCancelled(true);
                return;
            }
-            
+
+            if (wcfg.teleportOnVoid && type == DamageCause.VOID) {
+                findFreePosition(player);
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableVoidDamage && type == DamageCause.VOID) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableExplosionDamage && event.getCause() == DamageCause.BLOCK_EXPLOSION) {
+                event.setCancelled(true);
+                return;
+            }
        }
    }

-    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+    /**
+     * Called on entity damage by an entity.
+     * 
+     * @param event
+     */
+    private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
        Entity attacker = event.getDamager();
        Entity defender = event.getEntity();
+        
+        if (attacker instanceof Player) {
+            Player player = (Player) attacker;
+
+            ConfigurationManager cfg = plugin.getGlobalStateManager();
+            WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+            ItemStack held = player.getInventory().getItemInHand();
+            
+            if (held != null) {
+                if (wcfg.getBlacklist() != null) {
+                    if (!wcfg.getBlacklist().check(
+                            new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                                    toVector(player.getLocation()), held.getTypeId()), false, false)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+        }

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

-            ConfigurationManager cfg = plugin.getGlobalConfiguration();
+            ConfigurationManager cfg = plugin.getGlobalStateManager();
            WorldConfiguration wcfg = cfg.get(player.getWorld());
            
            if (cfg.hasGodMode(player)) {
@@ -111,6 +211,16 @@ public class WorldGuardEntityListener extends EntityListener {
                return;
            }

+            if (wcfg.disableLightningDamage && event.getCause() == DamageCause.LIGHTNING) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (wcfg.disableExplosionDamage && event.getCause() == DamageCause.ENTITY_EXPLOSION) {
+                event.setCancelled(true);
+                return;
+            }
+
            if (attacker != null && attacker instanceof Player) {
                if (wcfg.useRegions) {
                    Vector pt = toVector(defender.getLocation());
@@ -131,6 +241,11 @@ public class WorldGuardEntityListener extends EntityListener {
                    return;
                }

+                if (wcfg.disableMobDamage) {
+                    event.setCancelled(true);
+                    return;
+                }
+
                if (wcfg.useRegions) {
                    Vector pt = toVector(defender.getLocation());
                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
@@ -153,14 +268,19 @@ public class WorldGuardEntityListener extends EntityListener {
        }
    }

-    public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
+    /**
+     * Called on entity damage by a projectile.
+     * 
+     * @param event
+     */
+    private void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
        Entity defender = event.getEntity();
        Entity attacker = event.getDamager();

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

-            ConfigurationManager cfg = plugin.getGlobalConfiguration();
+            ConfigurationManager cfg = plugin.getGlobalStateManager();
            WorldConfiguration wcfg = cfg.get(player.getWorld());
            
            if (cfg.hasGodMode(player)) {
@@ -181,6 +301,10 @@ public class WorldGuardEntityListener extends EntityListener {
                }
            }
            if (attacker != null && attacker instanceof Skeleton) {
+                if (wcfg.disableMobDamage) {
+                    event.setCancelled(true);
+                    return;
+                }
                if (wcfg.useRegions) {
                    Vector pt = toVector(defender.getLocation());
                    RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
@@ -195,9 +319,11 @@ public class WorldGuardEntityListener extends EntityListener {

    }

+    /**
+     * Called on entity damage.
+     */
    @Override
    public void onEntityDamage(EntityDamageEvent event) {
-
        if (event.isCancelled()) {
            return;
        }
@@ -216,28 +342,29 @@ public class WorldGuardEntityListener extends EntityListener {
        Entity defender = event.getEntity();
        DamageCause type = event.getCause();

-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(defender.getWorld());

-        if (defender instanceof Wolf) {
+        if (defender instanceof Wolf && ((Wolf) defender).isTamed()) {
            if (wcfg.antiWolfDumbness) {
                event.setCancelled(true);
                return;
            }
        } else if (defender instanceof Player) {
            Player player = (Player) defender;
-            
+
            if (cfg.hasGodMode(player)) {
                event.setCancelled(true);
+                player.setFireTicks(0);
                return;
            }
-            
+
            if (type == DamageCause.DROWNING && cfg.hasAmphibiousMode(player)) {
                player.setRemainingAir(player.getMaximumAir());
                event.setCancelled(true);
                return;
            }
-            
+
            if (type == DamageCause.DROWNING && wcfg.pumpkinScuba
                    && (player.getInventory().getHelmet().getType() == Material.PUMPKIN
                    || player.getInventory().getHelmet().getType() == Material.JACK_O_LANTERN)) {
@@ -263,7 +390,7 @@ public class WorldGuardEntityListener extends EntityListener {
                return;
            }

-            if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
+           if (wcfg.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
                findFreePosition(player);
                event.setCancelled(true);
                return;
@@ -276,19 +403,22 @@ public class WorldGuardEntityListener extends EntityListener {
        }
    }

+    /**
+     * Called on entity explode.
+     */
    @Override
    public void onEntityExplode(EntityExplodeEvent event) {
-
        if (event.isCancelled()) {
            return;
        }

-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
        Location l = event.getLocation();
        World world = l.getWorld();
        WorldConfiguration wcfg = cfg.get(world);
+        Entity ent = event.getEntity();

-        if (event.getEntity() instanceof LivingEntity) {
+        if (ent instanceof LivingEntity) {
            if (wcfg.blockCreeperBlockDamage) {
                event.setCancelled(true);
                return;
@@ -308,7 +438,22 @@ public class WorldGuardEntityListener extends EntityListener {
                    return;
                }
            }
-        } else { // Shall assume that this is TNT
+        } 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;
+                }
+            }
+        } else if (ent instanceof TNTPrimed) {
+            if (cfg.activityHaltToggle) {
+                event.setCancelled(true);
+                return;
+            }
+
            if (wcfg.blockTNT) {
                event.setCancelled(true);
                return;
@@ -324,47 +469,164 @@ public class WorldGuardEntityListener extends EntityListener {
                }
            }
        }
+        
+        if (wcfg.signChestProtection) {
+            for (Block block : event.blockList()) {
+                if (wcfg.isChestProtected(block)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+
+        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 creature spawn.
+     */
    @Override
    public void onCreatureSpawn(CreatureSpawnEvent event) {
        if (event.isCancelled()) {
            return;
        }

-        ConfigurationManager cfg = plugin.getGlobalConfiguration();
-        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
-
-        //CreatureType creaType = (CreatureType) CreatureType.valueOf(event.getMobType().toString());
-        CreatureType creaType = event.getCreatureType();
-        Boolean cancelEvent = false;
+        ConfigurationManager cfg = plugin.getGlobalStateManager();

-        if (wcfg.blockCreatureSpawn.contains(creaType)) {
-            cancelEvent = true;
-        }
-        
-        // TODO: Monsters and stuff
-/*
-        if (wcfg.useRegions) {
-            Vector pt = toVector(event.getEntity().getLocation());
-            RegionManager mgr = plugin.getGlobalRegionManager().get(event.getEntity().getWorld().getName());
-
-            Boolean flagValue = mgr.getApplicableRegions(pt).getFlag(DefaultFlag.DENY_SPAWN).getValue("").contains(creaType.getName());
-            if (flagValue != null) {
-                if (flagValue) {
-                    cancelEvent = true;
-                } else {
-                    cancelEvent = false;
-                }
-            }
-        }*/
-
-        if (cancelEvent) {
+        if (cfg.activityHaltToggle) {
            event.setCancelled(true);
            return;
        }
+
+        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+        CreatureType creaType = event.getCreatureType();
+
+        if (wcfg.blockCreatureSpawn.contains(creaType)) {
+            event.setCancelled(true);
+            return;
+        }
+        
+        Location eventLoc = event.getLocation();
+        
+        if (wcfg.useRegions) {
+            Vector pt = toVector(eventLoc);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(eventLoc.getWorld());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+            if (!set.allows(DefaultFlag.MOB_SPAWNING)) {
+                event.setCancelled(true);
+                return;
+            }
+
+            Set<CreatureType> blockTypes = set.getFlag(DefaultFlag.DENY_SPAWN);
+            if (blockTypes != null && blockTypes.contains(creaType)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
    }

+    /**
+     * Called on pig zap.
+     */
+    @Override
+    public void onPigZap(PigZapEvent event) {
+        if (event.isCancelled()) {
+           return;
+        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+
+        if (wcfg.disablePigZap) {
+            event.setCancelled(true);
+        }
+    }
+
+    /**
+     * Called on creeper power.
+     */
+    @Override
+    public void onCreeperPower(CreeperPowerEvent event) {
+        if (event.isCancelled()) {
+           return;
+        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+
+        if (wcfg.disableCreeperPower) {
+            event.setCancelled(true);
+        }
+    }
+
+    /**
+     * Called when a painting is removed.
+     */
+    @Override
+    public void onPaintingBreak(PaintingBreakEvent breakEvent) {
+        if (breakEvent.isCancelled()) {
+            return;
+        }
+
+        if (!(breakEvent instanceof PaintingBreakByEntityEvent)) {
+            return;
+        }
+        
+        PaintingBreakByEntityEvent event = (PaintingBreakByEntityEvent) breakEvent;
+        if (!(event.getRemover() instanceof Player)) {
+            return;
+        }
+        
+        Painting painting= event.getPainting();
+        Player player = (Player) event.getRemover();
+        World world = painting.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, painting.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called on painting place.
+     */
+    @Override
+    public void onPaintingPlace(PaintingPlaceEvent event) {
+        Block placedOn = event.getBlock();
+        Player player = event.getPlayer();
+        World world = placedOn.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getLocation())) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+    
    /**
     * Find a position for the player to stand that is not inside a block.
     * Blocks above the player will be iteratively tested until there is
@@ -391,13 +653,17 @@ public class WorldGuardEntityListener extends EntityListener {
            }

            if (free == 2) {
-                if (y - 1 != origY) {
+                if (y - 1 != origY || y == 1) {
                    loc.setX(x + 0.5);
                    loc.setY(y);
                    loc.setZ(z + 0.5);
+                    if (y <= 2 && world.getBlockAt(x,0,z).getType() == Material.AIR) {
+                        world.getBlockAt(x,0,z).setTypeId(20);
+                        loc.setY(2);
+                    }
+                    player.setFallDistance(0F);
                    player.teleport(loc);
                }
-
                return;
            }

@@ -0,0 +1,888 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.sk89q.worldguard.bukkit;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+import java.util.Iterator;
+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.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.inventory.ItemStack;
+import org.bukkit.plugin.PluginManager;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.*;
+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.RegionGroup;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+/**
+ * Handles all events thrown in relation to a player.
+ */
+public class WorldGuardPlayerListener extends PlayerListener {
+
+    /**
+     * Logger for messages.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     * 
+     * @param plugin
+     */
+    public WorldGuardPlayerListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        PluginManager pm = plugin.getServer().getPluginManager();
+
+        registerEvent("PLAYER_INTERACT", Priority.High);
+        registerEvent("PLAYER_DROP_ITEM", Priority.High);
+        registerEvent("PLAYER_PICKUP_ITEM", Priority.High);
+        registerEvent("PLAYER_JOIN", Priority.Normal);
+        registerEvent("PLAYER_LOGIN", Priority.Normal);
+        registerEvent("PLAYER_QUIT", Priority.Normal);
+        registerEvent("PLAYER_BUCKET_FILL", Priority.High);
+        registerEvent("PLAYER_BUCKET_EMPTY", Priority.High);
+        registerEvent("PLAYER_RESPAWN", Priority.High);
+        registerEvent("PLAYER_ITEM_HELD", Priority.High);
+        registerEvent("PLAYER_BED_ENTER", Priority.High);
+        registerEvent("PLAYER_MOVE", Priority.High);
+    }
+
+    /**
+     * Register an event, but not failing if the event is not implemented.
+     *
+     * @param typeName
+     * @param priority
+     */
+    private void registerEvent(String typeName, Priority priority) {
+        try {
+            Event.Type type = Event.Type.valueOf(typeName);
+            PluginManager pm = plugin.getServer().getPluginManager();
+            pm.registerEvent(type, this, priority, plugin);
+        } catch (IllegalArgumentException e) {
+            logger.info("WorldGuard: Unable to register missing event type " + typeName);
+        }
+    }
+
+    /**
+     * Called when a player attempts to log in to the server.
+     */
+    @Override
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        Player player = event.getPlayer();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+        if (wcfg.enforceOneSession) {
+            String name = player.getName();
+
+            for (Player pl : plugin.getServer().getOnlinePlayers()) {
+                if (pl.getName().equalsIgnoreCase(name)) {
+                    pl.kickPlayer("Logged in from another location.");
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when a player joins a server.
+     */
+    @Override
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+        if (cfg.activityHaltToggle) {
+            player.sendMessage(ChatColor.YELLOW
+                    + "Intensive server activity has been HALTED.");
+
+            int removed = 0;
+
+            for (Entity entity : player.getWorld().getEntities()) {
+                if (entity instanceof Item
+                        || (entity instanceof LivingEntity
+                        && !(entity instanceof Tameable)
+                        && !(entity instanceof Player))) {
+                    entity.remove();
+                    removed++;
+                }
+            }
+
+            if (removed > 10) {
+                logger.info("WG Halt-Act: " + removed + " entities (>10) auto-removed from "
+                        + player.getWorld().toString());
+            }
+        }
+
+        if (wcfg.fireSpreadDisableToggle) {
+            player.sendMessage(ChatColor.YELLOW
+                    + "Fire spread is currently globally disabled for this world.");
+        }
+        
+        if (plugin.inGroup(player, "wg-invincible")) {
+            cfg.enableGodMode(player);
+        }
+        
+        if (plugin.inGroup(player, "wg-amphibious")) {
+            cfg.enableAmphibiousMode(player);
+        }
+    }
+
+    /**
+     * Called when a player leaves a server.
+     */
+    @Override
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        cfg.forgetPlayer(plugin.wrapPlayer(player));
+        plugin.forgetPlayer(player);
+    }
+
+    /**
+     * Called when a player interacts with an item.
+     */
+    @Override
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        Player player = event.getPlayer();
+        World world = player.getWorld();
+        
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            handleBlockRightClick(event);
+        } else if (event.getAction() == Action.RIGHT_CLICK_AIR) {
+            handleAirRightClick(event);
+        } else if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            handleBlockLeftClick(event);
+        } else if (event.getAction() == Action.LEFT_CLICK_AIR) {
+            handleAirLeftClick(event);
+        } else if (event.getAction() == Action.PHYSICAL) {
+            handlePhysicalInteract(event);
+        }
+        
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+        
+        if (wcfg.removeInfiniteStacks
+                && !plugin.hasPermission(player, "worldguard.override.infinite-stack")) {
+            int slot = player.getInventory().getHeldItemSlot();
+            ItemStack heldItem = player.getInventory().getItem(slot);
+            if (heldItem.getAmount() < 0) {
+                player.getInventory().setItem(slot, null);
+                player.sendMessage(ChatColor.RED + "Infinite stack removed.");
+            }
+        }
+    }
+
+    /**
+     * Called when a player attempts to move.
+     *
+     * @param event
+     */
+    @Override
+    public void onPlayerMove(PlayerMoveEvent event) {
+        Player player = event.getPlayer();
+        World world = player.getWorld();
+        
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+        
+        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);
+
+                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+                Vector pt = toVector(event.getTo());
+                ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+                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))) {
+                    player.sendMessage(ChatColor.AQUA + " ** " + state.lastFarewell);
+                }
+                
+                if (greeting != null && (state.lastGreeting == null
+                        || !state.lastGreeting.equals(greeting))) {
+                    player.sendMessage(ChatColor.AQUA + " ** " + greeting);
+                }
+                
+                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;
+            }
+        }
+    }
+    
+    /**
+     * Called when a player left clicks air.
+     *
+     * @param event
+     */
+    private void handleAirLeftClick(PlayerInteractEvent event) {
+         // I don't think we have to do anything here yet.
+         return;
+    }
+
+    /**
+     * Called when a player left clicks a block.
+     *
+     * @param event
+     */
+    private void handleBlockLeftClick(PlayerInteractEvent event) {
+        if (event.isCancelled()) return;
+
+        Player player = event.getPlayer();
+        Block block = event.getClickedBlock();
+        Material type = block.getType();
+        World world = player.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.useRegions) {
+            Vector pt = toVector(block);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (type == Material.STONE_BUTTON
+                  || type == Material.LEVER
+                  || type == Material.WOODEN_DOOR
+                  || type == Material.TRAP_DOOR
+                  || type == Material.NOTE_BLOCK) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.allows(DefaultFlag.USE)
+                        && !set.canBuild(localPlayer)) {
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
+                    event.setUseInteractedBlock(Result.DENY);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when a player right clicks air.
+     * 
+     * @param event 
+     */
+    private void handleAirRightClick(PlayerInteractEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        World world = player.getWorld();
+        ItemStack item = player.getItemInHand();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (wcfg.getBlacklist() != null) {
+            if (!wcfg.getBlacklist().check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(player.getLocation()),
+                    item.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                event.setUseItemInHand(Result.DENY);
+                return;
+            }
+        }
+    }
+    
+    /**
+     * Called when a player right clicks a block.
+     * 
+     * @param event 
+     */
+    private void handleBlockRightClick(PlayerInteractEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Block block = event.getClickedBlock();
+        World world = block.getWorld();
+        Material type = block.getType();
+        Player player = event.getPlayer();
+        ItemStack item = player.getItemInHand();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        // Infinite stack removal
+        if ((type == Material.CHEST
+                || type == Material.JUKEBOX
+                || type == Material.DISPENSER
+                || type == Material.FURNACE
+                || type == Material.BURNING_FURNACE)
+                && wcfg.removeInfiniteStacks
+                && !plugin.hasPermission(player, "worldguard.override.infinite-stack")) {
+            for (int slot = 0; slot < 40; slot++) {
+                ItemStack heldItem = player.getInventory().getItem(slot);
+                if (heldItem != null && heldItem.getAmount() < 0) {
+                    player.getInventory().setItem(slot, null);
+                    player.sendMessage(ChatColor.RED + "Infinite stack in slot #" + slot + " removed.");
+                }
+            }
+        }
+
+        if (wcfg.useRegions) {
+            Vector pt = toVector(block);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (item.getTypeId() == wcfg.regionWand) {
+                if (set.size() > 0) {
+                    player.sendMessage(ChatColor.YELLOW + "Can you build? "
+                            + (set.canBuild(localPlayer) ? "Yes" : "No"));
+
+                    StringBuilder str = new StringBuilder();
+                    for (Iterator<ProtectedRegion> it = set.iterator(); it.hasNext();) {
+                        str.append(it.next().getId());
+                        if (it.hasNext()) {
+                            str.append(", ");
+                        }
+                    }
+
+                    player.sendMessage(ChatColor.YELLOW + "Applicable regions: " + str.toString());
+                } else {
+                    player.sendMessage(ChatColor.YELLOW + "WorldGuard: No defined regions here!");
+                }
+
+                event.setCancelled(true);
+                return;
+            }
+            if (item.getType() == Material.INK_SACK
+                    && item.getData() != null
+                    && item.getData().getData() == 15 // bonemeal
+                    && type == Material.GRASS) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    event.setCancelled(true);
+                    event.setUseInteractedBlock(Result.DENY);
+                    event.setUseItemInHand(Result.DENY);
+                }
+            }
+
+            if (type == Material.CHEST
+                    || type == Material.JUKEBOX //stores the (arguably) most valuable item
+                    || type == Material.DISPENSER
+                    || type == Material.FURNACE
+                    || type == Material.BURNING_FURNACE) {
+                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.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) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.allows(DefaultFlag.USE)
+                        && !set.canBuild(localPlayer)) {
+                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
+                    event.setUseInteractedBlock(Result.DENY);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+
+            if (type == Material.CAKE_BLOCK) {
+                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                        && !set.canBuild(localPlayer)) {
+                    player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            
+            if ((type == Material.RAILS || type == Material.POWERED_RAIL || type == Material.DETECTOR_RAIL)
+                   && 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.setCancelled(true);
+                    return;
+                }
+            }
+            
+            if (item.getType() == Material.BOAT) {
+                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.setCancelled(true);
+                    return;
+                }
+            }
+        }
+
+        if (wcfg.getBlacklist() != null) {
+            if((block.getType() != Material.CHEST
+                && block.getType() != Material.DISPENSER
+                && block.getType() != Material.FURNACE
+                && block.getType() != Material.BURNING_FURNACE)) {
+                if (!wcfg.getBlacklist().check(
+                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
+                        item.getTypeId()), false, false)) {
+                    event.setCancelled(true);
+                    return;
+                }
+
+                if (!wcfg.getBlacklist().check(
+                        new BlockInteractBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
+                        block.getTypeId()), false, false)) {
+                    event.setCancelled(true);
+                    return;
+                }
+
+            }
+
+        }
+
+        if ((block.getType() == Material.CHEST
+                || block.getType() == Material.DISPENSER
+                || block.getType() == Material.FURNACE
+                || block.getType() == Material.BURNING_FURNACE)) {
+            
+            if (wcfg.isChestProtected(block, player)) {
+                player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        /*if (wcfg.useRegions && wcfg.useiConomy && cfg.getiConomy() != null
+                    && (type == Material.SIGN_POST || type == Material.SIGN || type == Material.WALL_SIGN)) {
+            BlockState block = blockClicked.getState();
+
+            if (((Sign)block).getLine(0).equalsIgnoreCase("[WorldGuard]")
+                    && ((Sign)block).getLine(1).equalsIgnoreCase("For sale")) {
+                String regionId = ((Sign)block).getLine(2);
+                //String regionComment = ((Sign)block).getLine(3);
+
+                if (regionId != null && regionId != "") {
+                    RegionManager mgr = cfg.getWorldGuardPlugin().getGlobalRegionManager().get(player.getWorld().getName());
+                    ProtectedRegion region = mgr.getRegion(regionId);
+
+                    if (region != null) {
+                        RegionFlags flags = region.getFlags();
+
+                        if (flags.getBooleanFlag(DefaultFlag.BUYABLE).getValue(false)) {
+                            if (iConomy.getBank().hasAccount(player.getName())) {
+                                Account account = iConomy.getBank().getAccount(player.getName());
+                                double balance = account.getBalance();
+                                double regionPrice = flags.getDoubleFlag(DefaultFlag.PRICE).getValue();
+
+                                if (balance >= regionPrice) {
+                                    account.subtract(regionPrice);
+                                    player.sendMessage(ChatColor.YELLOW + "You have bought the region " + regionId + " for " +
+                                            iConomy.getBank().format(regionPrice));
+                                    DefaultDomain owners = region.getOwners();
+                                    owners.addPlayer(player.getName());
+                                    region.setOwners(owners);
+                                    flags.getBooleanFlag(DefaultFlag.BUYABLE).setValue(false);
+                                    account.save();
+                                } else {
+                                    player.sendMessage(ChatColor.YELLOW + "You have not enough money.");
+                                }
+                            } else {
+                                player.sendMessage(ChatColor.YELLOW + "You have not enough money.");
+                            }
+                        } else {
+                            player.sendMessage(ChatColor.RED + "Region: " + regionId + " is not buyable");
+                        } 
+                    } else {
+                        player.sendMessage(ChatColor.DARK_RED + "The region " + regionId + " does not exist.");
+                    }
+                } else {
+                    player.sendMessage(ChatColor.DARK_RED + "No region specified.");
+                }
+            }
+        }*/
+    }
+
+    /**
+     * Called when a player steps on a pressure plate or tramples crops.
+     *
+     * @param event
+     */
+    private void handlePhysicalInteract(PlayerInteractEvent event) {
+        if (event.isCancelled() == true) return;
+
+        Player player = event.getPlayer();
+        Block block = event.getClickedBlock(); //not actually clicked but whatever
+        Material type = block.getType();
+        World world = player.getWorld();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+
+        if (block.getType() == Material.SOIL && wcfg.disablePlayerCropTrampling) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (wcfg.useRegions) {
+            Vector pt = toVector(block);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (type == Material.STONE_PLATE || type == Material.WOOD_PLATE) {
+               if (!plugin.getGlobalRegionManager().hasBypass(player, world)
+                       && !set.allows(DefaultFlag.USE)
+                       && !set.canBuild(localPlayer)) {
+                   event.setUseInteractedBlock(Result.DENY);
+                   event.setCancelled(true);
+                   return;
+               }
+            }
+        }
+    }
+
+    /**
+     * Called when a player uses an item.
+     *//*
+    @Override
+    public void onPlayerItem(PlayerItemEvent event) {
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        Block block = event.getBlockClicked();
+        ItemStack item = event.getItem();
+        int itemId = item.getTypeId();
+
+        GlobalConfiguration cfg = plugin.getGlobalConfiguration();
+        WorldConfiguration wcfg = cfg.getWorldConfig(player.getWorld().getName());
+
+        if (wcfg.useRegions
+                && (itemId == 322 || itemId == 320 || itemId == 319 || itemId == 297 || itemId == 260
+                        || itemId == 350 || itemId == 349 || itemId == 354) ) {
+            return;
+        }
+
+        if (!wcfg.itemDurability) {
+            // Hoes
+            if (item.getTypeId() >= 290 && item.getTypeId() <= 294) {
+                item.setDurability((byte) -1);
+                player.setItemInHand(item);
+            }
+        }
+
+        if (wcfg.useRegions && !event.isBlock() && block != null) {
+            Vector pt = toVector(block.getRelative(event.getBlockFace()));
+            if (block.getType() == Material.WALL_SIGN) {
+                pt = pt.subtract(0, 1, 0);
+            }
+
+            if (!cfg.canBuild(player, pt)) {
+                player.sendMessage(ChatColor.DARK_RED
+                        + "You don't have permission for this area.");
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.getBlacklist() != null && item != null && block != null) {
+            if (!wcfg.getBlacklist().check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                    toVector(block.getRelative(event.getBlockFace())),
+                    item.getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (wcfg.useRegions && item != null && block != null && item.getTypeId() == 259) {
+            Vector pt = toVector(block.getRelative(event.getBlockFace()));
+            RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld().getName());
+
+            if (!mgr.getApplicableRegions(pt).isStateFlagAllowed(DefaultFlag.LIGHTER)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }*/
+
+    /**
+     * Called when a player attempts to drop an item.
+     */
+    @Override
+    public void onPlayerDropItem(PlayerDropItemEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getPlayer().getWorld());
+
+        if (wcfg.getBlacklist() != null) {
+            Item ci = event.getItemDrop();
+
+            if (!wcfg.getBlacklist().check(
+                    new ItemDropBlacklistEvent(plugin.wrapPlayer(event.getPlayer()),
+                            toVector(ci.getLocation()), ci.getItemStack().getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a player attempts to pickup an item.
+     */
+    @Override
+    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getPlayer().getWorld());
+
+        if (wcfg.getBlacklist() != null) {
+            Item ci = event.getItem();
+
+            if (!wcfg.getBlacklist().check(
+                    new ItemAcquireBlacklistEvent(plugin.wrapPlayer(event.getPlayer()),
+                            toVector(ci.getLocation()), ci.getItemStack().getTypeId()), false, true)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a bucket is filled.
+     */
+    @Override
+    public void onPlayerBucketFill(PlayerBucketFillEvent event) {
+        Player player = event.getPlayer();
+        World world = player.getWorld();
+        
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+        
+        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlockClicked())) {
+            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+            event.setCancelled(true);
+            return;
+        }
+        
+        if (wcfg.getBlacklist() != null) {
+            if (!wcfg.getBlacklist().check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(player.getLocation()), event.getBucket().getId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a bucket is empty.
+     */
+    @Override
+    public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
+        Player player = event.getPlayer();
+        World world = player.getWorld();
+        
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(world);
+        
+        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlockClicked())) {
+            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+            event.setCancelled(true);
+            return;
+        }
+        
+        if (wcfg.getBlacklist() != null) {
+            if (!wcfg.getBlacklist().check(
+                    new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
+                            toVector(player.getLocation()), event.getBucket().getId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+    
+    /**
+     * Called when a player is respawned.
+     */
+    @Override
+    public void onPlayerRespawn(PlayerRespawnEvent event) {
+        Player player = event.getPlayer();
+        Location location = player.getLocation();
+        
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(player.getWorld());
+        
+        if (wcfg.useRegions) {
+            Vector pt = toVector(location);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+    
+            Vector spawn = set.getFlag(DefaultFlag.SPAWN_LOC);
+    
+            if (spawn != null) {
+                RegionGroup group = set.getFlag(DefaultFlag.SPAWN_PERM);
+                Location spawnLoc = BukkitUtil.toLocation(player.getWorld(), spawn);
+                
+                if (group != null) {
+                    LocalPlayer localPlayer = plugin.wrapPlayer(player);
+                    
+                    if (group == RegionGroup.OWNERS) {
+                        if (set.isOwnerOfAll(localPlayer)) {
+                            event.setRespawnLocation(spawnLoc);
+                        }
+                    } else if (group == RegionGroup.MEMBERS) {
+                        if (set.isMemberOfAll(localPlayer)) {
+                            event.setRespawnLocation(spawnLoc);
+                        }
+                    }
+                } else {
+                    event.setRespawnLocation(spawnLoc);
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when a player changes their held item.
+     */
+    @Override
+    public void onItemHeldChange(PlayerItemHeldEvent event) {
+        Player player = event.getPlayer();
+        
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(player.getWorld());
+        
+        if (wcfg.removeInfiniteStacks
+                && !plugin.hasPermission(player, "worldguard.override.infinite-stack")) {
+            int newSlot = event.getNewSlot();
+            ItemStack heldItem = player.getInventory().getItem(newSlot);
+            if (heldItem.getAmount() < 0) {
+                player.getInventory().setItem(newSlot, null);
+                player.sendMessage(ChatColor.RED + "Infinite stack removed.");
+            }
+        }
+    }
+
+    /**
+     * Called when a player enters a bed.
+     */
+    @Override
+    public void onPlayerBedEnter(PlayerBedEnterEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        Location location = player.getLocation();
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+        if (wcfg.useRegions) {
+            Vector pt = toVector(location);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+            if (!plugin.getGlobalRegionManager().hasBypass(player, player.getWorld())
+                && !set.allows(DefaultFlag.SLEEP)) {
+                    event.setCancelled(true);
+                    player.sendMessage("This bed doesn't belong to you!");
+                    return;
+            }
+        }
+    }
+}
@@ -53,24 +53,24 @@ public class WorldGuardPlugin extends JavaPlugin {
    /**
     * Logger for messages.
     */
-    protected static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
    
    /**
     * Manager for commands. This automatically handles nested commands,
     * permissions checking, and a number of other fancy command things.
     * We just set it up and register commands against it.
     */
-    protected final CommandsManager<CommandSender> commands;
+    private final CommandsManager<CommandSender> commands;

    /**
     * Handles the region databases for all worlds.
     */
-    protected final GlobalRegionManager globalRegionManager;
+    private final GlobalRegionManager globalRegionManager;
    
    /**
     * Handles all configuration.
     */
-    protected final ConfigurationManager configuration;
+    private final ConfigurationManager configuration;
    
    /**
     * Processes queries for permissions information. The permissions manager
@@ -78,7 +78,12 @@ public class WorldGuardPlugin extends JavaPlugin {
     * systems and picking the right one. WorldGuard just needs to call
     * the permission methods.
     */
-    protected PermissionsResolverManager perms;
+    private PermissionsResolverManager perms;
+    
+    /**
+     * Used for scheduling flags.
+     */
+    private FlagStateManager flagStateManager;

    /**
     * Construct objects. Actual loading occurs when the plugin is enabled, so
@@ -128,14 +133,12 @@ public class WorldGuardPlugin extends JavaPlugin {
        // Load permissions
        (new PermissionsResolverServerListener(perms)).register(this);

-        // Register events
-        (new WorldGuardPlayerListener(this)).registerEvents();
-        (new WorldGuardBlockListener(this)).registerEvents();
-        (new WorldGuardEntityListener(this)).registerEvents();
-
-        // 25 equals about 1s real time
-        getServer().getScheduler().scheduleSyncRepeatingTask(
-                this, new TimedFlagsTimer(this), 25 * 5, 25 * 5);
+        flagStateManager = new FlagStateManager(this);
+        
+        if (configuration.useRegionsScheduler) { 
+            getServer().getScheduler().scheduleAsyncRepeatingTask(this,
+                    flagStateManager, FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
+        }

        if (configuration.suppressTickSyncWarnings) {
            Logger.getLogger("Minecraft").setFilter(
@@ -146,6 +149,13 @@ public class WorldGuardPlugin extends JavaPlugin {
                Logger.getLogger("Minecraft").setFilter(null);
            }
        }
+
+        // Register events
+        (new WorldGuardPlayerListener(this)).registerEvents();
+        (new WorldGuardBlockListener(this)).registerEvents();
+        (new WorldGuardEntityListener(this)).registerEvents();
+        (new WorldGuardWeatherListener(this)).registerEvents();
+        (new WorldGuardWorldListener(this)).registerEvents();
        
        logger.info("WorldGuard " + this.getDescription().getVersion() + " enabled.");
    }
@@ -202,8 +212,28 @@ public class WorldGuardPlugin extends JavaPlugin {
     * Get the WorldGuardConfiguraton.
     *
     * @return
+     * @deprecated Use {@link #getGlobalStateManager()} instead
     */
+    @Deprecated
    public ConfigurationManager getGlobalConfiguration() {
+        return getGlobalStateManager();
+    }
+    
+    /**
+     * Gets the flag state manager.
+     * 
+     * @return
+     */
+    public FlagStateManager getFlagStateManager() {
+        return flagStateManager;
+    }
+
+    /**
+     * Get the WorldGuardConfiguraton.
+     *
+     * @return
+     */
+    public ConfigurationManager getGlobalStateManager() {
        return configuration;
    }

@@ -276,7 +306,14 @@ public class WorldGuardPlugin extends JavaPlugin {
     */
    public boolean hasPermission(CommandSender sender, String perm) {
        if (sender.isOp()) {
-            return true;
+            if (sender instanceof Player) {
+                if (this.getGlobalStateManager().get(((Player) sender).
+                        getWorld()).opPermissions) {
+                    return true;
+                }
+            } else {
+                return true;
+            }
        }
        
        // Invoke the permissions resolver
@@ -653,6 +690,28 @@ public class WorldGuardPlugin extends JavaPlugin {
        }
    }
    
+    /**
+     * Notifies all with the notify permission.
+     * 
+     * @param msg
+     */
+    public void broadcastNotification(String msg) {
+        for (Player player : getServer().getOnlinePlayers()) {
+            if (hasPermission(player, "worldguard.notify")) {
+                player.sendMessage(msg);
+            }
+        }
+    }
+    
+    /**
+     * Forgets a player.
+     * 
+     * @param player
+     */
+    public void forgetPlayer(Player player) {
+        flagStateManager.forget(player);
+    }
+    
    /**
     * Checks to see if a player can build at a location. This will return
     * true if region protection is disabled.
@@ -0,0 +1,149 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.sk89q.worldguard.bukkit;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
+import org.bukkit.Location;
+import org.bukkit.event.Event;
+import org.bukkit.event.Event.Priority;
+import org.bukkit.event.weather.LightningStrikeEvent;
+import org.bukkit.event.weather.ThunderChangeEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
+import org.bukkit.event.weather.WeatherListener;
+import org.bukkit.plugin.PluginManager;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+
+import java.util.logging.Logger;
+
+public class WorldGuardWeatherListener extends WeatherListener {
+
+    /**
+     * Logger for messages.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+
+    /**
+     * Plugin.
+     */
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin
+     */
+    public WorldGuardWeatherListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    public void registerEvents() {
+        PluginManager pm = plugin.getServer().getPluginManager();
+
+        registerEvent("LIGHTNING_STRIKE", Priority.High);
+        registerEvent("THUNDER_CHANGE", Priority.High);
+        registerEvent("WEATHER_CHANGE", Priority.High);
+    }
+
+    /**
+     * Register an event, but not failing if the event is not implemented.
+     *
+     * @param typeName
+     * @param priority
+     */
+    private void registerEvent(String typeName, Priority priority) {
+        try {
+            Event.Type type = Event.Type.valueOf(typeName);
+            PluginManager pm = plugin.getServer().getPluginManager();
+            pm.registerEvent(type, this, priority, plugin);
+        } catch (IllegalArgumentException e) {
+            logger.info("WorldGuard: Unable to register missing event type " + typeName);
+        }
+    }
+
+    @Override
+    public void onWeatherChange(WeatherChangeEvent event) {
+        if (event.isCancelled()) {
+           return;
+        }
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getWorld());
+
+        if (event.toWeatherState()) {
+            if (wcfg.disableWeather) {
+                event.setCancelled(true);
+            }
+        } else {
+            if (!wcfg.disableWeather && wcfg.alwaysRaining) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @Override
+    public void onThunderChange(ThunderChangeEvent event) {
+        if (event.isCancelled()) {
+           return;
+        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getWorld());
+
+        if (event.toThunderState()) {
+            if (wcfg.disableThunder) {
+                event.setCancelled(true);
+            }
+        } else {
+            if (!wcfg.disableWeather && wcfg.alwaysThundering) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @Override
+    public void onLightningStrike(LightningStrikeEvent event) {
+        if (event.isCancelled()) {
+           return;
+        }
+
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(event.getWorld());
+
+        if (wcfg.disallowedLightningBlocks.size() > 0) {
+            int targetId = event.getLightning().getLocation().getBlock().getTypeId();
+            if (wcfg.disallowedLightningBlocks.contains(targetId)) {
+                event.setCancelled(true);
+            }
+        }
+
+        Location loc = event.getLightning().getLocation();
+        if (wcfg.useRegions) {
+            Vector pt = toVector(loc);
+            RegionManager mgr = plugin.getGlobalRegionManager().get(loc.getWorld());
+            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+
+            if (!set.allows(DefaultFlag.LIGHTNING)) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+}
@@ -0,0 +1,84 @@
+// $Id$
+/*
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ * All rights reserved.
+*/
+package com.sk89q.worldguard.bukkit;
+
+import org.bukkit.entity.*;
+import org.bukkit.event.Event;
+import org.bukkit.event.world.ChunkLoadEvent;
+import org.bukkit.event.world.WorldListener;
+import org.bukkit.plugin.PluginManager;
+
+import java.util.logging.Logger;
+
+public class WorldGuardWorldListener extends WorldListener {
+
+    /**
+     * Logger for messages.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
+
+    private WorldGuardPlugin plugin;
+
+    /**
+     * Construct the object;
+     *
+     * @param plugin
+     */
+    public WorldGuardWorldListener(WorldGuardPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Register events.
+     */
+    public void registerEvents() {
+        PluginManager pm = plugin.getServer().getPluginManager();
+
+        registerEvent("CHUNK_LOAD", 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 chunk is loaded.
+     */
+    public void onChunkLoad(ChunkLoadEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+
+        if (cfg.activityHaltToggle) {
+            int removed = 0;
+
+            for (Entity entity : event.getChunk().getEntities()) {
+                if (entity instanceof Item
+                        || (entity instanceof LivingEntity
+                        && !(entity instanceof Tameable)
+                        && !(entity instanceof Player))) {
+                    entity.remove();
+                    removed++;
+                }
+            }
+
+            if (removed > 50) {
+                logger.info("WG Halt-Act: " + removed + " entities (>50) auto-removed from "
+                        + event.getChunk().toString());
+            }
+        }
+    }
+}
@@ -36,10 +36,10 @@ public class GeneralCommands {
    @Command(aliases = {"god"},
            usage = "[player]",
            desc = "Enable godmode on a player",
-            flags = "", min = 0, max = 1)
+            flags = "s", min = 0, max = 1)
    public static void god(CommandContext args, WorldGuardPlugin plugin,
            CommandSender sender) throws CommandException {
-        ConfigurationManager config = plugin.getGlobalConfiguration();
+        ConfigurationManager config = plugin.getGlobalStateManager();
        
        Iterable<Player> targets = null;
        boolean included = false;
@@ -84,10 +84,10 @@ public class GeneralCommands {
    @Command(aliases = {"ungod"},
            usage = "[player]",
            desc = "Disable godmode on a player",
-            flags = "", min = 0, max = 1)
+            flags = "s", min = 0, max = 1)
    public static void ungod(CommandContext args, WorldGuardPlugin plugin,
            CommandSender sender) throws CommandException {
-        ConfigurationManager config = plugin.getGlobalConfiguration();
+        ConfigurationManager config = plugin.getGlobalStateManager();
        
        Iterable<Player> targets = null;
        boolean included = false;
@@ -124,14 +124,14 @@ public class GeneralCommands {
        // The player didn't receive any items, then we need to send the
        // user a message so s/he know that something is indeed working
        if (!included && args.hasFlag('s')) {
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Players now have god mode.");
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Players no longer have god mode.");
        }
    }
    
    @Command(aliases = {"heal"},
            usage = "[player]",
            desc = "Heal a player",
-            flags = "", min = 0, max = 1)
+            flags = "s", min = 0, max = 1)
    public static void heal(CommandContext args, WorldGuardPlugin plugin,
            CommandSender sender) throws CommandException {
        
@@ -177,7 +177,7 @@ public class GeneralCommands {
    @Command(aliases = {"slay"},
            usage = "[player]",
            desc = "Slay a player",
-            flags = "", min = 0, max = 1)
+            flags = "s", min = 0, max = 1)
    public static void slay(CommandContext args, WorldGuardPlugin plugin,
            CommandSender sender) throws CommandException {
        
@@ -202,12 +202,12 @@ public class GeneralCommands {
            
            // Tell the user
            if (player.equals(sender)) {
-                player.sendMessage(ChatColor.YELLOW + "Slayed!");
+                player.sendMessage(ChatColor.YELLOW + "Slain!");
                
                // Keep track of this
                included = true;
            } else {
-                player.sendMessage(ChatColor.YELLOW + "Slayed by "
+                player.sendMessage(ChatColor.YELLOW + "Slain by "
                        + plugin.toName(sender) + ".");
                
            }
@@ -216,7 +216,7 @@ public class GeneralCommands {
        // The player didn't receive any items, then we need to send the
        // user a message so s/he know that something is indeed working
        if (!included && args.hasFlag('s')) {
-            sender.sendMessage(ChatColor.YELLOW.toString() + "Players slayed.");
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Players slain.");
        }
    }
    
@@ -234,7 +234,7 @@ public class RegionCommands {
            region.setOwners(RegionUtil.parseDomainString(args.getSlice(1), 1));
        }

-        WorldConfiguration wcfg = plugin.getGlobalConfiguration().get(player.getWorld());
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld());
        RegionManager mgr = plugin.getGlobalRegionManager().get(sel.getWorld());
        
        // Check whether the player has created too many regions 
@@ -437,22 +437,41 @@ public class RegionCommands {
    }
    
    @Command(aliases = {"list"},
-            usage = "[page] [world]",
+            usage = "[.player] [page] [world]",
            desc = "Get a list of regions",
-            flags = "", min = 0, max = 2)
-    @CommandPermissions({"worldguard.region.list"})
+            flags = "", min = 0, max = 3)
+//    @CommandPermissions({"worldguard.region.list"})
    public static void list(CommandContext args, WorldGuardPlugin plugin,
            CommandSender sender) throws CommandException {

        World world;
        int page = 0;
+        int argl = 0;
+        String name = "";
+        boolean own = false;
+        LocalPlayer localPlayer = null;
        
-        if (args.argsLength() > 0) {
-            page = Math.max(0, args.getInteger(0) - 1);
+        if (args.argsLength() > 0 && args.getString(0).startsWith(".")) {
+            name = args.getString(0).substring(1).toLowerCase();
+            argl = 1;
+            
+            if (name.equals("me") || name.isEmpty() ||
+                    name.equals(plugin.checkPlayer(sender).getDisplayName().toLowerCase())) {
+                plugin.checkPermission(sender, "worldguard.region.list.own");
+                name = plugin.checkPlayer(sender).getDisplayName().toLowerCase();
+                localPlayer = plugin.wrapPlayer(plugin.checkPlayer(sender));
+                own = true;
+            }
+        }
+        if (!own)
+            plugin.checkPermission(sender, "worldguard.region.list");
+        
+        if (args.argsLength() > 0 + argl) {
+            page = Math.max(0, args.getInteger(0 + argl) - 1);
        }
        
-        if (args.argsLength() > 1) {
-            world = plugin.matchWorld(sender, args.getString(1));
+        if (args.argsLength() > 1 + argl) {
+            world = plugin.matchWorld(sender, args.getString(1 + argl));
        } else {
            world = plugin.checkPlayer(sender).getWorld();
        }
@@ -461,18 +480,54 @@ public class RegionCommands {

        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
        Map<String, ProtectedRegion> regions = mgr.getRegions();
+
        int size = regions.size();
-        int pages = (int) Math.ceil(size / (float) listSize);

        String[] regionIDList = new String[size];
        int index = 0;
+        boolean show = false;
+        String prefix = "";
        for (String id : regions.keySet()) {
-            regionIDList[index] = id;
-            index++;
+            show = false;
+            prefix = "";
+            if (name.isEmpty()) {
+                show = true;
+            }
+            else {
+                if (own) {
+                    if (regions.get(id).isOwner(localPlayer)) {
+                        show = true;
+                        prefix += "+";
+                    }
+                    else if (regions.get(id).isMember(localPlayer)) {
+                        show = true;
+                        prefix += "-";
+                    }
+                }
+                else {
+                    if (regions.get(id).getOwners().getPlayers().contains(name)) {
+                        show = true;
+                        prefix += "+";
+                    }
+                    if (regions.get(id).getMembers().getPlayers().contains(name)) {
+                        show = true;
+                        prefix += "-";
+                    }
+                }
+            }
+            if (show) {
+                regionIDList[index] = prefix + " " + id;
+                index++;
+            }
        }
+        if (!name.isEmpty())
+            regionIDList = Arrays.copyOf(regionIDList, index);
        Arrays.sort(regionIDList);
+        size = index;
+        int pages = (int) Math.ceil(size / (float) listSize);

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

        if (page < pages) {
@@ -481,7 +536,7 @@ public class RegionCommands {
                    break;
                }
                sender.sendMessage(ChatColor.YELLOW.toString() + (i + 1) +
-                        ". " + regionIDList[i]);
+                        "." + regionIDList[i]);
            }
        }
    }
@@ -19,12 +19,14 @@

 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 com.sk89q.worldguard.bukkit.WorldConfiguration;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import org.bukkit.entity.*;

 public class ToggleCommands {

@@ -43,7 +45,7 @@ public class ToggleCommands {
            world = plugin.matchWorld(sender, args.getString(0));
        }
        
-        WorldConfiguration wcfg = plugin.getGlobalConfiguration().get(world);
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world);

        if (!wcfg.fireSpreadDisableToggle) {
            plugin.getServer().broadcastMessage(
@@ -74,7 +76,7 @@ public class ToggleCommands {
            world = plugin.matchWorld(sender, args.getString(0));
        }
        
-        WorldConfiguration wcfg = plugin.getGlobalConfiguration().get(world);
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world);

        if (wcfg.fireSpreadDisableToggle) {
            plugin.getServer().broadcastMessage(ChatColor.YELLOW
@@ -87,4 +89,55 @@ public class ToggleCommands {

        wcfg.fireSpreadDisableToggle = false;
    }
+
+    @Command(aliases = {"halt-activity"},
+            usage = "", desc = "Attempts to cease as much activity in order to stop lag",
+            flags = "c", min = 0, max = 0)
+    @CommandPermissions({"worldguard.halt-activity"})
+    public static void stopLag(CommandContext args, WorldGuardPlugin plugin,
+            CommandSender sender) throws CommandException {
+
+        ConfigurationManager configManager = plugin.getGlobalStateManager();
+
+        configManager.activityHaltToggle = !args.hasFlag('c');
+
+        if (configManager.activityHaltToggle) {
+            if (!(sender instanceof Player)) {
+                sender.sendMessage(ChatColor.YELLOW
+                        + "ALL intensive server activity halted.");
+            }
+
+            plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                    + "ALL intensive server activity halted by "
+                    + plugin.toName(sender) + ".");
+
+            for (World world : plugin.getServer().getWorlds()) {
+                int removed = 0;
+
+                for (Entity entity : world.getEntities()) {
+                    if (entity instanceof Item
+                            || (entity instanceof LivingEntity
+                            && !(entity instanceof Tameable)
+                            && !(entity instanceof Player))) {
+                        entity.remove();
+                        removed++;
+                    }
+                }
+
+                if (removed > 10) {
+                    sender.sendMessage("" + removed + " entities (>10) auto-removed from "
+                            + world.toString());
+                }
+            }
+
+        } else {
+            if (!(sender instanceof Player)) {
+                sender.sendMessage(ChatColor.YELLOW
+                        + "ALL intensive server activity no longer halted.");
+            }
+
+            plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                    + "ALL intensive server activity is now allowed.");
+        }
+    }
 }
@@ -69,9 +69,9 @@ public class WorldGuardCommands {
        }

        try {
-            plugin.getGlobalConfiguration().unload();
+            plugin.getGlobalStateManager().unload();
            plugin.getGlobalRegionManager().unload();
-            plugin.getGlobalConfiguration().load();
+            plugin.getGlobalStateManager().load();
            plugin.getGlobalRegionManager().preload();
            sender.sendMessage("WorldGuard configuration reloaded.");
        } catch (Throwable t) {
@@ -109,13 +109,11 @@ public class WorldGuardCommands {
            sender.sendMessage(ChatColor.YELLOW + "Now uploading to Pastebin...");
            PastebinPoster.paste(report.toString(), new PasteCallback() {
                
-                @Override
                public void handleSuccess(String url) {
                    // Hope we don't have a thread safety issue here
                    sender.sendMessage(ChatColor.YELLOW + "WorldGuard report (1 hour): " + url);
                }
                
-                @Override
                public void handleError(String err) {
                    // Hope we don't have a thread safety issue here
                    sender.sendMessage(ChatColor.YELLOW + "WorldGuard report pastebin error: " + err);
@@ -0,0 +1,67 @@
+// $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.chest;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+/**
+ * Interface for chest protection.
+ */
+public interface ChestProtection {
+
+    /**
+     * Returns whether a block is protected.
+     * 
+     * @param block
+     * @param player
+     * @return
+     */
+    public boolean isProtected(Block block, Player player);
+
+    /**
+     * Returns whether a location where a chest block is trying to be created 
+     * is protected. 
+     * 
+     * @param block
+     * @param player
+     * @return
+     */
+    public boolean isProtectedPlacement(Block block, Player player);
+
+    /**
+     * Returns whether an adjacent chest is protected.
+     * 
+     * @param searchBlock
+     * @param player
+     * @return
+     */
+    public boolean isAdjacentChestProtected(Block searchBlock, Player player);
+
+    /**
+     * Returns whether a material is a chest.
+     * 
+     * @param material
+     * @return
+     */
+    public boolean isChest(Material material);
+
+}
@@ -0,0 +1,156 @@
+// $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.chest;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
+import org.bukkit.entity.Player;
+
+/**
+ * Sign-based chest protection.
+ * 
+ * @author sk89q
+ */
+public class SignChestProtection implements ChestProtection {
+    
+    public boolean isProtected(Block block, Player player) {
+        if (isChest(block.getType())) {
+            Block below = block.getRelative(0, -1, 0);
+            return isProtectedSignAround(below, player);
+        } else if (block.getType() == Material.SIGN_POST) {
+            return isProtectedSignAndChestBinary(block, player);
+        } else {
+            Block above = block.getRelative(0, 1, 0);
+            Boolean res = isProtectedSign(above, player);
+            if (res != null) return res;
+            return false;
+        }
+    }
+    
+    public boolean isProtectedPlacement(Block block, Player player) {
+        return isProtectedSignAround(block, player);
+    }
+    
+    private boolean isProtectedSignAround(Block searchBlock, Player player) {
+        Block side;
+        Boolean res;
+        
+        side = searchBlock;
+        res = isProtectedSign(side, player);
+        if (res != null && res == true) return res;
+        
+        side = searchBlock.getRelative(-1, 0, 0);
+        res = isProtectedSignAndChest(side, player);
+        if (res != null && res == true) return res;
+        
+        side = searchBlock.getRelative(1, 0, 0);
+        res = isProtectedSignAndChest(side, player);
+        if (res != null && res == true) return res;
+        
+        side = searchBlock.getRelative(0, 0, -1);
+        res = isProtectedSignAndChest(side, player);
+        if (res != null && res == true) return res;
+        
+        side = searchBlock.getRelative(0, 0, 1);
+        res = isProtectedSignAndChest(side, player);
+        if (res != null && res == true) return res;
+        
+        return false;
+    }
+    
+    private Boolean isProtectedSign(Sign sign, Player player) {
+        if (sign.getLine(0).equalsIgnoreCase("[Lock]")) {
+            if (player == null) { // No player, no access
+                return true;
+            }
+            
+            String name = player.getName();
+            if (name.equalsIgnoreCase(sign.getLine(1).trim())
+                    || name.equalsIgnoreCase(sign.getLine(2).trim())
+                    || name.equalsIgnoreCase(sign.getLine(3).trim())) {
+                return false;
+            }
+            
+            // No access!
+            return true;
+        }
+        
+        return null;
+    }
+    
+    private Boolean isProtectedSign(Block block, Player player) {
+        BlockState state = block.getState();
+        if (state == null || !(state instanceof Sign)) {
+            return null;
+        }
+        return isProtectedSign((Sign) state, player);
+    }
+    
+    private Boolean isProtectedSignAndChest(Block block, Player player) {
+        if (!isChest(block.getRelative(0, 1, 0).getType())) {
+            return null;
+        }
+        return isProtectedSign(block, player);
+    }
+    
+    private boolean isProtectedSignAndChestBinary(Block block, Player player) {
+        Boolean res = isProtectedSignAndChest(block, player);
+        if (res == null || res == false) {
+            return false;
+        }
+        return true;
+    }
+
+    public boolean isAdjacentChestProtected(Block searchBlock, Player player) {
+        Block side;
+        Boolean res;
+        
+        side = searchBlock;
+        res = isProtected(side, player);
+        if (res != null && res == true) return res;
+        
+        side = searchBlock.getRelative(-1, 0, 0);
+        res = isProtected(side, player);
+        if (res != null && res == true) return res;
+        
+        side = searchBlock.getRelative(1, 0, 0);
+        res = isProtected(side, player);
+        if (res != null && res == true) return res;
+        
+        side = searchBlock.getRelative(0, 0, -1);
+        res = isProtected(side, player);
+        if (res != null && res == true) return res;
+        
+        side = searchBlock.getRelative(0, 0, 1);
+        res = isProtected(side, player);
+        if (res != null && res == true) return res;
+        
+        return false;
+    }
+    
+    public boolean isChest(Material material) {
+        return material == Material.CHEST
+                || material == Material.DISPENSER
+                || material == Material.FURNACE
+                || material == Material.BURNING_FURNACE;
+    }
+}
@@ -36,7 +36,7 @@ import com.sk89q.worldguard.LocalPlayer;
 * 
 * @author sk89q
 */
-public class ApplicableRegionSet {
+public class ApplicableRegionSet implements Iterable<ProtectedRegion> {

    private Collection<ProtectedRegion> applicable;
    private ProtectedRegion globalRegion;
@@ -149,7 +149,7 @@ public class ApplicableRegionSet {
            allowed = def; 
        }
        
-        int lastPriority = 0;
+        int lastPriority = Integer.MIN_VALUE;

        // The algorithm is as follows:
        // While iterating through the list of regions, if an entry disallows
@@ -178,6 +178,8 @@ public class ApplicableRegionSet {
            if (found && region.getPriority() < lastPriority) {
                break;
            }
+            
+            lastPriority = region.getPriority();

            // Ignore non-build regions
            if (player != null
@@ -217,7 +219,6 @@ public class ApplicableRegionSet {
            }

            found = true;
-            lastPriority = region.getPriority();
        }

        return found == false ? def :
@@ -77,7 +77,7 @@ public class GlobalRegionManager {
     */
    public GlobalRegionManager(WorldGuardPlugin plugin) {
        this.plugin = plugin;
-        config = plugin.getGlobalConfiguration();
+        config = plugin.getGlobalStateManager();
        managers = new HashMap<String, RegionManager>();
        lastModified = new HashMap<String, Long>();
    }
@@ -127,8 +127,9 @@ public class GlobalRegionManager {
     * Load region information for a world.
     * 
     * @param world
+     * @return 
     */
-    public void load(World world) {
+    public RegionManager load(World world) {
        String name = world.getName();
        File file = getPath(name);
        
@@ -143,11 +144,16 @@ public class GlobalRegionManager {

            // Store the last modification date so we can track changes
            lastModified.put(name, file.lastModified());
+            
+            return manager;
        } catch (FileNotFoundException e) {
        } catch (IOException e) {
            logger.warning("WorldGuard: Failed to load regions from file "
                    + file.getAbsolutePath() + " : " + e.getMessage());
        }
+        
+        // @TODO: THIS CREATES PROBLEMS!!
+        return null;
    }
    
    /**
@@ -197,7 +203,7 @@ public class GlobalRegionManager {
        RegionManager manager = managers.get(world.getName());

        if (manager == null) {
-            load(world);
+            manager = load(world);
        }

        return manager;
@@ -68,7 +68,6 @@ public class CSVDatabase extends AbstractProtectionDatabase {
    /**
     * Saves the database.
     */
-    @Override
    public void save() throws IOException {
        throw new UnsupportedOperationException("CSV format is no longer implemented");
    }
@@ -76,7 +75,6 @@ public class CSVDatabase extends AbstractProtectionDatabase {
    /**
     * Load the database from file.
     */
-    @Override
    public void load() throws IOException {
        Map<String,ProtectedRegion> regions =
                new HashMap<String,ProtectedRegion>();
@@ -53,7 +53,6 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
        config = new Configuration(file);
    }

-    @Override
    public void load() throws IOException {
        config.load();
        
@@ -183,7 +182,6 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
        return domain;
    }

-    @Override
    public void save() throws IOException {
        config.clear();
        
@@ -274,12 +272,10 @@ public class YAMLDatabase extends AbstractProtectionDatabase {
        domainData.put(key, list);
    }

-    @Override
    public Map<String, ProtectedRegion> getRegions() {
        return regions;
    }

-    @Override
    public void setRegions(Map<String, ProtectedRegion> regions) {
        this.regions = regions;
    }
@@ -0,0 +1,56 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.sk89q.worldguard.protection.flags;
+
+import org.bukkit.command.CommandSender;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import org.bukkit.entity.CreatureType;
+
+/**
+ * Represents a creature type.
+ *
+ * @author sk89q
+ */
+public class CreatureTypeFlag extends EnumFlag<CreatureType> {
+
+    public CreatureTypeFlag(String name, char legacyCode) {
+        super(name, legacyCode, CreatureType.class);
+    }
+
+    public CreatureTypeFlag(String name) {
+        super(name, CreatureType.class);
+    }
+
+    @Override
+    public CreatureType detectValue(String input) {
+        CreatureType lowMatch = null;
+
+        for (CreatureType type : CreatureType.values()) {
+            if (type.name().equalsIgnoreCase(input.trim())) {
+                return type;
+            }
+
+            if (type.name().toLowerCase().startsWith(input.toLowerCase().trim())) {
+                lowMatch = type;
+            }
+        }
+
+        return lowMatch;
+    }
+}
@@ -19,6 +19,10 @@

 package com.sk89q.worldguard.protection.flags;

+import org.bukkit.entity.CreatureType;
+
+import java.util.Set;
+
 /**
 *
 * @author sk89q
@@ -29,21 +33,27 @@ public final class DefaultFlag {
    public static final StateFlag BUILD = new StateFlag("build", 'b', true);
    public static final StateFlag PVP = new StateFlag("pvp", 'p', true);
    public static final StateFlag MOB_DAMAGE = new StateFlag("mob-damage", 'm', true);
+    public static final StateFlag MOB_SPAWNING = new StateFlag("mob-spawning", true);
    public static final StateFlag CREEPER_EXPLOSION = new StateFlag("creeper-explosion", 'c', true);
+    public static final StateFlag GHAST_FIREBALL = new StateFlag("ghast-fireball", true);
+    public static final StateFlag SLEEP = new StateFlag("sleep", true);
    public static final StateFlag TNT = new StateFlag("tnt", 't', true);
    public static final StateFlag LIGHTER = new StateFlag("lighter", 'l', true);
    public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", 'f', true);
    public static final StateFlag LAVA_FIRE = new StateFlag("lava-fire", 'F', true);
+    public static final StateFlag LIGHTNING = new StateFlag("lightning", true);
    public static final StateFlag CHEST_ACCESS = new StateFlag("chest-access", 'C', false);
    public static final StateFlag WATER_FLOW = new StateFlag("water-flow", true);
    public static final StateFlag LAVA_FLOW = new StateFlag("lava-flow", true);
-    public static final StateFlag USE = new StateFlag("use", false);
+    public static final StateFlag USE = new StateFlag("use", true);
    public static final StateFlag PLACE_VEHICLE = new StateFlag("vehicle-place", false);
+    public static final StateFlag SNOW_FALL = new StateFlag("snow-fall", true);
+    public static final StateFlag LEAF_DECAY = new StateFlag("leaf-decay", true);
    public static final StringFlag GREET_MESSAGE = new StringFlag("greeting");
    public static final StringFlag FAREWELL_MESSAGE = new StringFlag("farewell");
-    public static final BooleanFlag NOTIFY_GREET = new BooleanFlag("notify-greet");
-    public static final BooleanFlag NOTIFY_FAREWELL = new BooleanFlag("notify-farewell");
-    public static final StringFlag DENY_SPAWN = new StringFlag("deny-spawn");
+    public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter");
+    public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave");
+    public static final SetFlag<CreatureType> DENY_SPAWN = new SetFlag<CreatureType>("deny-spawn", new CreatureTypeFlag(null));
    public static final IntegerFlag HEAL_DELAY = new IntegerFlag("heal-delay");
    public static final IntegerFlag HEAL_AMOUNT = new IntegerFlag("heal-amount");
    public static final VectorFlag TELE_LOC = new VectorFlag("teleport");
@@ -52,13 +62,14 @@ public final class DefaultFlag {
    public static final RegionGroupFlag SPAWN_PERM = new RegionGroupFlag("spawn-group");
    public static final BooleanFlag BUYABLE = new BooleanFlag("buyable");
    public static final DoubleFlag PRICE = new DoubleFlag("price");
-    
+
    public static final Flag<?>[] flagsList = new Flag<?>[] {
-        PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, CREEPER_EXPLOSION,
+        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_GREET,
-        NOTIFY_FAREWELL, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,
-        TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE
+        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
    };
    
    private DefaultFlag() {
@@ -0,0 +1,91 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.sk89q.worldguard.protection.flags;
+
+import org.bukkit.command.CommandSender;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
+/**
+ *
+ * @author sk89q
+ */
+public class EnumFlag<T extends Enum<T>> extends Flag<T> {
+
+    private Class<T> enumClass;
+    
+    public EnumFlag(String name, char legacyCode, Class<T> enumClass) {
+        super(name, legacyCode);
+        this.enumClass = enumClass;
+    }
+
+    public EnumFlag(String name, Class<T> enumClass) {
+        super(name);
+        this.enumClass = enumClass;
+    }
+
+    private T findValue(String input) throws IllegalArgumentException {
+        try {
+            return Enum.valueOf(enumClass, input);
+        } catch (IllegalArgumentException e) {
+            T val = detectValue(input);
+
+            if (val != null) {
+                return val;
+            }
+
+            throw e;
+        }
+    }
+
+    /**
+     * Fuzzy detect the value if the value is not found.
+     *
+     * @param input string input
+     * @return value or null
+     */
+    public T detectValue(String input) {
+        return null;
+    }
+
+    @Override
+    public T parseInput(WorldGuardPlugin plugin, CommandSender sender,
+            String input) throws InvalidFlagFormat {
+        try {
+            return findValue(input);
+        } catch (IllegalArgumentException e) {
+            throw new InvalidFlagFormat("Unknown value '" + input + "' in "
+                    + enumClass.getName());
+        }
+    }
+
+    @Override
+    public T unmarshal(Object o) {
+        try {
+            return Enum.valueOf(enumClass, String.valueOf(o));
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public Object marshal(T o) {
+        return o.name();
+    }
+    
+}
@@ -0,0 +1,86 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.sk89q.worldguard.protection.flags;
+
+import org.bukkit.command.CommandSender;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
+import java.util.*;
+
+/**
+ * Represents a flag that consists of a set.
+ *
+ * @author sk89q
+ */
+public class SetFlag<T> extends Flag<Set<T>> {
+
+    private Flag<T> subFlag;
+    
+    public SetFlag(String name, char legacyCode, Flag<T> subFlag) {
+        super(name, legacyCode);
+        this.subFlag = subFlag;
+    }
+
+    public SetFlag(String name, Flag<T> subFlag) {
+        super(name);
+        this.subFlag = subFlag;
+    }
+
+    @Override
+    public Set<T> parseInput(WorldGuardPlugin plugin, CommandSender sender,
+            String input) throws InvalidFlagFormat {
+        Set<T> items = new HashSet<T>();
+
+        for (String str : input.split(",")) {
+            items.add(subFlag.parseInput(plugin, sender, str.trim()));
+        }
+
+        return new HashSet<T>(items);
+    }
+
+    @Override
+    public Set<T> unmarshal(Object o) {
+        if (o instanceof Collection) {
+            Collection collection = (Collection) o;
+            Set<T> items = new HashSet<T>();
+
+            for (Object sub : collection) {
+                T item = subFlag.unmarshal(sub);
+                if (item != null) {
+                    items.add(item);
+                }
+            }
+
+            return items;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Object marshal(Set<T> o) {
+        List<Object> list = new ArrayList<Object>();
+        for (T item : o) {
+            list.add(subFlag.marshal(item));
+        }
+
+        return list;
+    }
+    
+}
@@ -21,8 +21,8 @@ package com.sk89q.worldguard.protection.managers;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.PriorityQueue;
 import java.util.TreeMap;
+import java.util.TreeSet;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
@@ -138,12 +138,22 @@ public class FlatRegionManager extends RegionManager {
     */
    @Override
    public ApplicableRegionSet getApplicableRegions(Vector pt) {
-        PriorityQueue<ProtectedRegion> appRegions =
-                new PriorityQueue<ProtectedRegion>();
+        TreeSet<ProtectedRegion> appRegions =
+                new TreeSet<ProtectedRegion>();

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

@@ -19,9 +19,9 @@
 package com.sk89q.worldguard.protection.managers;

 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.PriorityQueue;
 import java.util.TreeMap;
 import org.khelekore.prtree.MBRConverter;
 import org.khelekore.prtree.PRTree;
@@ -154,8 +154,8 @@ public class PRTreeRegionManager extends RegionManager {
     */
    @Override
    public ApplicableRegionSet getApplicableRegions(Vector pt) {
-        PriorityQueue<ProtectedRegion> appRegions =
-                new PriorityQueue<ProtectedRegion>();
+        List<ProtectedRegion> appRegions =
+                new ArrayList<ProtectedRegion>();

        int x = pt.getBlockX();
        int z = pt.getBlockZ();
@@ -165,6 +165,8 @@ public class PRTreeRegionManager extends RegionManager {
                appRegions.add(region);
            }
        }
+        
+        Collections.sort(appRegions);

        return new ApplicableRegionSet(appRegions, regions.get("__global__"));
    }
@@ -20,7 +20,6 @@ package com.sk89q.worldguard.protection.regions;

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

@@ -148,7 +147,7 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
                            || (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));
+                //intersectingRegions.add(regions.get(i));
                continue;
            }

@@ -167,7 +166,7 @@ public class ProtectedCuboidRegion extends ProtectedRegion {

            // Check whether the other regions points are inside the current region
            if (region instanceof ProtectedPolygonalRegion) {
-                for (i2 = 0; i < ((ProtectedPolygonalRegion)region).getPoints().size(); i++) {
+                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;
@@ -277,11 +277,11 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
        }

        double area = 0;
-        int xa, za, z1, z2;
+        int xa, z1, z2;

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

            if (points.get(i + 1) == null) {
                z1 = points.get(0).getBlockZ();
@@ -298,7 +298,7 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
        }

        xa = points.get(0).getBlockX();
-        za = points.get(0).getBlockZ();
+        //za = points.get(0).getBlockZ();

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

@@ -43,22 +43,27 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
     * 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.
     */
@@ -298,8 +303,10 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
     * @return
     */
    public int compareTo(ProtectedRegion other) {
-        if (priority == other.priority) {
+        if (id.equals(other.id)) {
            return 0;
+        } else if (priority == other.priority) {
+            return 1;
        } else if (priority > other.priority) {
            return -1;
        } else {
@@ -314,6 +321,13 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
     */
    public abstract String getTypeName();

+    /**
+     * Get a list of intersecting regions.
+     * 
+     * @param regions
+     * @return
+     * @throws UnsupportedIntersectionException
+     */
    public abstract List<ProtectedRegion> getIntersectingRegions(
            List<ProtectedRegion> regions)
            throws UnsupportedIntersectionException;
@@ -328,6 +342,27 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
        return idPattern.matcher(id).matches();
    }
    
+    /**
+     * Returns the hash code.
+     */
+    @Override
+    public int hashCode(){
+        return id.hashCode();
+    }
+    
+    /**
+     * Returns whether this region has the same ID as another region.
+     */
+    @Override
+    public boolean equals(Object obj) {
+        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.
Author	SHA1	Message	Date
sk89q	2b6ee344b7	[maven-release-plugin] prepare release 5.1	2011-06-26 03:02:02 -07:00
sk89q	8f55b82e2f	Updated for 5.1.	2011-06-26 02:52:40 -07:00
sk89q	ba9cd1f3e2	Updated the README.html.	2011-06-26 02:52:13 -07:00
sk89q	e0e7ae98e7	Changed configuration files to save and also to inherit from the main configuration.	2011-06-26 02:24:50 -07:00
sk89q	b05e439da9	Cleaned up pom.xml and updated maven-assembly-plugin to 2.2.1.	2011-06-26 01:31:59 -07:00
sk89q	fb5dbbdf58	Removed .gitignore.	2011-06-26 01:28:24 -07:00
sk89q	9cb9dd0a58	Updated the README.html.	2011-06-26 01:27:55 -07:00
sk89q	276d42561e	Added more aggressive TNT flag check.	2011-06-26 00:47:58 -07:00
sk89q	44b98165ba	Added region protection to sign change event.	2011-06-26 00:24:09 -07:00
sk89q	b5088340fd	Fixed deny-spawn.	2011-06-25 23:27:01 -07:00
sk89q	b7dd63ebd9	Changed event registration to catch errors.	2011-06-25 21:46:14 -07:00
Wizjany	ba376a6326	Registering some other new events 'safely'	2011-06-22 21:29:22 -04:00
sk89q	87a43e8e8f	Made SNOW_FORM be registered programatically so it can be used on CraftBukkit versions lacking that.	2011-06-22 08:46:37 -07:00
sk89q	b62ada53c3	Re-ordered plugin enable process.	2011-06-22 08:43:10 -07:00
sk89q	4f3198b1bd	wiz makes a good point -- PROBABLY should not delete players.	2011-06-20 19:35:14 -07:00
sk89q	c9f99e0903	Added /stoplag or /halt-activity to cease all intensive operations (such as fire spread, water flow, mob spawning, etc.) and to remove mobs (except wolves) and item drops proactively for those situations when you (or someone else) messes up really badly.	2011-06-20 19:25:05 -07:00
Wizjany	6496bbd87f	Added config option to disable mob damage for people not using regions	2011-06-15 13:02:59 -04:00
Wizjany	4ad8d362f7	Reverted change to use flag	2011-06-12 14:36:26 -04:00
Wizjany	d9aeb6afaa	Fixed NPE in last commit	2011-06-11 16:24:06 -04:00
Wizjany	d971389746	Prevent players from using bonemeal on grass if they aren't allowed to build in a region	2011-06-11 14:13:46 -04:00
sk89q	233a2bdbe7	Fixed an important bug with the algorithm for handling region priorities.	2011-06-11 01:21:08 -07:00
sk89q	2277183330	Added some more region priority unit tests.	2011-06-11 01:21:08 -07:00
Wizjany	b2cd3d31fd	Standardizing override permission nodes (with backwards compatibility)	2011-06-10 16:00:14 -04:00
Wizjany	02f6b3be42	Fixed USE flag being DENY in undefined regions	2011-06-10 15:50:03 -04:00
Wizjany	22e84321fc	Removed duplicate handling of lighter fire	2011-06-10 01:41:59 -04:00
Wizjany	c472dc89ad	Changed the way some flags were handled and canceled	2011-06-09 17:02:19 -04:00
Wizjany	b89d9d44b0	Now with 99.9% less Unknown Paste ID	2011-06-09 00:12:06 -04:00
Wizjany	a2c21f8ceb	Made anti-dumb wolf checks only apply to tamed wolves	2011-06-08 23:55:07 -04:00
sk89q	e35596b0fa	Allowed blocking weapon usage with the blacklist.	2011-06-07 16:08:50 -07:00
Wizjany	b95a7f063b	Fixed disabling durability resetting things which use durability otherwise	2011-06-07 16:32:43 -04:00
sk89q	e4bbd36d47	<= 0 health? It's too late bby	2011-06-06 16:53:11 -07:00
sk89q	9790ab29a2	Now a very proactive (but not still reserved) infinite stack checker.	2011-06-06 14:46:06 -07:00
sk89q	24cc2d3b36	Changed the proactive infinite stack check to occur on inventory open.	2011-06-06 14:35:57 -07:00
sk89q	12779699e3	Improved the infinite item stack remover by making it a bit more proactive.	2011-06-06 14:31:17 -07:00
sk89q	2188690d20	Changed leave messages to be printed BEFORE enter messages. Suggested by Protected.	2011-06-06 11:30:00 -07:00
sk89q	7059fdfd9e	Removed old/redundant code.	2011-06-06 11:29:11 -07:00
sk89q	9e1bde4b00	Merge remote-tracking branch 'remotes/origin/master'	2011-06-06 11:15:40 -07:00
sk89q	45790b60b0	Restored the configuration class name change so plugins don't have to be updated.	2011-06-06 11:08:38 -07:00
sk89q	c5f3a27d6b	Rewrote greeting/farewell and notify-enter/notify-leave flags.	2011-06-05 17:18:27 -07:00
sk89q	d9136aa407	Optimized flags scheduler.	2011-06-05 16:38:28 -07:00
sk89q	183f48a998	Rewrote how healing flags were handled.	2011-06-05 16:31:42 -07:00
Wizjany	3c5bc507a5	Added trap doors to USE flag	2011-06-03 18:05:28 -04:00
Wizjany	548dd0365c	Fixed another infinite sign...	2011-06-02 19:34:29 -04:00
Wizjany	4591fc603f	Added permission nodes as an alternative to wg-invincible and -amphibious groups.	2011-05-31 19:58:12 -04:00
Wizjany	26946feecc	Merge leafdecay flag from zml2008	2011-05-27 19:06:38 -04:00
sk89q	dd14f3c469	Fixed priorities and parent-child regions, I believe. More testing is required. Removed dated CSVDatabaseTest.	2011-05-26 21:55:23 -07:00
sk89q	474562455d	Abstracted chest protection.	2011-05-23 23:32:45 -07:00
sk89q	c75d612541	Cleaned up code. The configuration classes were also renamed as they did much more than just configuration.	2011-05-23 23:32:44 -07:00
sk89q	8de6ce9868	Cleaned up code from a merge.	2011-05-23 23:30:54 -07:00
sk89q	97bde50708	Fixed some chest protection issues.	2011-05-23 23:30:54 -07:00
sk89q	b23e35cf26	Improved chest-sign protection.	2011-05-23 23:30:53 -07:00
sk89q	b58e04707d	Timer flags timer removed. It will be restored when it gets rewritten to not leak memory and to handle messages better.	2011-05-23 23:30:53 -07:00
MonsieurApple	846cf63268	Merge pull request #109 from wizjany/master Ghast fireballs and explosion cancelling	2011-05-23 20:04:24 -07:00
Wizjany	4850bdefdf	Added config option to disable explosion-caused damage to players.	2011-05-23 22:26:02 -04:00
Wizjany	424b580eb9	Added ghast fireball handling (instead of grouping with tnt) and fixed god mode player ignition.	2011-05-23 22:25:56 -04:00
MonsieurApple	7f8ad468ca	Merge pull request #108 from Moo0/derp Bug in ProtectedCuboidRegion/getIntersectingRegions.	2011-05-23 13:55:05 -07:00
Moo0	e07e2bd7d1	Someone used the wrong variable in a for.	2011-05-23 21:44:02 +01:00
MonsieurApple	88acbe655d	Merge pull request #106 from kuyanatan/master Fixed config misspell	2011-05-21 11:15:51 -07:00
Natan	903ebc68a4	Worldgurad != worldguard.	2011-05-21 10:48:07 -07:00
MonsieurApple	49bdccf020	Merge pull request #103 from wizjany/master Fixed some derpy fire handling	2011-05-17 07:05:09 -07:00
MonsieurApple	ba3818884d	Merge pull request #99 from Moo0/listbyname Filter "/region list" by user.	2011-05-16 17:11:13 -07:00
MonsieurApple	64ce904ec1	Merge pull request #104 from wizjany/opPerms Added config for op permissions	2011-05-16 17:09:59 -07:00
Wizjany	8c5f7ef020	Added config for op permissions	2011-05-16 20:03:45 -04:00
Wizjany	98426f6dcc	Added config for op permissions	2011-05-16 19:43:04 -04:00
Wizjany	f3ec873ac2	Fixed some derpy fire handling.	2011-05-16 16:27:17 -04:00
MonsieurApple	30961483e1	Merge pull request #101 from wizjany/master Fixed some commands not accepting flags they should	2011-05-14 11:42:01 -07:00
Wizjany	33e0750959	General commands now use flags as intended	2011-05-14 13:19:02 -04:00
MonsieurApple	e59a07e232	Merge pull request #100 from wizjany/master Painting events and snow fall flag	2011-05-13 05:20:20 -07:00
Wizjany	3b05b9be11	Added support for painting and added a flag for snow falling.	2011-05-13 00:37:48 -04:00
Moo0	943bbd9889	Show regions user is member of, as well as those user is owner of.	2011-05-08 18:55:48 +01:00
Moo0	763cf8dbda	Add ability to filter '/region list' by user.	2011-05-08 18:44:08 +01:00
sk89q	5117518d8f	Cleaned up code, removed OpenCSV code from WorldGuard. Now it's a dependency (that's compiled into the .jar).	2011-05-03 15:36:04 -07:00
sk89q	936996da17	Moved the unit tests to their proper place as recommended by the Maven gods.	2011-05-03 02:07:21 -07:00
sk89q	019a7e59b7	Alright, here's a surprise. Everything is now on Maven.	2011-05-03 02:04:55 -07:00
sk89q	428a47f889	Merge branch 'master' of https://github.com/wizjany/worldguard	2011-05-03 01:31:49 -07:00
Steven Mattera	2be2cb19b2	Uncommented line 445 on WorldGuardEntityListener	2011-05-03 01:30:07 -07:00
Steven Mattera	66ee09d050	Fixed TimedFlagsTimer to enable HEAL_DELAY,HEAL_AMOUNT,GREETING,FAREWELL,NOTIFY_GREET,NOTIFY_FAREWELL, and PASSTHROUGH Flags.	2011-05-03 01:30:07 -07:00
Steven Mattera	906dab28c1	Added MOB_SPAWNING state flag.	2011-05-03 01:30:06 -07:00
	6db8e1d842	Merge pull request #94 from yetanotherx/chest-blacklist. Don't deny placing a blacklisted item if the block clicked is a chest.	2011-05-03 01:32:00 -07:00
Yetanotherx	a665e86096	Don't deny placing a blacklisted item if the block clicked is a chest. People often complain that "i was just trying to open my chest" when they were holding water.	2011-04-30 12:26:39 -04:00
sk89q	b7481dbd2e	Updated config.	2011-04-24 13:14:12 -07:00
Wizjany	b1e509c6f8	Updated for 1.5 and added existing lightning protection.	2011-04-25 04:08:28 +08:00
Wizjany	1f69622a34	Added a lot of missing things to player listener.	2011-04-25 04:06:48 +08:00
Wizjany	215b2b5f75	Added config to stop players from trampling crops. Animals don't work yet (blame CraftBukkit)	2011-04-25 04:04:48 +08:00
Wizjany	1e8c91e92f	Added override for flint and steel blocking.	2011-04-25 04:04:47 +08:00
Wizjany	19d447d67d	Added handling for weather events. Depends on my craftbukkit pull request.	2011-04-24 15:55:26 -04:00
Wizjany	925fa2ee1b	Updated for 1.5 and added existing lightning protection.	2011-04-24 15:53:32 -04:00
Wizjany	1cedf0e9a0	Added a lot of missing things to player listener.	2011-04-23 19:50:58 -04:00
Wizjany	ca8bb7f5f0	Added config to stop players from trampling crops. Animals don't work yet (blame CraftBukkit)	2011-04-15 00:20:15 -04:00
Wizjany	9e15a4a557	Added override for flint and steel blocking.	2011-04-14 21:17:11 -04:00
sk89q	af5d0c4b0e	Re-added cake eat blocking on left click.	2011-04-13 03:11:05 -07:00
sk89q	08ab359534	Fixed region priorities, but it needs a test.	2011-04-13 03:07:17 -07:00
Steven Mattera	28c44e0b2f	Added MOB_SPAWNING state flag.	2011-04-13 18:07:13 +08:00
Moo0	7038f49a1a	Fix for "/region claim" claiming overlapping region when none exists.	2011-04-13 18:05:12 +08:00
sk89q	af25c15286	Merge branch 'master' of https://github.com/wizjany/worldguard	2011-04-13 03:00:27 -07:00
sk89q	ffc5281d59	Added protection.remove-infinite-stacks.	2011-04-11 12:34:11 -07:00
sk89q	ad659cd32e	Fixed a major bug with the sign chest protection. It replaced the second line of the sign with "[Lock]".	2011-04-11 11:55:12 -07:00
sk89q	afd3cbd311	Added sign chest protection (needed it for my server). Just put [Lock] on the first line and names on the next three. The first name line must be the sign creator's, so you can track who made what. Friend lists are not yet supported. People with names longer than 15 characters (I believe 16 is the max.) are out of luck.	2011-04-11 10:13:42 -07:00
sk89q	a5a5f7e24a	Made /wg report look better.	2011-04-09 02:25:47 -07:00
sk89q	1e203b58c3	Fixed a bug, partially, regarding unloaded worlds.	2011-04-07 00:22:15 -07:00
Wizjany	104b7c2cf2	Fixed falling into void and wolves still taking damage. Requires Craftbukkit 638+	2011-04-07 00:35:52 -04:00
Wizjany	355c89ecab	Added missing default global config option to file.	2011-04-07 00:35:52 -04:00
Wizjany	3cb9b90ef0	Added config to disable damage from falling into the void.	2011-04-03 05:48:32 -04:00