Updated for 4.0-alpha1.

Updated block damage event handling to work around issues.
removed CraftBukkit dependency
2011-02-23 11:25:10 -08:00 · 2011-02-23 11:07:39 -08:00 · 2011-02-23 19:13:56 +01:00 · 2011-02-23 19:13:55 +01:00 · 2011-02-23 10:05:29 -08:00 · 2011-02-22 20:56:57 +01:00
35 changed files with 4179 additions and 93 deletions
@@ -0,0 +1,14 @@
+/bin
+/build
+/dist
+/release
+/store
+/test
+/lib/Bukkit.jar
+/lib/Craftbukkit.jar
+/lib/truezip.jar
+/lib/WorldEdit.jar
+/nbproject/private
+.classpath
+.project
+manifest.mf
@@ -1,3 +1,16 @@
+4.0-alpha1:
+- This release is only to fix WorldGuard for Bukkit. Ignore the 4.0
+    label. Just move along. Nothing to see.
+
+3.2.2:
+- Changed disable-water-damage to disable-drowning-damage.
+- Fixed suffocation disable option.
+- Fixed fire spread blocking.
+- stopfire and allowfire now work in server console, just like in hMod.
+
+3.2.1:
+- Updated for recent Bukkit ItemStack change.
+
 3.2:
 - Added regions.default.pvp to control default PvP setting.
 - Updated WorldGuard for the newer builds of Bukkit.
@@ -1,3 +1,7 @@
+----------------------------------------------------------------------------
+WorldGuard License
+----------------------------------------------------------------------------
+
                   GNU LESSER GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

@@ -162,4 +166,38 @@ General Public License ever published by the Free Software Foundation.
 whether future versions of the GNU Lesser General Public License shall
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
-Library.
+Library.
+
+----------------------------------------------------------------------------
+PRTree License
+----------------------------------------------------------------------------
+
+Copyright (c) 2008-2010 Robert Olofsson.
+All rights reserved. 
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met: 
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer. 
+
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution. 
+
+3. Neither the name of the authors nor the names of its contributors 
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE 
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+SUCH DAMAGE.
@@ -10,7 +10,10 @@
  <property name="docs.dir" location="docs"/>

  <fileset id="libs" dir="${lib.dir}">
-    <include name="*.jar"/>
+    <include name="truezip.jar" />
+    <include name="Bukkit.jar" />
+    <include name="WorldEdit.jar" />
+    <include name="prtree.jar" />
  </fileset>

  <target name="init">
@@ -41,7 +44,9 @@
    <mkdir dir="${build.dir}/defaults"/>
    <copy tofile="${build.dir}/defaults/config.yml" file="config.yml"/>
    <copy tofile="${build.dir}/defaults/blacklist.txt" file="blacklist.txt"/>
-    <jar jarfile="${dist.dir}/WorldGuard.jar" basedir="${build.dir}" manifest="manifest.mf"/>
+    <jar jarfile="${dist.dir}/WorldGuard.jar" basedir="${build.dir}" manifest="manifest.mf">
+        <zipgroupfileset dir="lib" includes="prtree.jar" />
+    </jar>
  </target>

  <!-- Create the .jar -->
@@ -51,7 +56,7 @@
  </target>

  <!-- Build a release -->
-  <target name="release">
+  <target name="release" depends="clean">
    <input message="Enter version:" addproperty="version"/>
    <antcall target="jar"/>
    <delete dir="${release.dir}"/>
@@ -21,6 +21,8 @@

 summary-on-start: on

+suppress-tick-sync-warnings: false
+
 protection:
    enforce-single-session: on
    item-durability: on
@@ -74,6 +76,10 @@ regions:
        build: true
        chest-access: false
        pvp: true
+        lighter: true
+        tnt: true
+        creeper: true
+        mobdamage: true

 blacklist:
    logging:
@@ -0,0 +1,894 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="worldguard-impl">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <available file="${application.splash}" property="splashscreen.available"/>
+        <condition property="main.class.available">
+            <and>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
+            <and>
+                <istrue value="${manifest.available+main.class+mkdist.available}"/>
+                <istrue value="${splashscreen.available}"/>
+            </and>
+        </condition>
+        <condition property="do.archive">
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
+        </condition>
+        <condition property="do.archive+manifest.available">
+            <and>
+                <isset property="manifest.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class+mkdist.available}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
+            <and>
+                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.tests.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <length length="0" string="${endorsed.classpath}" when="greater"/>
+        </condition>
+        <property name="javac.fork" value="false"/>
+        <property name="jar.index" value="false"/>
+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.tests.dir">Must set test.tests.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                <delete>
+                    <files includesfile="${javac.includesfile.binary}"/>
+                </delete>
+                <delete file="${javac.includesfile.binary}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.tests.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-copylibs">
+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+                <pathconvert property="run.classpath.without.build.classes.dir">
+                    <path path="${run.classpath}"/>
+                    <map from="${build.classes.dir.resolved}" to=""/>
+                </pathconvert>
+                <pathconvert pathsep=" " property="jar.classpath">
+                    <path path="${run.classpath.without.build.classes.dir}"/>
+                    <chainedmapper>
+                        <flattenmapper/>
+                        <globmapper from="*" to="lib/*"/>
+                    </chainedmapper>
+                </pathconvert>
+                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}"/>
+                    <manifest>
+                        <attribute name="Class-Path" value="${jar.classpath}"/>
+                        <customize/>
+                    </manifest>
+                </copylibs>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="-init-ap-cmdline-properties">
+        <property name="annotation.processing.enabled" value="true"/>
+        <property name="annotation.processing.processors.list" value=""/>
+        <property name="annotation.processing.processor.options" value=""/>
+        <property name="annotation.processing.run.all.processors" value="true"/>
+        <property name="javac.processorpath" value="${javac.classpath}"/>
+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+        <condition property="ap.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+            <isfalse value="${annotation.processing.run.all.processors}"/>
+        </condition>
+        <condition else="" property="ap.proc.none.internal" value="-proc:none">
+            <isfalse value="${annotation.processing.enabled}"/>
+        </condition>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+        <property name="ap.cmd.line.internal" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: worldguard was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <pathconvert property="build.generated.subdirs">
+            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="*"/>
+            </dirset>
+        </pathconvert>
+        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy todir="${build.classes.dir}/META-INF">
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
+        <basename file="${application.splash}" property="splashscreen.basename"/>
+        <mkdir dir="${build.classes.dir}/META-INF"/>
+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
+        <j2seproject3:copylibs>
+            <customize>
+                <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+            </customize>
+        </j2seproject3:copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
+        <j2seproject3:copylibs>
+            <customize>
+                <attribute name="Main-Class" value="${main.class}"/>
+            </customize>
+        </j2seproject3:copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <target depends="init,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" if="have.sources" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/*.java"/>
+            </fileset>
+        </javadoc>
+        <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                <include name="**/doc-files/**"/>
+            </fileset>
+        </copy>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.tests.dir}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.tests.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.tests.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.tests.dir}" srcdir="${test.tests.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.tests.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: worldguard was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <not>
+                <isset property="already.built.${call.subproject}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
+</project>
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=f642d35c
+build.xml.script.CRC32=b4df6023
+build.xml.stylesheet.CRC32=28e38971@1.38.3.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=c61c48de
+nbproject/build-impl.xml.script.CRC32=e045e504
+nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45
@@ -0,0 +1,83 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=worldguard
+application.vendor=Michael
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/worldguard.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.Bukkit.jar=lib/Bukkit.jar
+file.reference.Craftbukkit.jar=lib/Craftbukkit.jar
+file.reference.prtree.jar=lib/prtree.jar
+file.reference.truezip.jar=lib/truezip.jar
+file.reference.WorldEdit.jar=lib/WorldEdit.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.Bukkit.jar}:\
+    ${file.reference.Craftbukkit.jar}:\
+    ${file.reference.prtree.jar}:\
+    ${file.reference.truezip.jar}:\
+    ${file.reference.WorldEdit.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.tests.dir=tests
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>worldguard</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.tests.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>
@@ -0,0 +1,35 @@
+// $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;
+
+import java.util.logging.Filter;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+public class TickSyncDelayLoggerFilter implements Filter {
+    public boolean isLoggable(LogRecord record) {
+        if (record.getLevel() == Level.WARNING
+                && record.getMessage().equals("Can't keep up! Did the system time change, or is the server overloaded?")) {
+            return false;
+        }
+        
+        return true;
+    }
+}
@@ -39,6 +39,7 @@ import com.sk89q.worldguard.protection.AreaFlags;
 import static com.sk89q.worldguard.bukkit.BukkitUtil.*;

 public class WorldGuardBlockListener extends BlockListener {
+
    /**
     * Plugin.
     */
@@ -60,17 +61,49 @@ public class WorldGuardBlockListener extends BlockListener {
     */
    @Override
    public void onBlockDamage(BlockDamageEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        Block blockDamaged = event.getBlock();
+        
+        if (plugin.useRegions && blockDamaged.getType() == Material.CAKE_BLOCK) {
+            Vector pt = toVector(blockDamaged);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (!plugin.hasPermission(player, "/regionbypass")
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
+
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    /**
+     * Called when a block is destroyed by a player.
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockBreak(BlockBreakEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
        Player player = event.getPlayer();

-        if (!plugin.itemDurability && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+        if (!plugin.itemDurability) {
            ItemStack held = player.getItemInHand();
            if (held.getTypeId() > 0) {
-                held.setDamage((byte)-1);
+                held.setDurability((short) -1);
                player.setItemInHand(held);
            }
        }
        
-        if (plugin.useRegions && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+        if (plugin.useRegions) {
            Vector pt = BukkitUtil.toVector(event.getBlock());
            LocalPlayer localPlayer = plugin.wrapPlayer(player);
            
@@ -82,7 +115,7 @@ public class WorldGuardBlockListener extends BlockListener {
            }
        }
        
-        if (plugin.blacklist != null && event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+        if (plugin.blacklist != null) {
            if (!plugin.blacklist.check(
                    new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
                            toVector(event.getBlock()),
@@ -108,6 +141,12 @@ public class WorldGuardBlockListener extends BlockListener {
     */
    @Override
    public void onBlockFlow(BlockFromToEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+
        World world = event.getBlock().getWorld();
        Block blockFrom = event.getBlock();
        Block blockTo = event.getToBlock();
@@ -145,6 +184,16 @@ public class WorldGuardBlockListener extends BlockListener {
            }
        }*/

+        // Check the fluid block (from) whether it is air. If so and the target block is protected, cancel the event
+        if(plugin.preventWaterDamage.size() > 0 && blockFrom.getTypeId() == 0) {
+            int targetId = world.getBlockTypeIdAt(
+                    blockTo.getX(), blockTo.getY(), blockTo.getZ());
+            if (plugin.preventWaterDamage.contains(targetId)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+        
        if (plugin.preventWaterDamage.size() > 0 && isWater) {
            int targetId = world.getBlockTypeIdAt(
                    blockTo.getX(), blockTo.getY(), blockTo.getZ());
@@ -171,12 +220,17 @@ public class WorldGuardBlockListener extends BlockListener {
     */
    @Override
    public void onBlockIgnite(BlockIgniteEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+
        IgniteCause cause = event.getCause();
        Block block = event.getBlock();
        //Player player = event.getPlayer();
        World world = block.getWorld();
-        boolean isFireSpread = cause == IgniteCause.SLOW_SPREAD
-                || cause == IgniteCause.SPREAD;
+        boolean isFireSpread = cause == IgniteCause.SPREAD;
        
        if (plugin.preventLavaFire && cause == IgniteCause.LAVA) {
            event.setCancelled(true);
@@ -247,6 +301,39 @@ public class WorldGuardBlockListener extends BlockListener {
        }*/
    }

+    /**
+     * Called when a block is destroyed from burning
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onBlockBurn(BlockBurnEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+
+        if (plugin.disableFireSpread) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.fireSpreadDisableToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.disableFireSpreadBlocks.size() > 0) {
+            Block block = event.getBlock();
+
+            if (plugin.disableFireSpreadBlocks.contains(block.getTypeId())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
    /**
     * Called when block physics occurs
     *
@@ -254,6 +341,12 @@ public class WorldGuardBlockListener extends BlockListener {
     */
    @Override
    public void onBlockPhysics(BlockPhysicsEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+
        int id = event.getChangedTypeId();

        if (id == 13 && plugin.noPhysicsGravel) {
@@ -277,7 +370,14 @@ public class WorldGuardBlockListener extends BlockListener {
     * 
     * @param event Relevant event details
     */
+    @Override
    public void onBlockInteract(BlockInteractEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+
        Block block = event.getBlock();
        LivingEntity entity = event.getEntity();
        
@@ -321,6 +421,12 @@ public class WorldGuardBlockListener extends BlockListener {
     */
    @Override
    public void onBlockPlace(BlockPlaceEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+
        Block blockPlaced = event.getBlock();
        Player player = event.getPlayer();
        World world = blockPlaced.getWorld();
@@ -366,10 +472,12 @@ public class WorldGuardBlockListener extends BlockListener {
     */
    @Override
    public void onBlockRightClick(BlockRightClickEvent event) {
+
        Player player = event.getPlayer();
+        Block blockClicked = event.getBlock();
        
        if (plugin.useRegions && event.getItemInHand().getTypeId() == plugin.regionWand) {
-            Vector pt = toVector(event.getBlock());
+            Vector pt = toVector(blockClicked);
            ApplicableRegionSet app = plugin.regionManager.getApplicableRegions(pt);
            List<String> regions = plugin.regionManager.getApplicableRegionsIDs(pt);
            
@@ -390,6 +498,27 @@ public class WorldGuardBlockListener extends BlockListener {
                player.sendMessage(ChatColor.YELLOW + "WorldGuard: No defined regions here!");
            }
        }
+
+        Material type = blockClicked.getType();
+
+        if (plugin.useRegions && type == Material.CAKE_BLOCK) {
+
+            Vector pt = toVector(blockClicked);
+            LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+            if (!plugin.hasPermission(player, "/regionbypass")
+                    && !plugin.regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
+
+                byte newData = (byte) (blockClicked.getData() - 1);
+                newData = newData < 0 ? 0 : newData;
+
+                blockClicked.setData(newData);
+                player.setHealth(player.getHealth() - 3);
+
+                return;
+            }
+        }
    }


@@ -401,9 +530,10 @@ public class WorldGuardBlockListener extends BlockListener {
     * @param event Relevant event details
     */
    @Override
-    public void onBlockRedstoneChange(BlockFromToEvent event) {
+    public void onBlockRedstoneChange(BlockRedstoneEvent event) {
+
        World world = event.getBlock().getWorld();
-        Block blockTo = event.getToBlock();
+        Block blockTo = event.getBlock();

        if (plugin.simulateSponge && plugin.redstoneSponges) {
            int ox = blockTo.getX();
@@ -417,6 +547,9 @@ public class WorldGuardBlockListener extends BlockListener {
                        if (sponge.getTypeId() == 19
                                && sponge.isBlockIndirectlyPowered()) {
                            clearSpongeWater(world, ox + cx, oy + cy, oz + cz);
+                        } else if (sponge.getTypeId() == 19
+                                && ! sponge.isBlockIndirectlyPowered()) {
+                            addSpongeWater(world, ox + cx, oy + cy, oz + cz);
                        }
                    }
                }
@@ -438,9 +571,7 @@ public class WorldGuardBlockListener extends BlockListener {
        for (int cx = -plugin.spongeRadius; cx <= plugin.spongeRadius; cx++) {
            for (int cy = -plugin.spongeRadius; cy <= plugin.spongeRadius; cy++) {
                for (int cz = -plugin.spongeRadius; cz <= plugin.spongeRadius; cz++) {
-                    Block block = world.getBlockAt(ox + cx, oy + cy, oz + cz);
-                    int id = block.getTypeId();
-                    if (id == 8 || id == 9) {
+                    if (isBlockWater(world, ox + cx, oy + cy, oz + cz)) {
                        world.getBlockAt(ox + cx, oy + cy, oz + cz)
                                .setTypeId(0);
                    }
@@ -448,4 +579,111 @@ public class WorldGuardBlockListener extends BlockListener {
            }
        }
    }
+    
+    /**
+     * Add water around a sponge.
+     * 
+     * @param world
+     * @param ox
+     * @param oy
+     * @param oz
+     */
+    private void addSpongeWater(World world, int ox, int oy, int oz) {
+        // The negative x edge
+        int cx = ox - plugin.spongeRadius - 1;
+        for (int cy = oy - plugin.spongeRadius - 1; cy <= oy + plugin.spongeRadius + 1; cy++) {
+            for (int cz = oz - plugin.spongeRadius - 1; cz <= oz + plugin.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx + 1, cy, cz);
+                }
+            }
+        }
+        
+        // The positive x edge
+        cx = ox + plugin.spongeRadius + 1;
+        for (int cy = oy - plugin.spongeRadius - 1; cy <= oy + plugin.spongeRadius + 1; cy++) {
+            for (int cz = oz - plugin.spongeRadius - 1; cz <= oz + plugin.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx - 1, cy, cz);
+                }
+            }
+        }
+
+        // The negative y edge
+        int cy = oy - plugin.spongeRadius - 1;
+        for (cx = ox - plugin.spongeRadius - 1; cx <= ox + plugin.spongeRadius + 1; cx++) {
+            for (int cz = oz - plugin.spongeRadius - 1; cz <= oz + plugin.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy + 1, cz);
+                }
+            }
+        }
+        
+        // The positive y edge
+        cy = oy + plugin.spongeRadius + 1;
+        for (cx = ox - plugin.spongeRadius - 1; cx <= ox + plugin.spongeRadius + 1; cx++) {
+            for (int cz = oz - plugin.spongeRadius - 1; cz <= oz + plugin.spongeRadius + 1; cz++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy - 1, cz);
+                }
+            }
+        }
+        
+        // The negative z edge
+        int cz = oz - plugin.spongeRadius - 1;
+        for (cx = ox - plugin.spongeRadius - 1; cx <= ox + plugin.spongeRadius + 1; cx++) {
+            for (cy = oy - plugin.spongeRadius - 1; cy <= oy + plugin.spongeRadius + 1; cy++) {
+                if (isBlockWater(world, cx, cy, cz)) {
+                    setBlockToWater(world, cx, cy, cz + 1);
+                }
+            }
+        }
+        
+        // The positive z edge
+        cz = oz + plugin.spongeRadius + 1;
+        for (cx = ox - plugin.spongeRadius - 1; cx <= ox + plugin.spongeRadius + 1; cx++) {
+            for (cy = oy - plugin.spongeRadius - 1; cy <= oy + plugin.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()
+     * 
+     * @see 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;
+        }
+    }
 }
@@ -23,6 +23,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Skeleton;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
@@ -49,7 +50,7 @@ public class WorldGuardEntityListener extends EntityListener {
        this.plugin = plugin;
    }

-    @Override
+
    public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
        Entity defender = event.getEntity();
        DamageCause type = event.getCause();
@@ -66,10 +67,15 @@ public class WorldGuardEntityListener extends EntityListener {
                event.setCancelled(true);
                return;
            }
+
+            if (plugin.disableContactDamage && type == DamageCause.CONTACT) {
+                event.setCancelled(true);
+                return;
+            }
        }
    }

-    @Override
+
    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
        Entity attacker = event.getDamager();
        Entity defender = event.getEntity();
@@ -147,11 +153,40 @@ public class WorldGuardEntityListener extends EntityListener {
                    }
                }
            }
+            if (attacker != null && attacker instanceof Skeleton) {
+            	if (plugin.useRegions) {
+            		Vector pt = toVector(defender.getLocation());
+            		
+            		if (!plugin.regionManager.getApplicableRegions(pt)
+            				.allowsFlag(AreaFlags.FLAG_MOB_DAMAGE)) {
+            			event.setCancelled(true);
+            			return;
+            		}
+            	}
+            }
        }

    }

+    @Override
    public void onEntityDamage(EntityDamageEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+        
+        if (event instanceof EntityDamageByProjectileEvent) {
+            this.onEntityDamageByProjectile((EntityDamageByProjectileEvent) event);
+            return;
+        } else if (event instanceof EntityDamageByEntityEvent) {
+            this.onEntityDamageByEntity((EntityDamageByEntityEvent) event);
+            return;
+        } else if (event instanceof EntityDamageByBlockEvent) {
+            this.onEntityDamageByBlock((EntityDamageByBlockEvent) event);
+            return;
+        }
+
        Entity defender = event.getEntity();
        DamageCause type = event.getCause();
        
@@ -190,11 +225,6 @@ public class WorldGuardEntityListener extends EntityListener {
                return;
            }

-            if (plugin.disableContactDamage && type == DamageCause.CONTACT) {
-                event.setCancelled(true);
-                return;
-            }
-
            if (type == DamageCause.DROWNING
                    && plugin.amphibiousPlayers.contains(player.getName())) {
                event.setCancelled(true);
@@ -205,6 +235,12 @@ public class WorldGuardEntityListener extends EntityListener {

    @Override
    public void onEntityExplode(EntityExplodeEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+
        if (event.getEntity() instanceof LivingEntity) {
            if (plugin.blockCreeperBlockDamage) {
                event.setCancelled(true);
@@ -19,6 +19,9 @@

 package com.sk89q.worldguard.bukkit;

+import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
+import org.bukkit.entity.Item;
+import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -93,6 +96,12 @@ public class WorldGuardPlayerListener extends PlayerListener {
     */
    @Override
    public void onPlayerItem(PlayerItemEvent event) {
+
+        if(event.isCancelled())
+        {
+            return;
+        }
+        
        Player player = event.getPlayer();
        Block block = event.getBlockClicked();
        ItemStack item = event.getItem();
@@ -100,7 +109,7 @@ public class WorldGuardPlayerListener extends PlayerListener {
        if (!plugin.itemDurability) {
            // Hoes
            if (item.getTypeId() >= 290 && item.getTypeId() <= 294) {
-                item.setDamage((byte)-1);
+                item.setDurability((byte)-1);
                player.setItemInHand(item);
            }
        }
@@ -158,4 +167,56 @@ public class WorldGuardPlayerListener extends PlayerListener {
            }
        }
    }
+
+    /**
+     * Called when a player attempts to drop an item
+     *
+     * @param event Relevant event details
+     */
+    @Override
+    public void onPlayerDropItem(PlayerDropItemEvent event) {
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        if (plugin.blacklist != null) {
+            Item ci = event.getItemDrop();
+
+            if (!plugin.blacklist.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;
+        }
+
+        if (plugin.blacklist != null) {
+            Item ci = event.getItem();
+
+            if (!plugin.blacklist.check(
+                    new ItemAcquireBlacklistEvent(plugin.wrapPlayer(event
+                            .getPlayer()), toVector(ci.getLocation()), ci
+                            .getItemStack().getTypeId()), false, false)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
 }
@@ -20,6 +20,7 @@
 package com.sk89q.worldguard.bukkit;

 import static com.sk89q.worldguard.bukkit.BukkitUtil.matchSinglePlayer;
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
@@ -45,10 +46,14 @@ import com.sk89q.bukkit.migration.PermissionsResolverServerListener;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.ItemType;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.bukkit.WorldEditAPI;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.TickSyncDelayLoggerFilter;
 import com.sk89q.worldguard.blacklist.*;
 import com.sk89q.worldguard.blacklist.loggers.*;
 import com.sk89q.worldguard.domains.DefaultDomain;
@@ -73,9 +78,9 @@ public class WorldGuardPlugin extends JavaPlugin {
        new WorldGuardBlockListener(this);
    private final WorldGuardEntityListener entityListener =
        new WorldGuardEntityListener(this);
-    private final PermissionsResolverServerListener permsListener;
-    
-    private final PermissionsResolverManager perms;
+
+    private PermissionsResolverServerListener permsListener;
+    private PermissionsResolverManager perms;
    
    Blacklist blacklist;

@@ -89,6 +94,8 @@ public class WorldGuardPlugin extends JavaPlugin {
    
    // Configuration follows
    
+    boolean suppressTickSyncWarnings;
+    
    boolean enforceOneSession;
    boolean itemDurability;

@@ -133,43 +140,50 @@ public class WorldGuardPlugin extends JavaPlugin {
    /**
     * Construct the plugin.
     * 
-     * @param pluginLoader
-     * @param instance
-     * @param desc
-     * @param folder
-     * @param plugin
-     * @param cLoader
     */
-    public WorldGuardPlugin(PluginLoader pluginLoader, Server instance,
-            PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) {
-        super(pluginLoader, instance, desc, folder, plugin, cLoader);
-
-        logger.info("WorldGuard " + desc.getVersion() + " loaded.");
-        
-        folder.mkdirs();
-
-        createDefaultConfiguration("config.yml");
-        createDefaultConfiguration("blacklist.txt");
-        
-        regionLoader = new CSVDatabase(new File(folder, "regions.txt"));
-        perms = new PermissionsResolverManager(getConfiguration(), getServer(),
-                "WorldGuard", logger);
-        permsListener = new PermissionsResolverServerListener(perms);
-        loadConfiguration();
-        postReload();
-        registerEvents();
+    public WorldGuardPlugin() {
+    	super();
+        logger.info("WorldGuard loaded.");
    }

    /**
     * Called on plugin enable.
     */
    public void onEnable() {
+        PluginDescriptionFile desc = this.getDescription();
+        File folder = this.getDataFolder();
+
+        folder.mkdirs();
+
+        createDefaultConfiguration("config.yml");
+        createDefaultConfiguration("blacklist.txt");
+
+        regionLoader = new CSVDatabase(new File(folder, "regions.txt"));
+        perms = new PermissionsResolverManager(getConfiguration(), getServer(),
+                "WorldGuard", logger);
+        permsListener = new PermissionsResolverServerListener(perms);
+        
+        loadConfiguration();
+        postReload();
+        registerEvents();
+
+        if (suppressTickSyncWarnings) {
+            Logger.getLogger("Minecraft").setFilter(new TickSyncDelayLoggerFilter());
+        } else {
+            Filter filter = Logger.getLogger("Minecraft").getFilter();
+            if (filter != null && filter instanceof TickSyncDelayLoggerFilter) {
+                Logger.getLogger("Minecraft").setFilter(null);
+            }
+        }
+
+        logger.info("WorldGuard " + desc.getVersion() + " enabled.");
    }

    /**
     * Called on plugin disable.
     */
    public void onDisable() {
+        logger.info("WorldGuard " + this.getDescription().getVersion() + " disabled.");
    }

    /**
@@ -177,21 +191,22 @@ public class WorldGuardPlugin extends JavaPlugin {
     */
    private void registerEvents() {
        registerEvent(Event.Type.BLOCK_DAMAGED, blockListener, Priority.High);
+        registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.High);
        registerEvent(Event.Type.BLOCK_FLOW, blockListener, Priority.Normal);
        registerEvent(Event.Type.BLOCK_IGNITE, blockListener, Priority.High);
        registerEvent(Event.Type.BLOCK_PHYSICS, blockListener, Priority.Normal);
        registerEvent(Event.Type.BLOCK_INTERACT, blockListener, Priority.High);
        registerEvent(Event.Type.BLOCK_PLACED, blockListener, Priority.High);
        registerEvent(Event.Type.BLOCK_RIGHTCLICKED, blockListener, Priority.High);
+        registerEvent(Event.Type.BLOCK_BURN, blockListener, Priority.High);
        registerEvent(Event.Type.REDSTONE_CHANGE, blockListener, Priority.High);

        registerEvent(Event.Type.ENTITY_DAMAGED, entityListener, Priority.High);
-        registerEvent(Event.Type.ENTITY_DAMAGEDBY_PROJECTILE, entityListener, Priority.High);
-        registerEvent(Event.Type.ENTITY_DAMAGEDBY_BLOCK, entityListener, Priority.High);
-        registerEvent(Event.Type.ENTITY_DAMAGEDBY_ENTITY, entityListener, Priority.High);
        registerEvent(Event.Type.ENTITY_EXPLODE, entityListener, Priority.High);

        registerEvent(Event.Type.PLAYER_ITEM, playerListener, Priority.High);
+        registerEvent(Event.Type.PLAYER_DROP_ITEM, playerListener, Priority.High);
+        registerEvent(Event.Type.PLAYER_PICKUP_ITEM, playerListener, Priority.High);
        registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Normal);
        registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Normal);
        registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal);
@@ -258,6 +273,8 @@ public class WorldGuardPlugin extends JavaPlugin {
        Configuration config = getConfiguration();
        config.load();
        perms.load();
+        
+        suppressTickSyncWarnings = config.getBoolean("suppress-tick-sync-warnings", false);

        enforceOneSession = config.getBoolean("protection.enforce-single-session", true);
        itemDurability = config.getBoolean("protection.item-durability", true);
@@ -292,7 +309,7 @@ public class WorldGuardPlugin extends JavaPlugin {
        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-water-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);
@@ -302,6 +319,10 @@ public class WorldGuardPlugin extends JavaPlugin {
        globalFlags.canBuild = config.getBoolean("regions.default.build", true);
        globalFlags.canAccessChests = config.getBoolean("regions.default.chest-access", false);
        globalFlags.canPvP = config.getBoolean("regions.default.pvp", true);
+        globalFlags.canLighter = config.getBoolean("regions.default.lighter", true);
+        globalFlags.canTnt = config.getBoolean("regions.default.tnt", true);
+        globalFlags.allowCreeper = config.getBoolean("regions.default.creeper", true);
+        globalFlags.allowMobDamage = config.getBoolean("regions.default.mobdamage", true);

        try {
            regionLoader.load();
@@ -419,30 +440,25 @@ public class WorldGuardPlugin extends JavaPlugin {
    /**
     * Handles a command.
     */
+    @Override
    public boolean onCommand(CommandSender sender, Command cmd,
            String commandLabel, String[] args) {
-        if (!sender.isPlayer()) {
-            return true;
-        }
-        
-        Player player = (Player)sender;
-        
        try {
-            return handleCommand(player, cmd.getName(), args);
+            return handleCommand(sender, cmd.getName(), args);
        } catch (InsufficientArgumentsException e) {
            if (e.getHelp() != null) {
-                player.sendMessage(ChatColor.RED + e.getHelp());
+                sender.sendMessage(ChatColor.RED + e.getHelp());
                return true;
            } else {
                return false;
            }
        } catch (InsufficientPermissionsException e) {
-            player.sendMessage(ChatColor.RED + "You don't have sufficient permission.");
+            sender.sendMessage(ChatColor.RED + "You don't have sufficient permission.");
            return true;
        } catch (CommandHandlingException e) {
            return true;
        } catch (Throwable t) {
-            player.sendMessage(ChatColor.RED + "ERROR: " + t.getMessage());
+            sender.sendMessage(ChatColor.RED + "ERROR: " + t.getMessage());
            t.printStackTrace();
            return true;
        }
@@ -457,18 +473,20 @@ public class WorldGuardPlugin extends JavaPlugin {
     * @return
     * @throws CommandHandlingException
     */
-    private boolean handleCommand(Player player, String cmd, String[] args)
+    private boolean handleCommand(CommandSender sender, String cmd, String[] args)
            throws CommandHandlingException {
        
+        String senderName = sender instanceof Player ? ((Player)sender).getName() : "Console";
+        
        if (cmd.equalsIgnoreCase("stopfire")) {
-            checkPermission(player, "/stopfire");
+            checkPermission(sender, "/stopfire");
            checkArgs(args, 0, 0);
            
            if (!fireSpreadDisableToggle) {
                getServer().broadcastMessage(ChatColor.YELLOW
-                        + "Fire spread has been globally disabled by " + player.getName() + ".");
+                        + "Fire spread has been globally disabled by " + senderName + ".");
            } else {
-                player.sendMessage(ChatColor.YELLOW + "Fire spread was already globally disabled.");
+                sender.sendMessage(ChatColor.YELLOW + "Fire spread was already globally disabled.");
            }
            
            fireSpreadDisableToggle = true;
@@ -477,14 +495,14 @@ public class WorldGuardPlugin extends JavaPlugin {
        }
        
        if (cmd.equalsIgnoreCase("allowfire")) {
-            checkPermission(player, "/stopfire");
+            checkPermission(sender, "/stopfire");
            checkArgs(args, 0, 0);
            
            if (fireSpreadDisableToggle) {
                getServer().broadcastMessage(ChatColor.YELLOW
-                        + "Fire spread has been globally re-enabled by " + player.getName() + ".");
+                        + "Fire spread has been globally re-enabled by " + senderName + ".");
            } else {
-                player.sendMessage(ChatColor.YELLOW + "Fire spread was already globally enabled.");
+                sender.sendMessage(ChatColor.YELLOW + "Fire spread was already globally enabled.");
            }
            
            fireSpreadDisableToggle = false;
@@ -492,6 +510,12 @@ public class WorldGuardPlugin extends JavaPlugin {
            return true;
        }
        
+        if (!(sender instanceof Player)) {
+            return false;
+        }
+        
+        Player player = (Player)sender;
+        
        if (cmd.equalsIgnoreCase("god")) {
            checkPermission(player, "/god");
            checkArgs(args, 0, 1);
@@ -625,7 +649,7 @@ public class WorldGuardPlugin extends JavaPlugin {
                        // Blocks store their color in the damage value
                        if (item2.getTypeId() == item.getTypeId() &&
                                (!ItemType.usesDamageValue(item.getTypeId())
-                                        || item.getDamage() == item2.getDamage())) {
+                                        || item.getDurability() == item2.getDurability())) {
                            // This stack won't fit in the parent stack
                            if (item2.getAmount() > needed) {
                                item.setAmount(64);
@@ -756,10 +780,9 @@ public class WorldGuardPlugin extends JavaPlugin {
                String id = args[0].toLowerCase();
                
                WorldEditPlugin worldEdit = (WorldEditPlugin)wePlugin;
-                WorldEditAPI api = worldEdit.getAPI();
                
-                LocalSession session = api.getSession(player);
-                Region weRegion = session.getRegion();
+                LocalSession session = worldEdit.getSession(player);
+                Region weRegion = session.getSelection(new BukkitWorld(player.getWorld()));
                
                BlockVector min = weRegion.getMinimumPoint().toBlockVector();
                BlockVector max = weRegion.getMaximumPoint().toBlockVector();
@@ -798,10 +821,9 @@ public class WorldGuardPlugin extends JavaPlugin {
                }
                
                WorldEditPlugin worldEdit = (WorldEditPlugin)wePlugin;
-                WorldEditAPI api = worldEdit.getAPI();
                
-                LocalSession session = api.getSession(player);
-                Region weRegion = session.getRegion();
+                LocalSession session = worldEdit.getSession(player);
+                Region weRegion = session.getSelection(new BukkitWorld(player.getWorld()));
                
                BlockVector min = weRegion.getMinimumPoint().toBlockVector();
                BlockVector max = weRegion.getMaximumPoint().toBlockVector();
@@ -1269,13 +1291,16 @@ public class WorldGuardPlugin extends JavaPlugin {
     * Checks to see if there are sufficient permissions, otherwise an exception
     * is raised in that case.
     * 
-     * @param player
+     * @param sender
     * @param permission
     * @throws InsufficientPermissionsException
     */
-    private void checkPermission(Player player, String permission)
+    private void checkPermission(CommandSender sender, String permission)
            throws InsufficientPermissionsException {
-        if (!hasPermission(player, permission)) {
+        if (!(sender instanceof Player)) {
+            return;
+        }
+        if (!hasPermission((Player)sender, permission)) {
            throw new InsufficientPermissionsException();
        }
    }
@@ -1329,6 +1354,22 @@ public class WorldGuardPlugin extends JavaPlugin {
        return regionLoader;
    }
    
+    public boolean canBuild(Player player, int x, int y, int z) {
+        if (useRegions) {
+            Vector pt = new Vector(x, y, z);
+            LocalPlayer localPlayer = wrapPlayer(player);
+
+            if (!hasPermission(player, "/regionbypass")
+                    && !regionManager.getApplicableRegions(pt).canBuild(localPlayer)) {
+                return false;
+            }
+            
+            return true;
+        } else {
+            return true;
+        }
+    }
+    
    boolean inGroup(Player player, String group) {
        try {
            return perms.inGroup(player.getName(), group);
@@ -20,8 +20,9 @@
 package com.sk89q.worldguard.protection;

 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
-import java.util.SortedMap;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.protection.AreaFlags.State;
@@ -34,7 +35,7 @@ import com.sk89q.worldguard.protection.AreaFlags.State;
 public class ApplicableRegionSet {
    private GlobalFlags global;
    private Vector pt;
-    private SortedMap<String,ProtectedRegion> regions;
+    private Iterator<ProtectedRegion> applicable;
    
    /**
     * Construct the object.
@@ -43,10 +44,10 @@ public class ApplicableRegionSet {
     * @param regions
     * @param global
     */
-    public ApplicableRegionSet(Vector pt, SortedMap<String,ProtectedRegion> regions,
+    public ApplicableRegionSet(Vector pt, Iterator<ProtectedRegion> applicable,
            GlobalFlags global) {
        this.pt = pt;
-        this.regions = regions;
+        this.applicable = applicable;
        this.global = global;
    }
    
@@ -73,7 +74,15 @@ public class ApplicableRegionSet {
            def = global.canAccessChests;
        } else if (flag.equals(AreaFlags.FLAG_PVP)) {
            def = global.canPvP;
-        }
+        } else if (flag.equals(AreaFlags.FLAG_LIGHTER)) {
+        	def = global.canLighter;
+    	} else if (flag.equals(AreaFlags.FLAG_TNT)) {
+    		def = global.canTnt;
+    	} else if (flag.equals(AreaFlags.FLAG_CREEPER_EXPLOSION)) {
+    		def = global.allowCreeper;
+		} else if (flag.equals(AreaFlags.FLAG_MOB_DAMAGE)) {
+			def = global.allowMobDamage;
+		}
        
        return isFlagAllowed(flag, def, null);
    }
@@ -111,7 +120,9 @@ public class ApplicableRegionSet {
        Set<ProtectedRegion> needsClear = new HashSet<ProtectedRegion>();
        Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
        
-        for (ProtectedRegion region : regions.values()) {
+        while (applicable.hasNext()) {
+            ProtectedRegion region = applicable.next();
+            
            // Ignore non-build regions
            if (player != null && region.getFlags().get(AreaFlags.FLAG_PASSTHROUGH) == State.ALLOW) {
                continue;
@@ -38,7 +38,7 @@ public class FlatRegionManager implements RegionManager {
    /**
     * List of protected regions.
     */
-    private SortedMap<String,ProtectedRegion> regions;
+    private Map<String,ProtectedRegion> regions;
    /**
     * Global flags.
     */
@@ -60,7 +60,6 @@ public class FlatRegionManager implements RegionManager {
    public Map<String,ProtectedRegion> getRegions() {
        return regions;
    }
-
    
    /**
     * Set a list of protected regions.
@@ -70,6 +69,7 @@ public class FlatRegionManager implements RegionManager {
    public void setRegions(Map<String,ProtectedRegion> regions) {
        this.regions = new TreeMap<String,ProtectedRegion>(regions);
    }
+    
    /**
     * Adds a region.
     * 
@@ -125,7 +125,7 @@ public class FlatRegionManager implements RegionManager {
     * @return
     */
    public ApplicableRegionSet getApplicableRegions(Vector pt) {
-        return new ApplicableRegionSet(pt, regions, global);
+        return new ApplicableRegionSet(pt, regions.values().iterator(), global);
    }
    
    /**
@@ -28,4 +28,8 @@ public class GlobalFlags {
    public boolean canBuild = true;
    public boolean canAccessChests = false;
    public boolean canPvP = true;
+    public boolean canLighter = true;
+    public boolean canTnt = true;
+    public boolean allowCreeper = true;
+    public boolean allowMobDamage = true;
 }
@@ -0,0 +1,203 @@
+// $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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import org.khelekore.prtree.MBRConverter;
+import org.khelekore.prtree.PRTree;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.LocalPlayer;
+
+public class PRTreeRegionManager implements RegionManager {
+    private static final int BRANCH_FACTOR = 30;
+
+    /**
+     * List of protected regions.
+     */
+    private Map<String,ProtectedRegion> regions;
+    /**
+     * Global flags.
+     */
+    private GlobalFlags global;
+    
+    /**
+     * Converter to get coordinates of the tree.
+     */
+    private MBRConverter<ProtectedRegion> converter
+            = new ProtectedRegionMBRConverter();
+    
+    /**
+     * Priority R-tree.
+     */
+    private PRTree<ProtectedRegion> tree;
+
+    /**
+     * Construct the manager.
+     */
+    public PRTreeRegionManager(GlobalFlags global) {
+        regions = new TreeMap<String,ProtectedRegion>();
+        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        this.global = global;
+    }
+    
+    /**
+     * Get a list of protected regions.
+     *
+     * @return
+     */
+    public Map<String,ProtectedRegion> getRegions() {
+        return regions;
+    }
+    
+    /**
+     * Set a list of protected regions.
+     *
+     * @return
+     */
+    public void setRegions(Map<String,ProtectedRegion> regions) {
+        this.regions = new TreeMap<String,ProtectedRegion>(regions);
+        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        tree.load(regions.values());
+    }
+
+    /**
+     * Adds a region.
+     * 
+     * @param id
+     * @param region
+     */
+    public void addRegion(ProtectedRegion region) {
+        regions.put(region.getId(), region);
+        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        tree.load(regions.values());
+    }
+
+    /**
+     * Return whether a region exists by an ID.
+     * 
+     * @param id
+     * @return
+     */
+    public boolean hasRegion(String id) {
+        return regions.containsKey(id);
+    }
+
+    /**
+     * Get a region by its ID.
+     * 
+     * @param id
+     */
+    public ProtectedRegion getRegion(String id) {
+        return regions.get(id);
+    }
+    
+    /**
+     * Removes a region and its children.
+     * 
+     * @param id
+     */
+    public void removeRegion(String id) {
+        ProtectedRegion region = regions.get(id);
+        
+        regions.remove(id);
+        
+        if (region != null) {
+            for (Map.Entry<String, ProtectedRegion> entry : regions.entrySet()) {
+                if (entry.getValue().getParent() == region) {
+                    removeRegion(entry.getKey());
+                }
+            }
+        }
+
+        tree = new PRTree<ProtectedRegion>(converter, BRANCH_FACTOR);
+        tree.load(regions.values());
+    }
+
+    /**
+     * Get an object for a point for rules to be applied with.
+     * 
+     * @param pt
+     * @return
+     */
+    public ApplicableRegionSet getApplicableRegions(Vector pt) {
+        return new ApplicableRegionSet(pt, regions.values().iterator(), global);
+    }
+
+    /**
+     * Get a list of region IDs that contain a point.
+     * 
+     * @param pt
+     * @return
+     */
+    public List<String> getApplicableRegionsIDs(Vector pt) {
+        List<String> applicable = new ArrayList<String>();
+
+        int x = pt.getBlockX();
+        int z = pt.getBlockZ();
+        
+        for (ProtectedRegion region : tree.find(x, z, x, z)) {
+            if (region.contains(pt)) {
+                applicable.add(region.getId());
+            }
+        }
+        
+        return applicable;
+    }
+    
+    /**
+     * Returns true if the provided region overlaps with any other region that
+     * is not owned by the player.
+     * 
+     * @param region
+     * @param player
+     * @return
+     */
+    public boolean overlapsUnownedRegion(ProtectedRegion region, LocalPlayer player) {
+        for (ProtectedRegion other : regions.values()) {
+            if (other.getOwners().contains(player)) {
+                continue;
+            }
+            
+            try {
+                if (ProtectedRegion.intersects(region, other)) {
+                    return true;
+                }
+            } catch (UnsupportedIntersectionException e) {
+                // TODO: Maybe do something here
+            }
+        }
+        
+        return false;
+    }
+    
+    /**
+     * Get the number of regions.
+     * 
+     * @return
+     */
+    public int size() {
+        return regions.size();
+    }
+
+}
@@ -0,0 +1,132 @@
+// $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 java.util.List;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.Vector2D;
+
+public class ProtectedPolygonalRegion extends ProtectedRegion {
+    protected List<BlockVector2D> points;
+    protected int minY;
+    protected int maxY;
+    private BlockVector min;
+    private BlockVector max;
+    
+    public ProtectedPolygonalRegion(String id, List<BlockVector2D> points, int minY, int maxY) {
+        super(id);
+        this.points = points;
+        this.minY = minY;
+        this.maxY = maxY;
+        
+        int minX = points.get(0).getBlockX();
+        int minZ = points.get(0).getBlockZ();
+        int maxX = points.get(0).getBlockX();
+        int maxZ = points.get(0).getBlockZ();
+        
+        for (BlockVector2D v : points) {
+            int x = v.getBlockX();
+            int z = v.getBlockZ();
+            if (x < minX) minX = x;
+            if (z < minZ) minZ = z;
+            if (x > maxX) maxX = x;
+            if (z > maxZ) maxZ = z;
+        }
+
+        min = new BlockVector(minX, minY, minZ);
+        max = new BlockVector(maxX, maxY, maxZ);
+    }
+
+    @Override
+    public BlockVector getMinimumPoint() {
+        return min;
+    }
+
+    @Override
+    public BlockVector getMaximumPoint() {
+        return max;
+    }
+
+    /**
+     * Checks to see if a point is inside this region.
+     */
+    @Override
+    public boolean contains(Vector pt) {
+        int targetX = pt.getBlockX(); //wide
+        int targetY = pt.getBlockY(); //height
+        int targetZ = pt.getBlockZ(); //depth
+        
+        if (targetY < minY || targetY > maxY) {
+            return false;
+        }
+        //Quick and dirty check.
+        if(targetX < min.getBlockX() || targetX > max.getBlockX() || targetZ < min.getBlockZ() || targetZ > max.getBlockZ()){
+        	return false;
+        }
+        boolean inside = false;
+        int npoints = points.size();
+        int xNew, zNew;
+        int xOld, zOld;
+        int x1, z1;
+        int x2, z2;
+        int i;
+
+        xOld = points.get(npoints - 1).getBlockX();
+        zOld = points.get(npoints - 1).getBlockZ();
+        
+        for (i = 0; i < npoints; i++) {
+            xNew = points.get(i).getBlockX();
+            zNew = points.get(i).getBlockZ();
+            if (xNew > xOld) {
+                x1 = xOld;
+                x2 = xNew;
+                z1 = zOld;
+                z2 = zNew;
+            } else {
+                x1 = xNew;
+                x2 = xOld;
+                z1 = zNew;
+                z2 = zOld;
+            }
+            if ((xNew < targetX) == (targetX <= xOld)
+                    && ((long) targetZ - (long) z1) * (long) (x2 - x1) <= ((long) z2 - (long) z1)
+                            * (long) (targetX - x1)) {
+                inside = !inside;
+            }
+            xOld = xNew;
+            zOld = zNew;
+        }
+        
+        return inside;
+    }
+
+    /**
+     * Return the type of region as a user-friendly name.
+     * 
+     * @return type of region
+     */
+    @Override
+    public String getTypeName() {
+        return "polygon";
+    }
+
+}
@@ -79,6 +79,20 @@ public abstract class ProtectedRegion implements Comparable<ProtectedRegion> {
        return id;
    }

+    /**
+     * Get the lower point of the cuboid.
+     *
+     * @return min point
+     */
+    public abstract BlockVector getMinimumPoint();
+
+    /**
+     * Get the upper point of the cuboid.
+     *
+     * @return max point
+     */
+    public abstract BlockVector getMaximumPoint();
+
    /**
     * @return the priority
     */
@@ -0,0 +1,41 @@
+// $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 org.khelekore.prtree.MBRConverter;
+
+public class ProtectedRegionMBRConverter implements MBRConverter<ProtectedRegion> {
+    public double getMinX(ProtectedRegion t) {
+        return t.getMinimumPoint().getBlockX();
+    }
+
+    public double getMinY(ProtectedRegion t) {
+        return t.getMinimumPoint().getBlockZ();
+    }
+
+    public double getMaxX(ProtectedRegion t) {
+        return t.getMaximumPoint().getBlockX();
+    }
+
+    public double getMaxY(ProtectedRegion t) {
+        return t.getMaximumPoint().getBlockZ();
+    }
+
+}
@@ -0,0 +1,147 @@
+/*
+ * $Id: ItemList.java,v 1.1 2006/04/15 14:10:48 platform Exp $
+ * Created on 2006-3-24
+ */
+package org.json.simple;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+/**
+ * |a:b:c| => |a|,|b|,|c|
+ * |:| => ||,||
+ * |a:| => |a|,||
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public class ItemList {
+	private String sp=",";
+	List items=new ArrayList();
+	
+	
+	public ItemList(){}
+	
+	
+	public ItemList(String s){
+		this.split(s,sp,items);
+	}
+	
+	public ItemList(String s,String sp){
+		this.sp=s;
+		this.split(s,sp,items);
+	}
+	
+	public ItemList(String s,String sp,boolean isMultiToken){
+		split(s,sp,items,isMultiToken);
+	}
+	
+	public List getItems(){
+		return this.items;
+	}
+	
+	public String[] getArray(){
+		return (String[])this.items.toArray();
+	}
+	
+	public void split(String s,String sp,List append,boolean isMultiToken){
+		if(s==null || sp==null)
+			return;
+		if(isMultiToken){
+			StringTokenizer tokens=new StringTokenizer(s,sp);
+			while(tokens.hasMoreTokens()){
+				append.add(tokens.nextToken().trim());
+			}
+		}
+		else{
+			this.split(s,sp,append);
+		}
+	}
+	
+	public void split(String s,String sp,List append){
+		if(s==null || sp==null)
+			return;
+		int pos=0;
+		int prevPos=0;
+		do{
+			prevPos=pos;
+			pos=s.indexOf(sp,pos);
+			if(pos==-1)
+				break;
+			append.add(s.substring(prevPos,pos).trim());
+			pos+=sp.length();
+		}while(pos!=-1);
+		append.add(s.substring(prevPos).trim());
+	}
+	
+	public void setSP(String sp){
+		this.sp=sp;
+	}
+	
+	public void add(int i,String item){
+		if(item==null)
+			return;
+		items.add(i,item.trim());
+	}
+
+	public void add(String item){
+		if(item==null)
+			return;
+		items.add(item.trim());
+	}
+	
+	public void addAll(ItemList list){
+		items.addAll(list.items);
+	}
+	
+	public void addAll(String s){
+		this.split(s,sp,items);
+	}
+	
+	public void addAll(String s,String sp){
+		this.split(s,sp,items);
+	}
+	
+	public void addAll(String s,String sp,boolean isMultiToken){
+		this.split(s,sp,items,isMultiToken);
+	}
+	
+	/**
+	 * @param i 0-based
+	 * @return
+	 */
+	public String get(int i){
+		return (String)items.get(i);
+	}
+	
+	public int size(){
+		return items.size();
+	}
+
+	public String toString(){
+		return toString(sp);
+	}
+	
+	public String toString(String sp){
+		StringBuffer sb=new StringBuffer();
+		
+		for(int i=0;i<items.size();i++){
+			if(i==0)
+				sb.append(items.get(i));
+			else{
+				sb.append(sp);
+				sb.append(items.get(i));
+			}
+		}
+		return sb.toString();
+
+	}
+	
+	public void clear(){
+		items.clear();
+	}
+	
+	public void reset(){
+		sp=",";
+		items.clear();
+	}
+}
@@ -0,0 +1,107 @@
+/*
+ * $Id: JSONArray.java,v 1.1 2006/04/15 14:10:48 platform Exp $
+ * Created on 2006-4-10
+ */
+package org.json.simple;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+/**
+ * A JSON array. JSONObject supports java.util.List interface.
+ * 
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public class JSONArray extends ArrayList implements List, JSONAware, JSONStreamAware {
+	private static final long serialVersionUID = 3957988303675231981L;
+
+    /**
+     * Encode a list into JSON text and write it to out. 
+     * If this list is also a JSONStreamAware or a JSONAware, JSONStreamAware and JSONAware specific behaviours will be ignored at this top level.
+     * 
+     * @see org.json.simple.JSONValue#writeJSONString(Object, Writer)
+     * 
+     * @param list
+     * @param out
+     */
+	public static void writeJSONString(List list, Writer out) throws IOException{
+		if(list == null){
+			out.write("null");
+			return;
+		}
+		
+		boolean first = true;
+		Iterator iter=list.iterator();
+		
+        out.write('[');
+		while(iter.hasNext()){
+            if(first)
+                first = false;
+            else
+                out.write(',');
+            
+			Object value=iter.next();
+			if(value == null){
+				out.write("null");
+				continue;
+			}
+			
+			JSONValue.writeJSONString(value, out);
+		}
+		out.write(']');
+	}
+	
+	public void writeJSONString(Writer out) throws IOException{
+		writeJSONString(this, out);
+	}
+	
+	/**
+	 * Convert a list to JSON text. The result is a JSON array. 
+	 * If this list is also a JSONAware, JSONAware specific behaviours will be omitted at this top level.
+	 * 
+	 * @see org.json.simple.JSONValue#toJSONString(Object)
+	 * 
+	 * @param list
+	 * @return JSON text, or "null" if list is null.
+	 */
+	public static String toJSONString(List list){
+		if(list == null)
+			return "null";
+		
+        boolean first = true;
+        StringBuffer sb = new StringBuffer();
+		Iterator iter=list.iterator();
+        
+        sb.append('[');
+		while(iter.hasNext()){
+            if(first)
+                first = false;
+            else
+                sb.append(',');
+            
+			Object value=iter.next();
+			if(value == null){
+				sb.append("null");
+				continue;
+			}
+			sb.append(JSONValue.toJSONString(value));
+		}
+        sb.append(']');
+		return sb.toString();
+	}
+
+	public String toJSONString(){
+		return toJSONString(this);
+	}
+	
+	public String toString() {
+		return toJSONString();
+	}
+
+	
+		
+}
@@ -0,0 +1,12 @@
+package org.json.simple;
+
+/**
+ * Beans that support customized output of JSON text shall implement this interface.  
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public interface JSONAware {
+	/**
+	 * @return JSON text
+	 */
+	String toJSONString();
+}
@@ -0,0 +1,129 @@
+/*
+ * $Id: JSONObject.java,v 1.1 2006/04/15 14:10:48 platform Exp $
+ * Created on 2006-4-10
+ */
+package org.json.simple;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * A JSON object. Key value pairs are unordered. JSONObject supports java.util.Map interface.
+ * 
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware{
+	private static final long serialVersionUID = -503443796854799292L;
+
+    /**
+     * Encode a map into JSON text and write it to out.
+     * If this map is also a JSONAware or JSONStreamAware, JSONAware or JSONStreamAware specific behaviours will be ignored at this top level.
+     * 
+     * @see org.json.simple.JSONValue#writeJSONString(Object, Writer)
+     * 
+     * @param map
+     * @param out
+     */
+	public static void writeJSONString(Map map, Writer out) throws IOException {
+		if(map == null){
+			out.write("null");
+			return;
+		}
+		
+		boolean first = true;
+		Iterator iter=map.entrySet().iterator();
+		
+        out.write('{');
+		while(iter.hasNext()){
+            if(first)
+                first = false;
+            else
+                out.write(',');
+			Map.Entry entry=(Map.Entry)iter.next();
+            out.write('\"');
+            out.write(escape(String.valueOf(entry.getKey())));
+            out.write('\"');
+            out.write(':');
+			JSONValue.writeJSONString(entry.getValue(), out);
+		}
+		out.write('}');
+	}
+
+	public void writeJSONString(Writer out) throws IOException{
+		writeJSONString(this, out);
+	}
+	
+	/**
+	 * Convert a map to JSON text. The result is a JSON object. 
+	 * If this map is also a JSONAware, JSONAware specific behaviours will be omitted at this top level.
+	 * 
+	 * @see org.json.simple.JSONValue#toJSONString(Object)
+	 * 
+	 * @param map
+	 * @return JSON text, or "null" if map is null.
+	 */
+	public static String toJSONString(Map map){
+		if(map == null)
+			return "null";
+		
+        StringBuffer sb = new StringBuffer();
+        boolean first = true;
+		Iterator iter=map.entrySet().iterator();
+		
+        sb.append('{');
+		while(iter.hasNext()){
+            if(first)
+                first = false;
+            else
+                sb.append(',');
+            
+			Map.Entry entry=(Map.Entry)iter.next();
+			toJSONString(String.valueOf(entry.getKey()),entry.getValue(), sb);
+		}
+        sb.append('}');
+		return sb.toString();
+	}
+	
+	public String toJSONString(){
+		return toJSONString(this);
+	}
+	
+	private static String toJSONString(String key,Object value, StringBuffer sb){
+		sb.append('\"');
+        if(key == null)
+            sb.append("null");
+        else
+            JSONValue.escape(key, sb);
+		sb.append('\"').append(':');
+		
+		sb.append(JSONValue.toJSONString(value));
+		
+		return sb.toString();
+	}
+	
+	public String toString(){
+		return toJSONString();
+	}
+
+	public static String toString(String key,Object value){
+        StringBuffer sb = new StringBuffer();
+		toJSONString(key, value, sb);
+        return sb.toString();
+	}
+	
+	/**
+	 * Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F).
+	 * It's the same as JSONValue.escape() only for compatibility here.
+	 * 
+	 * @see org.json.simple.JSONValue#escape(String)
+	 * 
+	 * @param s
+	 * @return
+	 */
+	public static String escape(String s){
+		return JSONValue.escape(s);
+	}
+}
@@ -0,0 +1,15 @@
+package org.json.simple;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Beans that support customized output of JSON text to a writer shall implement this interface.  
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public interface JSONStreamAware {
+	/**
+	 * write JSON string to out.
+	 */
+	void writeJSONString(Writer out) throws IOException;
+}
@@ -0,0 +1,272 @@
+/*
+ * $Id: JSONValue.java,v 1.1 2006/04/15 14:37:04 platform Exp $
+ * Created on 2006-4-15
+ */
+package org.json.simple;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+
+/**
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public class JSONValue {
+	/**
+	 * Parse JSON text into java object from the input source. 
+	 * Please use parseWithException() if you don't want to ignore the exception.
+	 * 
+	 * @see org.json.simple.parser.JSONParser#parse(Reader)
+	 * @see #parseWithException(Reader)
+	 * 
+	 * @param in
+	 * @return Instance of the following:
+	 *	org.json.simple.JSONObject,
+	 * 	org.json.simple.JSONArray,
+	 * 	java.lang.String,
+	 * 	java.lang.Number,
+	 * 	java.lang.Boolean,
+	 * 	null
+	 * 
+	 */
+	public static Object parse(Reader in){
+		try{
+			JSONParser parser=new JSONParser();
+			return parser.parse(in);
+		}
+		catch(Exception e){
+			return null;
+		}
+	}
+	
+	public static Object parse(String s){
+		StringReader in=new StringReader(s);
+		return parse(in);
+	}
+	
+	/**
+	 * Parse JSON text into java object from the input source.
+	 * 
+	 * @see org.json.simple.parser.JSONParser
+	 * 
+	 * @param in
+	 * @return Instance of the following:
+	 * 	org.json.simple.JSONObject,
+	 * 	org.json.simple.JSONArray,
+	 * 	java.lang.String,
+	 * 	java.lang.Number,
+	 * 	java.lang.Boolean,
+	 * 	null
+	 * 
+	 * @throws IOException
+	 * @throws ParseException
+	 */
+	public static Object parseWithException(Reader in) throws IOException, ParseException{
+		JSONParser parser=new JSONParser();
+		return parser.parse(in);
+	}
+	
+	public static Object parseWithException(String s) throws ParseException{
+		JSONParser parser=new JSONParser();
+		return parser.parse(s);
+	}
+	
+    /**
+     * Encode an object into JSON text and write it to out.
+     * <p>
+     * If this object is a Map or a List, and it's also a JSONStreamAware or a JSONAware, JSONStreamAware or JSONAware will be considered firstly.
+     * <p>
+     * DO NOT call this method from writeJSONString(Writer) of a class that implements both JSONStreamAware and (Map or List) with 
+     * "this" as the first parameter, use JSONObject.writeJSONString(Map, Writer) or JSONArray.writeJSONString(List, Writer) instead. 
+     * 
+     * @see org.json.simple.JSONObject#writeJSONString(Map, Writer)
+     * @see org.json.simple.JSONArray#writeJSONString(List, Writer)
+     * 
+     * @param value
+     * @param writer
+     */
+	public static void writeJSONString(Object value, Writer out) throws IOException {
+		if(value == null){
+			out.write("null");
+			return;
+		}
+		
+		if(value instanceof String){		
+            out.write('\"');
+			out.write(escape((String)value));
+            out.write('\"');
+			return;
+		}
+		
+		if(value instanceof Double){
+			if(((Double)value).isInfinite() || ((Double)value).isNaN())
+				out.write("null");
+			else
+				out.write(value.toString());
+			return;
+		}
+		
+		if(value instanceof Float){
+			if(((Float)value).isInfinite() || ((Float)value).isNaN())
+				out.write("null");
+			else
+				out.write(value.toString());
+			return;
+		}		
+		
+		if(value instanceof Number){
+			out.write(value.toString());
+			return;
+		}
+		
+		if(value instanceof Boolean){
+			out.write(value.toString());
+			return;
+		}
+		
+		if((value instanceof JSONStreamAware)){
+			((JSONStreamAware)value).writeJSONString(out);
+			return;
+		}
+		
+		if((value instanceof JSONAware)){
+			out.write(((JSONAware)value).toJSONString());
+			return;
+		}
+		
+		if(value instanceof Map){
+			JSONObject.writeJSONString((Map)value, out);
+			return;
+		}
+		
+		if(value instanceof List){
+			JSONArray.writeJSONString((List)value, out);
+            return;
+		}
+		
+		out.write(value.toString());
+	}
+
+	/**
+	 * Convert an object to JSON text.
+	 * <p>
+	 * If this object is a Map or a List, and it's also a JSONAware, JSONAware will be considered firstly.
+	 * <p>
+	 * DO NOT call this method from toJSONString() of a class that implements both JSONAware and Map or List with 
+	 * "this" as the parameter, use JSONObject.toJSONString(Map) or JSONArray.toJSONString(List) instead. 
+	 * 
+	 * @see org.json.simple.JSONObject#toJSONString(Map)
+	 * @see org.json.simple.JSONArray#toJSONString(List)
+	 * 
+	 * @param value
+	 * @return JSON text, or "null" if value is null or it's an NaN or an INF number.
+	 */
+	public static String toJSONString(Object value){
+		if(value == null)
+			return "null";
+		
+		if(value instanceof String)
+			return "\""+escape((String)value)+"\"";
+		
+		if(value instanceof Double){
+			if(((Double)value).isInfinite() || ((Double)value).isNaN())
+				return "null";
+			else
+				return value.toString();
+		}
+		
+		if(value instanceof Float){
+			if(((Float)value).isInfinite() || ((Float)value).isNaN())
+				return "null";
+			else
+				return value.toString();
+		}		
+		
+		if(value instanceof Number)
+			return value.toString();
+		
+		if(value instanceof Boolean)
+			return value.toString();
+		
+		if((value instanceof JSONAware))
+			return ((JSONAware)value).toJSONString();
+		
+		if(value instanceof Map)
+			return JSONObject.toJSONString((Map)value);
+		
+		if(value instanceof List)
+			return JSONArray.toJSONString((List)value);
+		
+		return value.toString();
+	}
+
+	/**
+	 * Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F).
+	 * @param s
+	 * @return
+	 */
+	public static String escape(String s){
+		if(s==null)
+			return null;
+        StringBuffer sb = new StringBuffer();
+        escape(s, sb);
+        return sb.toString();
+    }
+
+    /**
+     * @param s - Must not be null.
+     * @param sb
+     */
+    static void escape(String s, StringBuffer sb) {
+		for(int i=0;i<s.length();i++){
+			char ch=s.charAt(i);
+			switch(ch){
+			case '"':
+				sb.append("\\\"");
+				break;
+			case '\\':
+				sb.append("\\\\");
+				break;
+			case '\b':
+				sb.append("\\b");
+				break;
+			case '\f':
+				sb.append("\\f");
+				break;
+			case '\n':
+				sb.append("\\n");
+				break;
+			case '\r':
+				sb.append("\\r");
+				break;
+			case '\t':
+				sb.append("\\t");
+				break;
+			case '/':
+				sb.append("\\/");
+				break;
+			default:
+                //Reference: http://www.unicode.org/versions/Unicode5.1.0/
+				if((ch>='\u0000' && ch<='\u001F') || (ch>='\u007F' && ch<='\u009F') || (ch>='\u2000' && ch<='\u20FF')){
+					String ss=Integer.toHexString(ch);
+					sb.append("\\u");
+					for(int k=0;k<4-ss.length();k++){
+						sb.append('0');
+					}
+					sb.append(ss.toUpperCase());
+				}
+				else{
+					sb.append(ch);
+				}
+			}
+		}//for
+	}
+
+}
@@ -0,0 +1,23 @@
+package org.json.simple.parser;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Container factory for creating containers for JSON object and JSON array.
+ * 
+ * @see org.json.simple.parser.JSONParser#parse(java.io.Reader, ContainerFactory)
+ * 
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public interface ContainerFactory {
+	/**
+	 * @return A Map instance to store JSON object, or null if you want to use org.json.simple.JSONObject.
+	 */
+	Map createObjectContainer();
+	
+	/**
+	 * @return A List instance to store JSON array, or null if you want to use org.json.simple.JSONArray. 
+	 */
+	List creatArrayContainer();
+}
@@ -0,0 +1,110 @@
+package org.json.simple.parser;
+
+import java.io.IOException;
+
+/**
+ * A simplified and stoppable SAX-like content handler for stream processing of JSON text. 
+ * 
+ * @see org.xml.sax.ContentHandler
+ * @see org.json.simple.parser.JSONParser#parse(java.io.Reader, ContentHandler, boolean)
+ * 
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public interface ContentHandler {
+	/**
+	 * Receive notification of the beginning of JSON processing.
+	 * The parser will invoke this method only once.
+     * 
+	 * @throws ParseException 
+	 * 			- JSONParser will stop and throw the same exception to the caller when receiving this exception.
+	 */
+	void startJSON() throws ParseException, IOException;
+	
+	/**
+	 * Receive notification of the end of JSON processing.
+	 * 
+	 * @throws ParseException
+	 */
+	void endJSON() throws ParseException, IOException;
+	
+	/**
+	 * Receive notification of the beginning of a JSON object.
+	 * 
+	 * @return false if the handler wants to stop parsing after return.
+	 * @throws ParseException
+     *          - JSONParser will stop and throw the same exception to the caller when receiving this exception.
+     * @see #endJSON
+	 */
+	boolean startObject() throws ParseException, IOException;
+	
+	/**
+	 * Receive notification of the end of a JSON object.
+	 * 
+	 * @return false if the handler wants to stop parsing after return.
+	 * @throws ParseException
+     * 
+     * @see #startObject
+	 */
+	boolean endObject() throws ParseException, IOException;
+	
+	/**
+	 * Receive notification of the beginning of a JSON object entry.
+	 * 
+	 * @param key - Key of a JSON object entry. 
+	 * 
+	 * @return false if the handler wants to stop parsing after return.
+	 * @throws ParseException
+     * 
+     * @see #endObjectEntry
+	 */
+	boolean startObjectEntry(String key) throws ParseException, IOException;
+	
+	/**
+	 * Receive notification of the end of the value of previous object entry.
+	 * 
+	 * @return false if the handler wants to stop parsing after return.
+	 * @throws ParseException
+     * 
+     * @see #startObjectEntry
+	 */
+	boolean endObjectEntry() throws ParseException, IOException;
+	
+	/**
+	 * Receive notification of the beginning of a JSON array.
+	 * 
+	 * @return false if the handler wants to stop parsing after return.
+	 * @throws ParseException
+     * 
+     * @see #endArray
+	 */
+	boolean startArray() throws ParseException, IOException;
+	
+	/**
+	 * Receive notification of the end of a JSON array.
+	 * 
+	 * @return false if the handler wants to stop parsing after return.
+	 * @throws ParseException
+     * 
+     * @see #startArray
+	 */
+	boolean endArray() throws ParseException, IOException;
+	
+	/**
+	 * Receive notification of the JSON primitive values:
+	 * 	java.lang.String,
+	 * 	java.lang.Number,
+	 * 	java.lang.Boolean
+	 * 	null
+	 * 
+	 * @param value - Instance of the following:
+	 * 			java.lang.String,
+	 * 			java.lang.Number,
+	 * 			java.lang.Boolean
+	 * 			null
+	 * 
+	 * @return false if the handler wants to stop parsing after return.
+	 * @throws ParseException
+	 */
+	boolean primitive(Object value) throws ParseException, IOException;
+		
+}
@@ -0,0 +1,533 @@
+/*
+ * $Id: JSONParser.java,v 1.1 2006/04/15 14:10:48 platform Exp $
+ * Created on 2006-4-15
+ */
+package org.json.simple.parser;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+
+/**
+ * Parser for JSON text. Please note that JSONParser is NOT thread-safe.
+ * 
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public class JSONParser {
+	public static final int S_INIT=0;
+	public static final int S_IN_FINISHED_VALUE=1;//string,number,boolean,null,object,array
+	public static final int S_IN_OBJECT=2;
+	public static final int S_IN_ARRAY=3;
+	public static final int S_PASSED_PAIR_KEY=4;
+	public static final int S_IN_PAIR_VALUE=5;
+	public static final int S_END=6;
+	public static final int S_IN_ERROR=-1;
+	
+	private LinkedList handlerStatusStack;
+	private Yylex lexer = new Yylex((Reader)null);
+	private Yytoken token = null;
+	private int status = S_INIT;
+	
+	private int peekStatus(LinkedList statusStack){
+		if(statusStack.size()==0)
+			return -1;
+		Integer status=(Integer)statusStack.getFirst();
+		return status.intValue();
+	}
+	
+    /**
+     *  Reset the parser to the initial state without resetting the underlying reader.
+     *
+     */
+    public void reset(){
+        token = null;
+        status = S_INIT;
+        handlerStatusStack = null;
+    }
+    
+    /**
+     * Reset the parser to the initial state with a new character reader.
+     * 
+     * @param in - The new character reader.
+     * @throws IOException
+     * @throws ParseException
+     */
+	public void reset(Reader in){
+		lexer.yyreset(in);
+		reset();
+	}
+	
+	/**
+	 * @return The position of the beginning of the current token.
+	 */
+	public int getPosition(){
+		return lexer.getPosition();
+	}
+	
+	public Object parse(String s) throws ParseException{
+		return parse(s, (ContainerFactory)null);
+	}
+	
+	public Object parse(String s, ContainerFactory containerFactory) throws ParseException{
+		StringReader in=new StringReader(s);
+		try{
+			return parse(in, containerFactory);
+		}
+		catch(IOException ie){
+			/*
+			 * Actually it will never happen.
+			 */
+			throw new ParseException(-1, ParseException.ERROR_UNEXPECTED_EXCEPTION, ie);
+		}
+	}
+	
+	public Object parse(Reader in) throws IOException, ParseException{
+		return parse(in, (ContainerFactory)null);
+	}
+	
+	/**
+	 * Parse JSON text into java object from the input source.
+	 * 	
+	 * @param in
+     * @param containerFactory - Use this factory to createyour own JSON object and JSON array containers.
+	 * @return Instance of the following:
+	 *  org.json.simple.JSONObject,
+	 * 	org.json.simple.JSONArray,
+	 * 	java.lang.String,
+	 * 	java.lang.Number,
+	 * 	java.lang.Boolean,
+	 * 	null
+	 * 
+	 * @throws IOException
+	 * @throws ParseException
+	 */
+	public Object parse(Reader in, ContainerFactory containerFactory) throws IOException, ParseException{
+		reset(in);
+		LinkedList statusStack = new LinkedList();
+		LinkedList valueStack = new LinkedList();
+		
+		try{
+			do{
+				nextToken();
+				switch(status){
+				case S_INIT:
+					switch(token.type){
+					case Yytoken.TYPE_VALUE:
+						status=S_IN_FINISHED_VALUE;
+						statusStack.addFirst(new Integer(status));
+						valueStack.addFirst(token.value);
+						break;
+					case Yytoken.TYPE_LEFT_BRACE:
+						status=S_IN_OBJECT;
+						statusStack.addFirst(new Integer(status));
+						valueStack.addFirst(createObjectContainer(containerFactory));
+						break;
+					case Yytoken.TYPE_LEFT_SQUARE:
+						status=S_IN_ARRAY;
+						statusStack.addFirst(new Integer(status));
+						valueStack.addFirst(createArrayContainer(containerFactory));
+						break;
+					default:
+						status=S_IN_ERROR;
+					}//inner switch
+					break;
+					
+				case S_IN_FINISHED_VALUE:
+					if(token.type==Yytoken.TYPE_EOF)
+						return valueStack.removeFirst();
+					else
+						throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
+					
+				case S_IN_OBJECT:
+					switch(token.type){
+					case Yytoken.TYPE_COMMA:
+						break;
+					case Yytoken.TYPE_VALUE:
+						if(token.value instanceof String){
+							String key=(String)token.value;
+							valueStack.addFirst(key);
+							status=S_PASSED_PAIR_KEY;
+							statusStack.addFirst(new Integer(status));
+						}
+						else{
+							status=S_IN_ERROR;
+						}
+						break;
+					case Yytoken.TYPE_RIGHT_BRACE:
+						if(valueStack.size()>1){
+							statusStack.removeFirst();
+							valueStack.removeFirst();
+							status=peekStatus(statusStack);
+						}
+						else{
+							status=S_IN_FINISHED_VALUE;
+						}
+						break;
+					default:
+						status=S_IN_ERROR;
+						break;
+					}//inner switch
+					break;
+					
+				case S_PASSED_PAIR_KEY:
+					switch(token.type){
+					case Yytoken.TYPE_COLON:
+						break;
+					case Yytoken.TYPE_VALUE:
+						statusStack.removeFirst();
+						String key=(String)valueStack.removeFirst();
+						Map parent=(Map)valueStack.getFirst();
+						parent.put(key,token.value);
+						status=peekStatus(statusStack);
+						break;
+					case Yytoken.TYPE_LEFT_SQUARE:
+						statusStack.removeFirst();
+						key=(String)valueStack.removeFirst();
+						parent=(Map)valueStack.getFirst();
+						List newArray=createArrayContainer(containerFactory);
+						parent.put(key,newArray);
+						status=S_IN_ARRAY;
+						statusStack.addFirst(new Integer(status));
+						valueStack.addFirst(newArray);
+						break;
+					case Yytoken.TYPE_LEFT_BRACE:
+						statusStack.removeFirst();
+						key=(String)valueStack.removeFirst();
+						parent=(Map)valueStack.getFirst();
+						Map newObject=createObjectContainer(containerFactory);
+						parent.put(key,newObject);
+						status=S_IN_OBJECT;
+						statusStack.addFirst(new Integer(status));
+						valueStack.addFirst(newObject);
+						break;
+					default:
+						status=S_IN_ERROR;
+					}
+					break;
+					
+				case S_IN_ARRAY:
+					switch(token.type){
+					case Yytoken.TYPE_COMMA:
+						break;
+					case Yytoken.TYPE_VALUE:
+						List val=(List)valueStack.getFirst();
+						val.add(token.value);
+						break;
+					case Yytoken.TYPE_RIGHT_SQUARE:
+						if(valueStack.size()>1){
+							statusStack.removeFirst();
+							valueStack.removeFirst();
+							status=peekStatus(statusStack);
+						}
+						else{
+							status=S_IN_FINISHED_VALUE;
+						}
+						break;
+					case Yytoken.TYPE_LEFT_BRACE:
+						val=(List)valueStack.getFirst();
+						Map newObject=createObjectContainer(containerFactory);
+						val.add(newObject);
+						status=S_IN_OBJECT;
+						statusStack.addFirst(new Integer(status));
+						valueStack.addFirst(newObject);
+						break;
+					case Yytoken.TYPE_LEFT_SQUARE:
+						val=(List)valueStack.getFirst();
+						List newArray=createArrayContainer(containerFactory);
+						val.add(newArray);
+						status=S_IN_ARRAY;
+						statusStack.addFirst(new Integer(status));
+						valueStack.addFirst(newArray);
+						break;
+					default:
+						status=S_IN_ERROR;
+					}//inner switch
+					break;
+				case S_IN_ERROR:
+					throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
+				}//switch
+				if(status==S_IN_ERROR){
+					throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
+				}
+			}while(token.type!=Yytoken.TYPE_EOF);
+		}
+		catch(IOException ie){
+			throw ie;
+		}
+		
+		throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
+	}
+	
+	private void nextToken() throws ParseException, IOException{
+		token = lexer.yylex();
+		if(token == null)
+			token = new Yytoken(Yytoken.TYPE_EOF, null);
+	}
+	
+	private Map createObjectContainer(ContainerFactory containerFactory){
+		if(containerFactory == null)
+			return new JSONObject();
+		Map m = containerFactory.createObjectContainer();
+		
+		if(m == null)
+			return new JSONObject();
+		return m;
+	}
+	
+	private List createArrayContainer(ContainerFactory containerFactory){
+		if(containerFactory == null)
+			return new JSONArray();
+		List l = containerFactory.creatArrayContainer();
+		
+		if(l == null)
+			return new JSONArray();
+		return l;
+	}
+	
+	public void parse(String s, ContentHandler contentHandler) throws ParseException{
+		parse(s, contentHandler, false);
+	}
+	
+	public void parse(String s, ContentHandler contentHandler, boolean isResume) throws ParseException{
+		StringReader in=new StringReader(s);
+		try{
+			parse(in, contentHandler, isResume);
+		}
+		catch(IOException ie){
+			/*
+			 * Actually it will never happen.
+			 */
+			throw new ParseException(-1, ParseException.ERROR_UNEXPECTED_EXCEPTION, ie);
+		}
+	}
+	
+	public void parse(Reader in, ContentHandler contentHandler) throws IOException, ParseException{
+		parse(in, contentHandler, false);
+	}
+	
+	/**
+	 * Stream processing of JSON text.
+	 * 
+	 * @see ContentHandler
+	 * 
+	 * @param in
+	 * @param contentHandler
+	 * @param isResume - Indicates if it continues previous parsing operation.
+     *                   If set to true, resume parsing the old stream, and parameter 'in' will be ignored. 
+	 *                   If this method is called for the first time in this instance, isResume will be ignored.
+	 * 
+	 * @throws IOException
+	 * @throws ParseException
+	 */
+	public void parse(Reader in, ContentHandler contentHandler, boolean isResume) throws IOException, ParseException{
+		if(!isResume){
+			reset(in);
+			handlerStatusStack = new LinkedList();
+		}
+		else{
+			if(handlerStatusStack == null){
+				isResume = false;
+				reset(in);
+				handlerStatusStack = new LinkedList();
+			}
+		}
+		
+		LinkedList statusStack = handlerStatusStack;	
+		
+		try{
+			do{
+				switch(status){
+				case S_INIT:
+					contentHandler.startJSON();
+					nextToken();
+					switch(token.type){
+					case Yytoken.TYPE_VALUE:
+						status=S_IN_FINISHED_VALUE;
+						statusStack.addFirst(new Integer(status));
+						if(!contentHandler.primitive(token.value))
+							return;
+						break;
+					case Yytoken.TYPE_LEFT_BRACE:
+						status=S_IN_OBJECT;
+						statusStack.addFirst(new Integer(status));
+						if(!contentHandler.startObject())
+							return;
+						break;
+					case Yytoken.TYPE_LEFT_SQUARE:
+						status=S_IN_ARRAY;
+						statusStack.addFirst(new Integer(status));
+						if(!contentHandler.startArray())
+							return;
+						break;
+					default:
+						status=S_IN_ERROR;
+					}//inner switch
+					break;
+					
+				case S_IN_FINISHED_VALUE:
+					nextToken();
+					if(token.type==Yytoken.TYPE_EOF){
+						contentHandler.endJSON();
+						status = S_END;
+						return;
+					}
+					else{
+						status = S_IN_ERROR;
+						throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
+					}
+			
+				case S_IN_OBJECT:
+					nextToken();
+					switch(token.type){
+					case Yytoken.TYPE_COMMA:
+						break;
+					case Yytoken.TYPE_VALUE:
+						if(token.value instanceof String){
+							String key=(String)token.value;
+							status=S_PASSED_PAIR_KEY;
+							statusStack.addFirst(new Integer(status));
+							if(!contentHandler.startObjectEntry(key))
+								return;
+						}
+						else{
+							status=S_IN_ERROR;
+						}
+						break;
+					case Yytoken.TYPE_RIGHT_BRACE:
+						if(statusStack.size()>1){
+							statusStack.removeFirst();
+							status=peekStatus(statusStack);
+						}
+						else{
+							status=S_IN_FINISHED_VALUE;
+						}
+						if(!contentHandler.endObject())
+							return;
+						break;
+					default:
+						status=S_IN_ERROR;
+						break;
+					}//inner switch
+					break;
+					
+				case S_PASSED_PAIR_KEY:
+					nextToken();
+					switch(token.type){
+					case Yytoken.TYPE_COLON:
+						break;
+					case Yytoken.TYPE_VALUE:
+						statusStack.removeFirst();
+						status=peekStatus(statusStack);
+						if(!contentHandler.primitive(token.value))
+							return;
+						if(!contentHandler.endObjectEntry())
+							return;
+						break;
+					case Yytoken.TYPE_LEFT_SQUARE:
+						statusStack.removeFirst();
+						statusStack.addFirst(new Integer(S_IN_PAIR_VALUE));
+						status=S_IN_ARRAY;
+						statusStack.addFirst(new Integer(status));
+						if(!contentHandler.startArray())
+							return;
+						break;
+					case Yytoken.TYPE_LEFT_BRACE:
+						statusStack.removeFirst();
+						statusStack.addFirst(new Integer(S_IN_PAIR_VALUE));
+						status=S_IN_OBJECT;
+						statusStack.addFirst(new Integer(status));
+						if(!contentHandler.startObject())
+							return;
+						break;
+					default:
+						status=S_IN_ERROR;
+					}
+					break;
+				
+				case S_IN_PAIR_VALUE:
+					/*
+					 * S_IN_PAIR_VALUE is just a marker to indicate the end of an object entry, it doesn't proccess any token,
+					 * therefore delay consuming token until next round.
+					 */
+					statusStack.removeFirst();
+					status = peekStatus(statusStack);
+					if(!contentHandler.endObjectEntry())
+						return;
+					break;
+					
+				case S_IN_ARRAY:
+					nextToken();
+					switch(token.type){
+					case Yytoken.TYPE_COMMA:
+						break;
+					case Yytoken.TYPE_VALUE:
+						if(!contentHandler.primitive(token.value))
+							return;
+						break;
+					case Yytoken.TYPE_RIGHT_SQUARE:
+						if(statusStack.size()>1){
+							statusStack.removeFirst();
+							status=peekStatus(statusStack);
+						}
+						else{
+							status=S_IN_FINISHED_VALUE;
+						}
+						if(!contentHandler.endArray())
+							return;
+						break;
+					case Yytoken.TYPE_LEFT_BRACE:
+						status=S_IN_OBJECT;
+						statusStack.addFirst(new Integer(status));
+						if(!contentHandler.startObject())
+							return;
+						break;
+					case Yytoken.TYPE_LEFT_SQUARE:
+						status=S_IN_ARRAY;
+						statusStack.addFirst(new Integer(status));
+						if(!contentHandler.startArray())
+							return;
+						break;
+					default:
+						status=S_IN_ERROR;
+					}//inner switch
+					break;
+					
+				case S_END:
+					return;
+					
+				case S_IN_ERROR:
+					throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
+				}//switch
+				if(status==S_IN_ERROR){
+					throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
+				}
+			}while(token.type!=Yytoken.TYPE_EOF);
+		}
+		catch(IOException ie){
+			status = S_IN_ERROR;
+			throw ie;
+		}
+		catch(ParseException pe){
+			status = S_IN_ERROR;
+			throw pe;
+		}
+		catch(RuntimeException re){
+			status = S_IN_ERROR;
+			throw re;
+		}
+		catch(Error e){
+			status = S_IN_ERROR;
+			throw e;
+		}
+		
+		status = S_IN_ERROR;
+		throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
+	}
+}
@@ -0,0 +1,90 @@
+package org.json.simple.parser;
+
+/**
+ * ParseException explains why and where the error occurs in source JSON text.
+ * 
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ *
+ */
+public class ParseException extends Exception {
+	private static final long serialVersionUID = -7880698968187728548L;
+	
+	public static final int ERROR_UNEXPECTED_CHAR = 0;
+	public static final int ERROR_UNEXPECTED_TOKEN = 1;
+	public static final int ERROR_UNEXPECTED_EXCEPTION = 2;
+
+	private int errorType;
+	private Object unexpectedObject;
+	private int position;
+	
+	public ParseException(int errorType){
+		this(-1, errorType, null);
+	}
+	
+	public ParseException(int errorType, Object unexpectedObject){
+		this(-1, errorType, unexpectedObject);
+	}
+	
+	public ParseException(int position, int errorType, Object unexpectedObject){
+		this.position = position;
+		this.errorType = errorType;
+		this.unexpectedObject = unexpectedObject;
+	}
+	
+	public int getErrorType() {
+		return errorType;
+	}
+	
+	public void setErrorType(int errorType) {
+		this.errorType = errorType;
+	}
+	
+	/**
+	 * @see org.json.simple.parser.JSONParser#getPosition()
+	 * 
+	 * @return The character position (starting with 0) of the input where the error occurs.
+	 */
+	public int getPosition() {
+		return position;
+	}
+	
+	public void setPosition(int position) {
+		this.position = position;
+	}
+	
+	/**
+	 * @see org.json.simple.parser.Yytoken
+	 * 
+	 * @return One of the following base on the value of errorType:
+	 * 		   	ERROR_UNEXPECTED_CHAR		java.lang.Character
+	 * 			ERROR_UNEXPECTED_TOKEN		org.json.simple.parser.Yytoken
+	 * 			ERROR_UNEXPECTED_EXCEPTION	java.lang.Exception
+	 */
+	public Object getUnexpectedObject() {
+		return unexpectedObject;
+	}
+	
+	public void setUnexpectedObject(Object unexpectedObject) {
+		this.unexpectedObject = unexpectedObject;
+	}
+	
+	public String toString(){
+		StringBuffer sb = new StringBuffer();
+		
+		switch(errorType){
+		case ERROR_UNEXPECTED_CHAR:
+			sb.append("Unexpected character (").append(unexpectedObject).append(") at position ").append(position).append(".");
+			break;
+		case ERROR_UNEXPECTED_TOKEN:
+			sb.append("Unexpected token ").append(unexpectedObject).append(" at position ").append(position).append(".");
+			break;
+		case ERROR_UNEXPECTED_EXCEPTION:
+			sb.append("Unexpected exception at position ").append(position).append(": ").append(unexpectedObject);
+			break;
+		default:
+			sb.append("Unkown error at position ").append(position).append(".");
+			break;
+		}
+		return sb.toString();
+	}
+}
@@ -0,0 +1,688 @@
+/* The following code was generated by JFlex 1.4.2 */
+
+package org.json.simple.parser;
+
+class Yylex {
+
+  /** This character denotes the end of file */
+  public static final int YYEOF = -1;
+
+  /** initial size of the lookahead buffer */
+  private static final int ZZ_BUFFERSIZE = 16384;
+
+  /** lexical states */
+  public static final int YYINITIAL = 0;
+  public static final int STRING_BEGIN = 2;
+
+  /**
+   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+   *                  at the beginning of a line
+   * l is of the form l = 2*k, k a non negative integer
+   */
+  private static final int ZZ_LEXSTATE[] = { 
+     0,  0,  1, 1
+  };
+
+  /** 
+   * Translates characters to character classes
+   */
+  private static final String ZZ_CMAP_PACKED = 
+    "\11\0\1\7\1\7\2\0\1\7\22\0\1\7\1\0\1\11\10\0"+
+    "\1\6\1\31\1\2\1\4\1\12\12\3\1\32\6\0\4\1\1\5"+
+    "\1\1\24\0\1\27\1\10\1\30\3\0\1\22\1\13\2\1\1\21"+
+    "\1\14\5\0\1\23\1\0\1\15\3\0\1\16\1\24\1\17\1\20"+
+    "\5\0\1\25\1\0\1\26\uff82\0";
+
+  /** 
+   * Translates characters to character classes
+   */
+  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
+
+  /** 
+   * Translates DFA states to action switch labels.
+   */
+  private static final int [] ZZ_ACTION = zzUnpackAction();
+
+  private static final String ZZ_ACTION_PACKED_0 =
+    "\2\0\2\1\1\2\1\3\1\4\3\1\1\5\1\6"+
+    "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\5\0"+
+    "\1\14\1\16\1\17\1\20\1\21\1\22\1\23\1\24"+
+    "\1\0\1\25\1\0\1\25\4\0\1\26\1\27\2\0"+
+    "\1\30";
+
+  private static int [] zzUnpackAction() {
+    int [] result = new int[45];
+    int offset = 0;
+    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAction(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /** 
+   * Translates a state to a row index in the transition table
+   */
+  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
+
+  private static final String ZZ_ROWMAP_PACKED_0 =
+    "\0\0\0\33\0\66\0\121\0\154\0\207\0\66\0\242"+
+    "\0\275\0\330\0\66\0\66\0\66\0\66\0\66\0\66"+
+    "\0\363\0\u010e\0\66\0\u0129\0\u0144\0\u015f\0\u017a\0\u0195"+
+    "\0\66\0\66\0\66\0\66\0\66\0\66\0\66\0\66"+
+    "\0\u01b0\0\u01cb\0\u01e6\0\u01e6\0\u0201\0\u021c\0\u0237\0\u0252"+
+    "\0\66\0\66\0\u026d\0\u0288\0\66";
+
+  private static int [] zzUnpackRowMap() {
+    int [] result = new int[45];
+    int offset = 0;
+    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
+    int i = 0;  /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int high = packed.charAt(i++) << 16;
+      result[j++] = high | packed.charAt(i++);
+    }
+    return j;
+  }
+
+  /** 
+   * The transition table of the DFA
+   */
+  private static final int ZZ_TRANS [] = {
+    2, 2, 3, 4, 2, 2, 2, 5, 2, 6, 
+    2, 2, 7, 8, 2, 9, 2, 2, 2, 2, 
+    2, 10, 11, 12, 13, 14, 15, 16, 16, 16, 
+    16, 16, 16, 16, 16, 17, 18, 16, 16, 16, 
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+    16, 16, 16, 16, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, 4, 19, 20, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    21, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    23, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, 16, 16, 16, 16, 16, 16, 16, 
+    16, -1, -1, 16, 16, 16, 16, 16, 16, 16, 
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+    -1, -1, -1, -1, -1, -1, -1, -1, 24, 25, 
+    26, 27, 28, 29, 30, 31, 32, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    33, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, 34, 35, -1, -1, 
+    34, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    36, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, 37, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, 39, -1, 39, -1, 39, -1, -1, 
+    -1, -1, -1, 39, 39, -1, -1, -1, -1, 39, 
+    39, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, 33, -1, 20, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, 35, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, 40, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, 
+    -1, -1, -1, -1, -1, 42, -1, 42, -1, 42, 
+    -1, -1, -1, -1, -1, 42, 42, -1, -1, -1, 
+    -1, 42, 42, -1, -1, -1, -1, -1, -1, -1, 
+    -1, -1, 43, -1, 43, -1, 43, -1, -1, -1, 
+    -1, -1, 43, 43, -1, -1, -1, -1, 43, 43, 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, 
+    -1, 44, -1, 44, -1, -1, -1, -1, -1, 44, 
+    44, -1, -1, -1, -1, 44, 44, -1, -1, -1, 
+    -1, -1, -1, -1, -1, 
+  };
+
+  /* error codes */
+  private static final int ZZ_UNKNOWN_ERROR = 0;
+  private static final int ZZ_NO_MATCH = 1;
+  private static final int ZZ_PUSHBACK_2BIG = 2;
+
+  /* error messages for the codes above */
+  private static final String ZZ_ERROR_MSG[] = {
+    "Unkown internal scanner error",
+    "Error: could not match input",
+    "Error: pushback value was too large"
+  };
+
+  /**
+   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
+   */
+  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+  private static final String ZZ_ATTRIBUTE_PACKED_0 =
+    "\2\0\1\11\3\1\1\11\3\1\6\11\2\1\1\11"+
+    "\5\0\10\11\1\0\1\1\1\0\1\1\4\0\2\11"+
+    "\2\0\1\11";
+
+  private static int [] zzUnpackAttribute() {
+    int [] result = new int[45];
+    int offset = 0;
+    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+  /** the input device */
+  private java.io.Reader zzReader;
+
+  /** the current state of the DFA */
+  private int zzState;
+
+  /** the current lexical state */
+  private int zzLexicalState = YYINITIAL;
+
+  /** this buffer contains the current text to be matched and is
+      the source of the yytext() string */
+  private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
+
+  /** the textposition at the last accepting state */
+  private int zzMarkedPos;
+
+  /** the current text position in the buffer */
+  private int zzCurrentPos;
+
+  /** startRead marks the beginning of the yytext() string in the buffer */
+  private int zzStartRead;
+
+  /** endRead marks the last character in the buffer, that has been read
+      from input */
+  private int zzEndRead;
+
+  /** number of newlines encountered up to the start of the matched text */
+  private int yyline;
+
+  /** the number of characters up to the start of the matched text */
+  private int yychar;
+
+  /**
+   * the number of characters from the last newline up to the start of the 
+   * matched text
+   */
+  private int yycolumn;
+
+  /** 
+   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
+   */
+  private boolean zzAtBOL = true;
+
+  /** zzAtEOF == true <=> the scanner is at the EOF */
+  private boolean zzAtEOF;
+
+  /* user code: */
+private StringBuffer sb=new StringBuffer();
+
+int getPosition(){
+	return yychar;
+}
+
+
+
+  /**
+   * Creates a new scanner
+   * There is also a java.io.InputStream version of this constructor.
+   *
+   * @param   in  the java.io.Reader to read input from.
+   */
+  Yylex(java.io.Reader in) {
+    this.zzReader = in;
+  }
+
+  /**
+   * Creates a new scanner.
+   * There is also java.io.Reader version of this constructor.
+   *
+   * @param   in  the java.io.Inputstream to read input from.
+   */
+  Yylex(java.io.InputStream in) {
+    this(new java.io.InputStreamReader(in));
+  }
+
+  /** 
+   * Unpacks the compressed character translation table.
+   *
+   * @param packed   the packed character translation table
+   * @return         the unpacked character translation table
+   */
+  private static char [] zzUnpackCMap(String packed) {
+    char [] map = new char[0x10000];
+    int i = 0;  /* index in packed string  */
+    int j = 0;  /* index in unpacked array */
+    while (i < 90) {
+      int  count = packed.charAt(i++);
+      char value = packed.charAt(i++);
+      do map[j++] = value; while (--count > 0);
+    }
+    return map;
+  }
+
+
+  /**
+   * Refills the input buffer.
+   *
+   * @return      <code>false</code>, iff there was new input.
+   * 
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  private boolean zzRefill() throws java.io.IOException {
+
+    /* first: make room (if you can) */
+    if (zzStartRead > 0) {
+      System.arraycopy(zzBuffer, zzStartRead,
+                       zzBuffer, 0,
+                       zzEndRead-zzStartRead);
+
+      /* translate stored positions */
+      zzEndRead-= zzStartRead;
+      zzCurrentPos-= zzStartRead;
+      zzMarkedPos-= zzStartRead;
+      zzStartRead = 0;
+    }
+
+    /* is the buffer big enough? */
+    if (zzCurrentPos >= zzBuffer.length) {
+      /* if not: blow it up */
+      char newBuffer[] = new char[zzCurrentPos*2];
+      System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
+      zzBuffer = newBuffer;
+    }
+
+    /* finally: fill the buffer with new input */
+    int numRead = zzReader.read(zzBuffer, zzEndRead,
+                                            zzBuffer.length-zzEndRead);
+
+    if (numRead > 0) {
+      zzEndRead+= numRead;
+      return false;
+    }
+    // unlikely but not impossible: read 0 characters, but not at end of stream    
+    if (numRead == 0) {
+      int c = zzReader.read();
+      if (c == -1) {
+        return true;
+      } else {
+        zzBuffer[zzEndRead++] = (char) c;
+        return false;
+      }     
+    }
+
+	// numRead < 0
+    return true;
+  }
+
+    
+  /**
+   * Closes the input stream.
+   */
+  public final void yyclose() throws java.io.IOException {
+    zzAtEOF = true;            /* indicate end of file */
+    zzEndRead = zzStartRead;  /* invalidate buffer    */
+
+    if (zzReader != null)
+      zzReader.close();
+  }
+
+
+  /**
+   * Resets the scanner to read from a new input stream.
+   * Does not close the old reader.
+   *
+   * All internal variables are reset, the old input stream 
+   * <b>cannot</b> be reused (internal buffer is discarded and lost).
+   * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+   *
+   * @param reader   the new input stream 
+   */
+  public final void yyreset(java.io.Reader reader) {
+    zzReader = reader;
+    zzAtBOL  = true;
+    zzAtEOF  = false;
+    zzEndRead = zzStartRead = 0;
+    zzCurrentPos = zzMarkedPos = 0;
+    yyline = yychar = yycolumn = 0;
+    zzLexicalState = YYINITIAL;
+  }
+
+
+  /**
+   * Returns the current lexical state.
+   */
+  public final int yystate() {
+    return zzLexicalState;
+  }
+
+
+  /**
+   * Enters a new lexical state
+   *
+   * @param newState the new lexical state
+   */
+  public final void yybegin(int newState) {
+    zzLexicalState = newState;
+  }
+
+
+  /**
+   * Returns the text matched by the current regular expression.
+   */
+  public final String yytext() {
+    return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead );
+  }
+
+
+  /**
+   * Returns the character at position <tt>pos</tt> from the 
+   * matched text. 
+   * 
+   * It is equivalent to yytext().charAt(pos), but faster
+   *
+   * @param pos the position of the character to fetch. 
+   *            A value from 0 to yylength()-1.
+   *
+   * @return the character at position pos
+   */
+  public final char yycharat(int pos) {
+    return zzBuffer[zzStartRead+pos];
+  }
+
+
+  /**
+   * Returns the length of the matched text region.
+   */
+  public final int yylength() {
+    return zzMarkedPos-zzStartRead;
+  }
+
+
+  /**
+   * Reports an error that occured while scanning.
+   *
+   * In a wellformed scanner (no or only correct usage of 
+   * yypushback(int) and a match-all fallback rule) this method 
+   * will only be called with things that "Can't Possibly Happen".
+   * If this method is called, something is seriously wrong
+   * (e.g. a JFlex bug producing a faulty scanner etc.).
+   *
+   * Usual syntax/scanner level error handling should be done
+   * in error fallback rules.
+   *
+   * @param   errorCode  the code of the errormessage to display
+   */
+  private void zzScanError(int errorCode) {
+    String message;
+    try {
+      message = ZZ_ERROR_MSG[errorCode];
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+    }
+
+    throw new Error(message);
+  } 
+
+
+  /**
+   * Pushes the specified amount of characters back into the input stream.
+   *
+   * They will be read again by then next call of the scanning method
+   *
+   * @param number  the number of characters to be read again.
+   *                This number must not be greater than yylength()!
+   */
+  public void yypushback(int number)  {
+    if ( number > yylength() )
+      zzScanError(ZZ_PUSHBACK_2BIG);
+
+    zzMarkedPos -= number;
+  }
+
+
+  /**
+   * Resumes scanning until the next regular expression is matched,
+   * the end of input is encountered or an I/O-Error occurs.
+   *
+   * @return      the next token
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  public Yytoken yylex() throws java.io.IOException, ParseException {
+    int zzInput;
+    int zzAction;
+
+    // cached fields:
+    int zzCurrentPosL;
+    int zzMarkedPosL;
+    int zzEndReadL = zzEndRead;
+    char [] zzBufferL = zzBuffer;
+    char [] zzCMapL = ZZ_CMAP;
+
+    int [] zzTransL = ZZ_TRANS;
+    int [] zzRowMapL = ZZ_ROWMAP;
+    int [] zzAttrL = ZZ_ATTRIBUTE;
+
+    while (true) {
+      zzMarkedPosL = zzMarkedPos;
+
+      yychar+= zzMarkedPosL-zzStartRead;
+
+      zzAction = -1;
+
+      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+  
+      zzState = ZZ_LEXSTATE[zzLexicalState];
+
+
+      zzForAction: {
+        while (true) {
+    
+          if (zzCurrentPosL < zzEndReadL)
+            zzInput = zzBufferL[zzCurrentPosL++];
+          else if (zzAtEOF) {
+            zzInput = YYEOF;
+            break zzForAction;
+          }
+          else {
+            // store back cached positions
+            zzCurrentPos  = zzCurrentPosL;
+            zzMarkedPos   = zzMarkedPosL;
+            boolean eof = zzRefill();
+            // get translated positions and possibly new buffer
+            zzCurrentPosL  = zzCurrentPos;
+            zzMarkedPosL   = zzMarkedPos;
+            zzBufferL      = zzBuffer;
+            zzEndReadL     = zzEndRead;
+            if (eof) {
+              zzInput = YYEOF;
+              break zzForAction;
+            }
+            else {
+              zzInput = zzBufferL[zzCurrentPosL++];
+            }
+          }
+          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
+          if (zzNext == -1) break zzForAction;
+          zzState = zzNext;
+
+          int zzAttributes = zzAttrL[zzState];
+          if ( (zzAttributes & 1) == 1 ) {
+            zzAction = zzState;
+            zzMarkedPosL = zzCurrentPosL;
+            if ( (zzAttributes & 8) == 8 ) break zzForAction;
+          }
+
+        }
+      }
+
+      // store back cached position
+      zzMarkedPos = zzMarkedPosL;
+
+      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+        case 11: 
+          { sb.append(yytext());
+          }
+        case 25: break;
+        case 4: 
+          { sb.delete(0, sb.length());yybegin(STRING_BEGIN);
+          }
+        case 26: break;
+        case 16: 
+          { sb.append('\b');
+          }
+        case 27: break;
+        case 6: 
+          { return new Yytoken(Yytoken.TYPE_RIGHT_BRACE,null);
+          }
+        case 28: break;
+        case 23: 
+          { Boolean val=Boolean.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE, val);
+          }
+        case 29: break;
+        case 22: 
+          { return new Yytoken(Yytoken.TYPE_VALUE, null);
+          }
+        case 30: break;
+        case 13: 
+          { yybegin(YYINITIAL);return new Yytoken(Yytoken.TYPE_VALUE, sb.toString());
+          }
+        case 31: break;
+        case 12: 
+          { sb.append('\\');
+          }
+        case 32: break;
+        case 21: 
+          { Double val=Double.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE, val);
+          }
+        case 33: break;
+        case 1: 
+          { throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_CHAR, new Character(yycharat(0)));
+          }
+        case 34: break;
+        case 8: 
+          { return new Yytoken(Yytoken.TYPE_RIGHT_SQUARE,null);
+          }
+        case 35: break;
+        case 19: 
+          { sb.append('\r');
+          }
+        case 36: break;
+        case 15: 
+          { sb.append('/');
+          }
+        case 37: break;
+        case 10: 
+          { return new Yytoken(Yytoken.TYPE_COLON,null);
+          }
+        case 38: break;
+        case 14: 
+          { sb.append('"');
+          }
+        case 39: break;
+        case 5: 
+          { return new Yytoken(Yytoken.TYPE_LEFT_BRACE,null);
+          }
+        case 40: break;
+        case 17: 
+          { sb.append('\f');
+          }
+        case 41: break;
+        case 24: 
+          { try{
+														int ch=Integer.parseInt(yytext().substring(2),16);
+														sb.append((char)ch);
+													}
+													catch(Exception e){
+														throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_EXCEPTION, e);
+													}
+          }
+        case 42: break;
+        case 20: 
+          { sb.append('\t');
+          }
+        case 43: break;
+        case 7: 
+          { return new Yytoken(Yytoken.TYPE_LEFT_SQUARE,null);
+          }
+        case 44: break;
+        case 2: 
+          { Long val=Long.valueOf(yytext()); return new Yytoken(Yytoken.TYPE_VALUE, val);
+          }
+        case 45: break;
+        case 18: 
+          { sb.append('\n');
+          }
+        case 46: break;
+        case 9: 
+          { return new Yytoken(Yytoken.TYPE_COMMA,null);
+          }
+        case 47: break;
+        case 3: 
+          { 
+          }
+        case 48: break;
+        default: 
+          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+            zzAtEOF = true;
+            return null;
+          } 
+          else {
+            zzScanError(ZZ_NO_MATCH);
+          }
+      }
+    }
+  }
+
+
+}
@@ -0,0 +1,58 @@
+/*
+ * $Id: Yytoken.java,v 1.1 2006/04/15 14:10:48 platform Exp $
+ * Created on 2006-4-15
+ */
+package org.json.simple.parser;
+
+/**
+ * @author FangYidong<fangyidong@yahoo.com.cn>
+ */
+public class Yytoken {
+	public static final int TYPE_VALUE=0;//JSON primitive value: string,number,boolean,null
+	public static final int TYPE_LEFT_BRACE=1;
+	public static final int TYPE_RIGHT_BRACE=2;
+	public static final int TYPE_LEFT_SQUARE=3;
+	public static final int TYPE_RIGHT_SQUARE=4;
+	public static final int TYPE_COMMA=5;
+	public static final int TYPE_COLON=6;
+	public static final int TYPE_EOF=-1;//end of file
+	
+	public int type=0;
+	public Object value=null;
+	
+	public Yytoken(int type,Object value){
+		this.type=type;
+		this.value=value;
+	}
+	
+	public String toString(){
+		StringBuffer sb = new StringBuffer();
+		switch(type){
+		case TYPE_VALUE:
+			sb.append("VALUE(").append(value).append(")");
+			break;
+		case TYPE_LEFT_BRACE:
+			sb.append("LEFT BRACE({)");
+			break;
+		case TYPE_RIGHT_BRACE:
+			sb.append("RIGHT BRACE(})");
+			break;
+		case TYPE_LEFT_SQUARE:
+			sb.append("LEFT SQUARE([)");
+			break;
+		case TYPE_RIGHT_SQUARE:
+			sb.append("RIGHT SQUARE(])");
+			break;
+		case TYPE_COMMA:
+			sb.append("COMMA(,)");
+			break;
+		case TYPE_COLON:
+			sb.append("COLON(:)");
+			break;
+		case TYPE_EOF:
+			sb.append("END OF FILE");
+			break;
+		}
+		return sb.toString();
+	}
+}
@@ -23,10 +23,13 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.TestPlayer;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.AreaFlags.State;
+import java.util.ArrayList;
+import java.util.List;

 public class ApplicableRegionSetTest {
    static String COURTYARD_ID = "courtyard";
@@ -68,8 +71,15 @@ public class ApplicableRegionSetTest {
        DefaultDomain domain = new DefaultDomain();
        domain.addGroup(COURTYARD_GROUP);
        
-        ProtectedRegion region = new ProtectedCuboidRegion(COURTYARD_ID,
-                new BlockVector(0, 0, 0), new BlockVector(10, 10, 10));
+        ArrayList<BlockVector2D> points = new ArrayList<BlockVector2D>();
+        points.add(new BlockVector2D(0, 0));
+        points.add(new BlockVector2D(10, 0));
+        points.add(new BlockVector2D(10, 10));
+        points.add(new BlockVector2D(0, 10));
+        
+        //ProtectedRegion region = new ProtectedCuboidRegion(COURTYARD_ID, new BlockVector(0, 0, 0), new BlockVector(10, 10, 10));
+        ProtectedRegion region = new ProtectedPolygonalRegion(COURTYARD_ID, points, 0, 10);
+        
        AreaFlags flags = new AreaFlags();
        flags.set(AreaFlags.FLAG_BUILD, State.NONE);
        flags.set(AreaFlags.FLAG_FIRE_SPREAD, State.ALLOW);
Author	SHA1	Message	Date
sk89q	bb836aea57	Updated for 4.0-alpha1.	2011-02-23 11:25:10 -08:00
sk89q	d584fba31c	Updated block damage event handling to work around issues.	2011-02-23 11:07:39 -08:00
Redecouverte	feacf3af7b	removed CraftBukkit dependency	2011-02-23 19:13:56 +01:00
Redecouverte	8c428bb399	added JSON.simple 1.1 lib	2011-02-23 19:13:55 +01:00
sk89q	8edb6976fb	Changed usage of CraftItemStack to ItemStack.	2011-02-23 10:05:29 -08:00
DarkLiKally	edd2f460a0	Updated reflowing of water on sponge removal/deactivation	2011-02-22 20:56:57 +01:00
DarkLiKally	8810647bb8	Added reflowing of water on sponge removal/deactivation and Updated water clearing on sponge creation/activation	2011-02-22 20:44:16 +01:00
DarkLiKally	2204bd67a7	Fixed the water damage block Bug	2011-02-22 17:27:58 +01:00
DarkLiKally	c9c747693d	Added ability to change default values of region's flags in config.yml for: FLAG_LIGHTER, FLAG_TNT, FLAG_CREEPER_EXPLOSION, FLAG_MOB_DAMAGE	2011-02-22 15:06:25 +01:00
Redecouverte	135d92303d	more fixed for cake protection, protected cake now is semi-proteced, only the first slice is not protected	2011-02-22 15:02:57 +01:00
Redecouverte	c707434155	fixed cake protection in regions	2011-02-22 14:26:01 +01:00
Valentin Churavy	4b72805a69	55: ProtectedPolygonalRegion should now handle edges better.	2011-02-22 13:58:05 +01:00
Redecouverte	d5a9b0c65f	really fixed setUpCourtyardRegion()..	2011-02-22 13:33:30 +01:00
Redecouverte	2015604fe2	fixed ProtectedPolygonalRegion construction in setUpCourtyardRegion	2011-02-22 13:33:01 +01:00
Redecouverte	96a290b153	added ItemAcquireBlacklistEvent for onPlayerPickupItem, not implemented in craftbukkit. yet	2011-02-22 13:22:06 +01:00
Redecouverte	912fcfe88a	added tests to netbeans project	2011-02-22 13:18:27 +01:00
Redecouverte	4dcf7489fa	added NetBeans project files	2011-02-22 13:03:06 +01:00
Redecouverte	7f1552dff8	updated onPlayerDropItem for latest bukkit, updated WorldEdit API calls for latest WorldEdit	2011-02-22 12:04:44 +01:00
Redecouverte	d2ca8bffc4	we are now ignoring canceled events	2011-02-22 02:49:20 +01:00
Redecouverte	e15b01bac5	added blacklist on-drop event	2011-02-22 02:48:57 +01:00
Redecouverte	dcd3cb80b8	switched to parameterless constructor (i guess this is that the bukkit devs intended with their fancy warning)	2011-02-22 02:15:06 +01:00
Redecouverte	d0ddc7c271	- added .gitignore to ignore eclipse/etc build files - events are now registered in onEnable()	2011-02-22 02:03:20 +01:00
DarkLiKally	2b55f3407c	Fixed the skeleton damage bug in protected areas	2011-02-22 01:01:31 +01:00
DarkLiKally	e84afb4808	Fixed the Skeleton damage bug in protected regions	2011-02-22 01:01:31 +01:00
Redecouverte	10c47eff7e	fixed entity damage events for latest bukkit	2011-02-21 23:30:20 +01:00
sk89q	aee81f918e	Added polygonal regions. They don't save/load yet, nor can you make them in-game yet. They were tested to work a week ago though.	2011-02-20 12:10:42 -08:00
sk89q	95b2d9419f	Fixed redstone listener for newer versions of Bukkit.	2011-02-12 19:14:14 -08:00
sk89q	feb9ce6633	Re-added priority tree region manager implementation. Add and removal operations are not yet optimized.	2011-02-12 16:09:21 -08:00
sk89q	43489ca087	Changed how ApplicableRegionSet iterated over the region set, allowing it to be reused.	2011-02-12 15:49:55 -08:00
sk89q	ce1a15e6ea	Improved tick sync message suppression.	2011-02-05 14:00:06 -08:00
sk89q	cc72d370ea	Added suppress-tick-sync-warnings option.	2011-02-05 13:45:05 -08:00
sk89q	d042185660	Added WorldGuardPlugin.canBuild(player, x, y, z)	2011-02-04 20:51:14 -08:00
sk89q	e78b639018	Updated CHANGELOG.txt.	2011-02-02 23:37:40 -08:00
sk89q	e8ea562b09	Changed 'release' target to also 'clean'.	2011-02-02 23:28:48 -08:00
sk89q	3b5a729ef3	Updated command handling for Bukkit.	2011-02-02 22:27:44 -08:00
sk89q	ef7d487ec5	Updated burn event handling.	2011-02-02 22:21:44 -08:00
sk89q	b379b8f022	Fixed suffocation disable option.	2011-02-02 21:03:33 -08:00
sk89q	a31378c2c8	Changed disable-water-damage to disable-drowning-damage.	2011-02-02 20:51:52 -08:00
sk89q	0d2c2121bb	3.2.1 CHANGELOG.txt.	2011-01-31 14:36:33 -08:00
sk89q	21040b306a	Updated for ItemStack change in Bukkit.	2011-01-31 14:35:46 -08:00