Fix mail

Merge branch '2.9' of github.com:essentials/Essentials into release
Reduce calls to bukkit getPlayer();
2026-11-05 01:00:13 -05:00 · 2012-10-28 20:09:25 +00:00 · 2012-10-26 21:41:49 +01:00 · 2012-10-26 21:34:36 +01:00 · 2012-10-26 09:48:45 +01:00 · 2012-10-23 00:00:55 +01:00
394 changed files with 24141 additions and 16605 deletions
@@ -3,6 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/bukkit-0.0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/craftbukkit-0.0.1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/Permissions3.jar"/>
 </classpath>
@@ -1,42 +1,47 @@
-.DS_Store
-/BuildAll/nbproject/private/
-/EssentialsProtect/nbproject/private/
-/EssentialsChat/nbproject/private/
-/EssentialsGroupBridge/nbproject/private/
-/EssentialsGeoIP/nbproject/private/
-/EssentialsSpawn/nbproject/private/
-/EssentialsXMPP/nbproject/private/
-/EssentialsGroupManager/nbproject/private/
-/BuildAll/build/
-/EssentialsGroupBridge/dist/
-/EssentialsGroupBridge/build/
-/EssentialsGeoIP/dist/
-/EssentialsGeoIP/build/
-/EssentialsGroupManager/build/
-/EssentialsGroupManager/dist/
-/BuildAll/dist/
-/EssentialsChat/build/
-/EssentialsChat/dist/
-/EssentialsSpawn/build/
-/EssentialsSpawn/dist/
-/EssentialsXMPP/dist/
-/EssentialsXMPP/build/
-/EssentialsProtect/dist/
-/EssentialsProtect/build/
-/EssentialsPermissionsCommands/nbproject/private/
-/EssentialsPermissionsCommands/build/
-/EssentialsPermissionsCommands/dist/
-/Essentials/nbproject/private/
-/Essentials/dist/
-/Essentials/build/
-/YamlAnnotations/
-/EssentialsUpdate/nbproject/private/
-/EssentialsRelease/
-/EssentialsUpdate/dist/
-/EssentialsUpdate/build/
-/WebPush/apikey.php
-/WebPush/nbproject/private
-/.idea
+.DS_Store
+/BuildAll/nbproject/private/
+/EssentialsProtect/nbproject/private/
+/EssentialsChat/nbproject/private/
+/EssentialsGroupBridge/nbproject/private/
+/EssentialsGeoIP/nbproject/private/
+/EssentialsSpawn/nbproject/private/
+/EssentialsXMPP/nbproject/private/
+/EssentialsGroupManager/nbproject/private/
+/BuildAll/build/
+/EssentialsGroupBridge/dist/
+/EssentialsGroupBridge/build/
+/EssentialsGeoIP/dist/
+/EssentialsGeoIP/build/
+/EssentialsGroupManager/build/
+/EssentialsGroupManager/dist/
+/BuildAll/dist/
+/EssentialsChat/build/
+/EssentialsChat/dist/
+/EssentialsSpawn/build/
+/EssentialsSpawn/dist/
+/EssentialsXMPP/dist/
+/EssentialsXMPP/build/
+/EssentialsProtect/dist/
+/EssentialsProtect/build/
+/EssentialsPermissionsCommands/nbproject/private/
+/EssentialsPermissionsCommands/build/
+/EssentialsPermissionsCommands/dist/
+/Essentials/nbproject/private/
+/Essentials/dist/
+/Essentials/build/
+/YamlAnnotations/
+/EssentialsUpdate/nbproject/private/
+/EssentialsRelease/
+/EssentialsUpdate/dist/
+/EssentialsUpdate/build/
+/WebPush/apikey.php
+/WebPush/nbproject/private
+/.idea
 *.iml
 /EssentialsGroupManager/bin
-/EssentialsGroupManager/.externalToolBuilders
+/EssentialsGroupManager/.externalToolBuilders
+/EssentialsAntiBuild/nbproject/private/
+/EssentialsAntiBuild/dist/
+/EssentialsAntiBuild/build/
+/jars
+/out
@@ -638,6 +638,13 @@ is divided into following sections:
            <param name="call.target" value="jar"/>
            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
        </antcall>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.EssentialsAntiBuild}" name="call.subproject"/>
+            <param location="${project.EssentialsAntiBuild}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+        </antcall>
        <antcall target="-maybe-call-dep">
            <param name="call.built.properties" value="${built-jar.properties}"/>
            <param location="${project.EssentialsProtect}" name="call.subproject"/>
@@ -1140,6 +1147,13 @@ is divided into following sections:
            <param name="call.target" value="clean"/>
            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
        </antcall>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.EssentialsAntiBuild}" name="call.subproject"/>
+            <param location="${project.EssentialsAntiBuild}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+        </antcall>
        <antcall target="-maybe-call-dep">
            <param name="call.built.properties" value="${built-clean.properties}"/>
            <param location="${project.EssentialsProtect}" name="call.subproject"/>
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=51b33957
+build.xml.data.CRC32=b4df970c
 build.xml.script.CRC32=7a797370
-build.xml.stylesheet.CRC32=28e38971@1.44.1.45
+build.xml.stylesheet.CRC32=28e38971@1.50.3.46
 # 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=51b33957
-nbproject/build-impl.xml.script.CRC32=c5170bed
-nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46
+nbproject/build-impl.xml.data.CRC32=b4df970c
+nbproject/build-impl.xml.script.CRC32=1fd6d3cc
+nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.3.46
@@ -66,6 +66,7 @@ jar.compress=true
 javac.classpath=\
    ${reference.Essentials.jar}:\
    ${reference.EssentialsChat.jar}:\
+    ${reference.EssentialsAntiBuild.jar}:\
    ${reference.EssentialsProtect.jar}:\
    ${reference.EssentialsSpawn.jar}:\
    ${reference.EssentialsGeoIP.jar}:\
@@ -103,6 +104,7 @@ project.EssentialsChat=../EssentialsChat
 project.EssentialsGeoIP=../EssentialsGeoIP
 project.EssentialsGroupBridge=../EssentialsGroupBridge
 project.EssentialsGroupManager=../EssentialsGroupManager
+project.EssentialsAntiBuild=../EssentialsAntiBuild
 project.EssentialsProtect=../EssentialsProtect
 project.EssentialsSpawn=../EssentialsSpawn
 project.EssentialsXMPP=../EssentialsXMPP
@@ -111,6 +113,7 @@ reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar
 reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar
 reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
 reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
+reference.EssentialsAntiBuild.jar=${project.EssentialsAntiBuild}/dist/EssentialsAntiBuild.jar
 reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
 reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
 reference.EssentialsXMPP.jar=${project.EssentialsXMPP}/dist/EssentialsXMPP.jar
@@ -55,6 +55,14 @@
                <clean-target>clean</clean-target>
                <id>jar</id>
            </reference>
+            <reference>
+                <foreign-project>EssentialsAntiBuild</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
            <reference>
                <foreign-project>EssentialsProtect</foreign-project>
                <artifact-type>jar</artifact-type>
@@ -12,9 +12,9 @@ is divided into following sections:
  - execution
  - debugging
  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
+  - test compilation
+  - test execution
+  - test debugging
  - applet
  - cleanup

@@ -181,6 +181,7 @@ is divided into following sections:
            </and>
        </condition>
        <property name="run.jvmargs" value=""/>
+        <property name="run.jvmargs.ide" value=""/>
        <property name="javac.compilerargs" value=""/>
        <property name="work.dir" value="${basedir}"/>
        <condition property="no.deps">
@@ -225,6 +226,27 @@ is divided into following sections:
        <property name="jar.index.metainf" value="${jar.index}"/>
        <property name="copylibs.rebase" value="true"/>
        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
+        <condition property="junit.available">
+            <or>
+                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
+                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
+            </or>
+        </condition>
+        <condition property="testng.available">
+            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
+        </condition>
+        <condition property="junit+testng.available">
+            <and>
+                <istrue value="${junit.available}"/>
+                <istrue value="${testng.available}"/>
+            </and>
+        </condition>
+        <condition else="testng" property="testng.mode" value="mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
+        <condition else="" property="testng.debug.mode" value="-mixed">
+            <istrue value="${junit+testng.available}"/>
+        </condition>
    </target>
    <target name="-post-init">
        <!-- Empty placeholder for easier customization. -->
@@ -357,11 +379,52 @@ is divided into following sections:
            </sequential>
        </macrodef>
    </target>
-    <target name="-init-macrodef-junit">
+    <target if="${junit.available}" name="-init-macrodef-junit-init">
+        <condition else="false" property="nb.junit.batch" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <not>
+                    <isset property="test.method"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="false" property="nb.junit.single" value="true">
+            <and>
+                <istrue value="${junit.available}"/>
+                <isset property="test.method"/>
+            </and>
+        </condition>
+    </target>
+    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
        <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"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+        <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"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
            <sequential>
                <property name="junit.forkmode" value="perTest"/>
                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
@@ -370,32 +433,270 @@ is divided into following sections:
                            <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 value="-ea"/>
-                    <jvmarg line="${run.jvmargs}"/>
+                    <customize/>
                </junit>
            </sequential>
        </macrodef>
    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
-    <target name="-profile-pre-init">
+    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
+    <target if="${testng.available}" name="-init-macrodef-testng">
+        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
+                    <isset property="test.method"/>
+                </condition>
+                <union id="test.set">
+                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
+                </union>
+                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
+                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Essentials" testname="TestNG tests" workingDir="${work.dir}">
+                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
+                    <propertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </propertyset>
+                    <customize/>
+                </testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-test-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <echo>No tests executed.</echo>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
+        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:testng>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
+        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <sequential>
+                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${run.jvmargs}"/>
+                        <jvmarg line="${run.jvmargs.ide}"/>
+                    </customize>
+                </j2seproject3:test-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg value="-ea"/>
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <customize/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element implicit="true" name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize/>
+                </j2seproject3:junit-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target if="${testng.available}" name="-init-macrodef-testng-debug">
+        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element name="customize2" optional="true"/>
+            <sequential>
+                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
+                    <isset property="test.method"/>
+                </condition>
+                <condition else="-suitename Essentials -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                    <matches pattern=".*\.xml" string="@{testClass}"/>
+                </condition>
+                <delete dir="${build.test.results.dir}" quiet="true"/>
+                <mkdir dir="${build.test.results.dir}"/>
+                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
+                    <customize>
+                        <customize2/>
+                        <jvmarg value="-ea"/>
+                        <arg line="${testng.debug.mode}"/>
+                        <arg line="-d ${build.test.results.dir}"/>
+                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
+                        <arg line="${testng.cmd.args}"/>
+                    </customize>
+                </j2seproject3:debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
+        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <element implicit="true" name="customize2" optional="true"/>
+            <sequential>
+                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2/>
+                </j2seproject3:testng-debug>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <classpath>
+                            <path path="${run.test.classpath}"/>
+                        </classpath>
+                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                        <jvmarg line="${run.jvmargs}"/>
+                        <jvmarg line="${run.jvmargs.ide}"/>
+                    </customize>
+                </j2seproject3:test-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
+        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <attribute default="${main.class}" name="testClass"/>
+            <attribute default="" name="testMethod"/>
+            <sequential>
+                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
+                    <customize2>
+                        <syspropertyset>
+                            <propertyref prefix="test-sys-prop."/>
+                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                        </syspropertyset>
+                    </customize2>
+                </j2seproject3:testng-debug-impl>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
+    <!--
+                pre NB7.2 profiling section; consider it deprecated
+            -->
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
+    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
        <!-- Empty placeholder for easier customization. -->
        <!-- You can override this target in the ../build.xml file. -->
    </target>
-    <target name="-profile-post-init">
+    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
        <!-- Empty placeholder for easier customization. -->
        <!-- You can override this target in the ../build.xml file. -->
    </target>
-    <target name="-profile-init-macrodef-profile">
+    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
        <macrodef name="resolve">
            <attribute name="name"/>
            <attribute name="value"/>
@@ -427,10 +728,13 @@ is divided into following sections:
            </sequential>
        </macrodef>
    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
    </target>
+    <!--
+                end of pre NB7.2 profiling section
+            -->
    <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"/>
@@ -488,6 +792,7 @@ is divided into following sections:
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
                    <classpath>
                        <path path="@{classpath}"/>
                    </classpath>
@@ -504,6 +809,7 @@ is divided into following sections:
        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
            <attribute default="${main.class}" name="classname"/>
            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
            <element name="customize" optional="true"/>
            <sequential>
                <java classname="@{classname}" dir="${work.dir}" fork="true">
@@ -511,6 +817,7 @@ is divided into following sections:
                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
                    <classpath>
                        <path path="@{classpath}"/>
                    </classpath>
@@ -537,6 +844,9 @@ is divided into following sections:
                    <path path="${run.classpath.without.build.classes.dir}"/>
                    <chainedmapper>
                        <flattenmapper/>
+                        <filtermapper>
+                            <replacestring from=" " to="%20"/>
+                        </filtermapper>
                        <globmapper from="*" to="lib/*"/>
                    </chainedmapper>
                </pathconvert>
@@ -582,7 +892,7 @@ is divided into following sections:
    <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-libraries,-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"/>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
    <!--
                ===================
                COMPILATION SECTION
@@ -805,7 +1115,11 @@ is divided into following sections:
                PROFILING SECTION
                =================
            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
+    <!--
+                pre NB7.2 profiler integration
+            -->
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -813,8 +1127,9 @@ is divided into following sections:
        </nbprofiledirect>
        <profile/>
    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -822,12 +1137,8 @@ is divided into following sections:
        </nbprofiledirect>
        <profile classname="${profile.class}"/>
    </target>
-    <!--
-                =========================
-                APPLET PROFILING  SECTION
-                =========================
-            -->
-    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
+    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
        <nbprofiledirect>
            <classpath>
                <path path="${run.classpath}"/>
@@ -839,12 +1150,8 @@ is divided into following sections:
            </customize>
        </profile>
    </target>
-    <!--
-                =========================
-                TESTS PROFILING  SECTION
-                =========================
-            -->
-    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
+    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
        <nbprofiledirect>
            <classpath>
                <path path="${run.test.classpath}"/>
@@ -866,6 +1173,42 @@ is divided into following sections:
            <formatter type="xml"/>
        </junit>
    </target>
+    <!--
+                end of pre NB72 profiling section
+            -->
+    <target if="netbeans.home" name="-profile-check">
+        <condition property="profiler.configured">
+            <or>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
+                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
+            </or>
+        </condition>
+    </target>
+    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
+        <startprofiler/>
+        <antcall target="run"/>
+    </target>
+    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <startprofiler/>
+        <antcall target="run-single"/>
+    </target>
+    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
+    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <startprofiler/>
+        <antcall target="test-single"/>
+    </target>
+    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <startprofiler/>
+        <antcal target="run-test-with-main"/>
+    </target>
+    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <startprofiler/>
+        <antcall target="run-applet"/>
+    </target>
    <!--
                ===============
                JAVADOC SECTION
@@ -909,7 +1252,7 @@ is divided into following sections:
    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
    <!--
                =========================
-                JUNIT COMPILATION SECTION
+                TEST COMPILATION SECTION
                =========================
            -->
    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -952,14 +1295,14 @@ is divided into following sections:
    <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
+                TEST 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"/>
+        <j2seproject3:test 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>
@@ -972,39 +1315,40 @@ is divided into following sections:
    </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}"/>
+        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${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"/>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
+        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
+        <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-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
    <!--
                =======================
-                JUNIT DEBUGGING SECTION
+                TEST DEBUGGING SECTION
                =======================
            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+    <target depends="init,compile-test-single,-pre-test-run-single" 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>
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
    </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,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
    <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>
@@ -1076,9 +1420,12 @@ is divided into following sections:
    <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>
+            <and>
+                <not>
+                    <isset property="already.built.${call.subproject}"/>
+                </not>
+                <available file="${call.script}"/>
+            </and>
        </condition>
    </target>
    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
@@ -4,8 +4,8 @@ build.xml.stylesheet.CRC32=28e38971@1.38.2.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=a830bc14
-nbproject/build-impl.xml.script.CRC32=a9f8842a
-nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46
+nbproject/build-impl.xml.script.CRC32=7c507372
+nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
 nbproject/profiler-build-impl.xml.data.CRC32=ab78ce15
 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
 nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1
@@ -1,5 +1,5 @@
 annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
+annotation.processing.enabled.in.editor=true
 annotation.processing.processors.list=lombok.core.AnnotationProcessor
 annotation.processing.run.all.processors=false
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
@@ -61,6 +61,12 @@ public class Backup implements Runnable
 		{
 			return;
 		}
+		if ("save-all".equalsIgnoreCase(command)) {
+			final CommandSender cs = server.getConsoleSender();
+			server.dispatchCommand(cs, "save-all");
+			active = false;
+			return;
+		}
 		LOGGER.log(Level.INFO, _("backupStarted"));
 		final CommandSender cs = server.getConsoleSender();
 		server.dispatchCommand(cs, "save-all");
@@ -6,12 +6,11 @@ import java.util.*;


 /**
- * This utility class is used for converting between the ingame
- * time in ticks to ingame time as a friendly string.
- * Note that the time is INGAME.
- * 
+ * This utility class is used for converting between the ingame time in ticks to ingame time as a friendly string. Note
+ * that the time is INGAME.
+ *
 * http://www.minecraftwiki.net/wiki/Day/night_cycle
- * 
+ *
 * @author Olof Larsson
 */
 public final class DescParseTickFormat
@@ -156,30 +155,31 @@ public final class DescParseTickFormat
 		int hours = 0;
 		int minutes = 0;

-		desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", "");
+		desc = desc.toLowerCase(Locale.ENGLISH);
+		String parsetime = desc.replaceAll("[^0-9]", "");

-		if (desc.length() > 4)
+		if (parsetime.length() > 4)
 		{
 			throw new NumberFormatException();
 		}

-		if (desc.length() == 4)
+		if (parsetime.length() == 4)
 		{
-			hours += Integer.parseInt(desc.substring(0, 2));
-			minutes += Integer.parseInt(desc.substring(2, 4));
+			hours += Integer.parseInt(parsetime.substring(0, 2));
+			minutes += Integer.parseInt(parsetime.substring(2, 4));
 		}
-		else if (desc.length() == 3)
+		else if (parsetime.length() == 3)
 		{
-			hours += Integer.parseInt(desc.substring(0, 1));
-			minutes += Integer.parseInt(desc.substring(1, 3));
+			hours += Integer.parseInt(parsetime.substring(0, 1));
+			minutes += Integer.parseInt(parsetime.substring(1, 3));
 		}
-		else if (desc.length() == 2)
+		else if (parsetime.length() == 2)
 		{
-			hours += Integer.parseInt(desc.substring(0, 2));
+			hours += Integer.parseInt(parsetime.substring(0, 2));
 		}
-		else if (desc.length() == 1)
+		else if (parsetime.length() == 1)
 		{
-			hours += Integer.parseInt(desc.substring(0, 1));
+			hours += Integer.parseInt(parsetime.substring(0, 1));
 		}
 		else
 		{
@@ -269,11 +269,11 @@ public final class DescParseTickFormat

 		// How many ingame days have passed since the server start?
 		final long days = ticks / ticksPerDay;
-		ticks = ticks - days * ticksPerDay;
+		ticks -= days * ticksPerDay;

 		// How many hours on the last day?
 		final long hours = ticks / ticksPerHour;
-		ticks = ticks - hours * ticksPerHour;
+		ticks -= hours * ticksPerHour;

 		// How many minutes on the last day?
 		final long minutes = (long)Math.floor(ticks / ticksPerMinute);
@@ -13,53 +13,123 @@ public class Enchantments
 {
 	private static final transient Pattern NUMPATTERN = Pattern.compile("\\d+");
 	private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<String, Enchantment>();
+	private static final Map<String, Enchantment> ALIASENCHANTMENTS = new HashMap<String, Enchantment>();

 	static
 	{
 		ENCHANTMENTS.put("alldamage", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
+		ALIASENCHANTMENTS.put("alldmg", Enchantment.DAMAGE_ALL);
 		ENCHANTMENTS.put("sharpness", Enchantment.DAMAGE_ALL);
-		ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS);
+		ENCHANTMENTS.put("sharp", Enchantment.DAMAGE_ALL);
+		ALIASENCHANTMENTS.put("dal", Enchantment.DAMAGE_ALL);
+				
 		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
 		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
+		ALIASENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
+		ALIASENCHANTMENTS.put("arthropod", Enchantment.DAMAGE_ARTHROPODS);
+		ALIASENCHANTMENTS.put("dar", Enchantment.DAMAGE_ARTHROPODS);
+		
 		ENCHANTMENTS.put("undeaddamage", Enchantment.DAMAGE_UNDEAD);
 		ENCHANTMENTS.put("smite", Enchantment.DAMAGE_UNDEAD);
+		ALIASENCHANTMENTS.put("du", Enchantment.DAMAGE_UNDEAD);
+		
 		ENCHANTMENTS.put("digspeed", Enchantment.DIG_SPEED);
 		ENCHANTMENTS.put("efficiency", Enchantment.DIG_SPEED);
+		ALIASENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED);
+		ALIASENCHANTMENTS.put("cutspeed", Enchantment.DIG_SPEED);
+		ALIASENCHANTMENTS.put("ds", Enchantment.DIG_SPEED);
+		
 		ENCHANTMENTS.put("durability", Enchantment.DURABILITY);
 		ENCHANTMENTS.put("dura", Enchantment.DURABILITY);
 		ENCHANTMENTS.put("unbreaking", Enchantment.DURABILITY);
+		ALIASENCHANTMENTS.put("d", Enchantment.DURABILITY);
+		
 		ENCHANTMENTS.put("fireaspect", Enchantment.FIRE_ASPECT);
 		ENCHANTMENTS.put("fire", Enchantment.FIRE_ASPECT);
+		ALIASENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT);
+		ALIASENCHANTMENTS.put("meleeflame", Enchantment.FIRE_ASPECT);
+		ALIASENCHANTMENTS.put("fa", Enchantment.FIRE_ASPECT);
+		
 		ENCHANTMENTS.put("knockback", Enchantment.KNOCKBACK);
-		ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
+		ALIASENCHANTMENTS.put("k", Enchantment.KNOCKBACK);
+		
+		ALIASENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
 		ENCHANTMENTS.put("fortune", Enchantment.LOOT_BONUS_BLOCKS);
-		ENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
+		ALIASENCHANTMENTS.put("lbb", Enchantment.LOOT_BONUS_BLOCKS);
+		
+		ALIASENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
 		ENCHANTMENTS.put("mobloot", Enchantment.LOOT_BONUS_MOBS);
 		ENCHANTMENTS.put("looting", Enchantment.LOOT_BONUS_MOBS);
-		ENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
+		ALIASENCHANTMENTS.put("lbm", Enchantment.LOOT_BONUS_MOBS);
+		
+		ALIASENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
 		ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
+		ALIASENCHANTMENTS.put("breathing", Enchantment.OXYGEN);
+		ENCHANTMENTS.put("breath", Enchantment.OXYGEN);
+		ALIASENCHANTMENTS.put("o", Enchantment.OXYGEN);
+		
 		ENCHANTMENTS.put("protection", Enchantment.PROTECTION_ENVIRONMENTAL);
-		ENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
-		ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
+		ALIASENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ALIASENCHANTMENTS.put("p", Enchantment.PROTECTION_ENVIRONMENTAL);
+		
+		ALIASENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("explosionprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		ENCHANTMENTS.put("blastprotect", Enchantment.PROTECTION_EXPLOSIONS);
+		ALIASENCHANTMENTS.put("pe", Enchantment.PROTECTION_EXPLOSIONS);
+		
+		ALIASENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
 		ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
+		ENCHANTMENTS.put("featherfall", Enchantment.PROTECTION_FALL);
 		ENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL);
-		ENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("pfa", Enchantment.PROTECTION_FALL);
+		
+		ALIASENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
+		ENCHANTMENTS.put("fireprotect", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);
 		ENCHANTMENTS.put("fireprot", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("flameprot", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("pf", Enchantment.PROTECTION_FIRE);
+		
 		ENCHANTMENTS.put("projectileprotection", Enchantment.PROTECTION_PROJECTILE);
 		ENCHANTMENTS.put("projprot", Enchantment.PROTECTION_PROJECTILE);
+		ALIASENCHANTMENTS.put("pp", Enchantment.PROTECTION_PROJECTILE);
+		
 		ENCHANTMENTS.put("silktouch", Enchantment.SILK_TOUCH);
+		ALIASENCHANTMENTS.put("softtouch", Enchantment.SILK_TOUCH);
+		ALIASENCHANTMENTS.put("st", Enchantment.SILK_TOUCH);
+		
 		ENCHANTMENTS.put("waterworker", Enchantment.WATER_WORKER);
 		ENCHANTMENTS.put("aquaaffinity", Enchantment.WATER_WORKER);
-		ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
+		ALIASENCHANTMENTS.put("watermine", Enchantment.WATER_WORKER);
+		ALIASENCHANTMENTS.put("ww", Enchantment.WATER_WORKER);
+		
+		ALIASENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
+		ENCHANTMENTS.put("flame", Enchantment.ARROW_FIRE);
+		ENCHANTMENTS.put("flamearrow", Enchantment.ARROW_FIRE);
+		ALIASENCHANTMENTS.put("af", Enchantment.ARROW_FIRE);
+		
 		ENCHANTMENTS.put("arrowdamage", Enchantment.ARROW_DAMAGE);
+		ENCHANTMENTS.put("power", Enchantment.ARROW_DAMAGE);
+		ALIASENCHANTMENTS.put("arrowpower", Enchantment.ARROW_DAMAGE);
+		ALIASENCHANTMENTS.put("ad", Enchantment.ARROW_DAMAGE);
+		
 		ENCHANTMENTS.put("arrowknockback", Enchantment.ARROW_KNOCKBACK);
-		ENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
-		ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
+		ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
+		ALIASENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK);
+		ALIASENCHANTMENTS.put("ak", Enchantment.ARROW_KNOCKBACK);
+		
+		ALIASENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
 		ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
+		ENCHANTMENTS.put("infinity", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("infinite", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("ai", Enchantment.ARROW_INFINITE);
 	}
 	
 	public static Enchantment getByName(String name) {
@@ -73,6 +143,10 @@ public class Enchantments
 		{
 			enchantment = ENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
 		}
+		if (enchantment == null)
+		{
+			enchantment = ALIASENCHANTMENTS.get(name.toLowerCase(Locale.ENGLISH));
+		}
 		return enchantment;
 	}

@@ -20,10 +20,12 @@ package com.earth2me.essentials;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.api.Economy;
 import com.earth2me.essentials.api.IJails;
-import com.earth2me.essentials.commands.EssentialsCommand;
 import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.commands.NoChargeException;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import com.earth2me.essentials.metrics.Metrics;
+import com.earth2me.essentials.metrics.MetricsListener;
+import com.earth2me.essentials.metrics.MetricsStarter;
 import com.earth2me.essentials.perm.PermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
 import com.earth2me.essentials.signs.SignBlockListener;
@@ -32,20 +34,17 @@ import com.earth2me.essentials.signs.SignPlayerListener;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.Command;
-import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
@@ -66,7 +65,7 @@ import org.yaml.snakeyaml.error.YAMLException;

 public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 1952;
+	public static final int BUKKIT_VERSION = 2396;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
 	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
@@ -82,6 +81,9 @@ public class Essentials extends JavaPlugin implements IEssentials
 	private transient UserMap userMap;
 	private transient ExecuteTimer execTimer;
 	private transient I18n i18n;
+	private transient Metrics metrics;
+	private transient EssentialsTimer timer;
+	private transient List<String> vanishedPlayers = new ArrayList<String>();

 	@Override
 	public ISettings getSettings()
@@ -124,19 +126,22 @@ public class Essentials extends JavaPlugin implements IEssentials
 		for (Plugin plugin : pm.getPlugins())
 		{
 			if (plugin.getDescription().getName().startsWith("Essentials")
-				&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion()))
+				&& !plugin.getDescription().getVersion().equals(this.getDescription().getVersion())
+				&& !plugin.getDescription().getName().equals("EssentialsAntiCheat"))
 			{
 				LOGGER.log(Level.WARNING, _("versionMismatch", plugin.getDescription().getName()));
 			}
 		}
-		final Matcher versionMatch = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-R[0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
+		final Matcher versionMatch = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*").matcher(getServer().getVersion());
 		if (versionMatch.matches())
 		{
-			final int versionNumber = Integer.parseInt(versionMatch.group(4));
-			if (versionNumber < BUKKIT_VERSION)
+			final int versionNumber = Integer.parseInt(versionMatch.group(1));
+			if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
 			{
+				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
 				LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
 				LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
+				LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
 				this.setEnabled(false);
 				return;
 			}
@@ -223,7 +228,7 @@ public class Essentials extends JavaPlugin implements IEssentials

 		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
 		pm.registerEvents(entityListener, this);
-		
+
 		final EssentialsWorldListener worldListener = new EssentialsWorldListener(this);
 		pm.registerEvents(worldListener, this);

@@ -233,10 +238,23 @@ public class Essentials extends JavaPlugin implements IEssentials

 		pm.registerEvents(tntListener, this);

-		final EssentialsTimer timer = new EssentialsTimer(this);
-		getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
+		timer = new EssentialsTimer(this);
+		getScheduler().scheduleSyncRepeatingTask(this, timer, 100, 100);
+
 		Economy.setEss(this);
 		execTimer.mark("RegListeners");
+
+		final MetricsStarter metricsStarter = new MetricsStarter(this);
+		if (metricsStarter.getStart() != null && metricsStarter.getStart() == true)
+		{
+			getScheduler().scheduleAsyncDelayedTask(this, metricsStarter, 1);
+		}
+		else if (metricsStarter.getStart() != null && metricsStarter.getStart() == false)
+		{
+			final MetricsListener metricsListener = new MetricsListener(this, metricsStarter);
+			pm.registerEvents(metricsListener, this);
+		}
+
 		final String timeroutput = execTimer.end();
 		if (getSettings().isDebug())
 		{
@@ -247,6 +265,15 @@ public class Essentials extends JavaPlugin implements IEssentials
 	@Override
 	public void onDisable()
 	{
+		for (Player p : getServer().getOnlinePlayers())
+		{
+			User user = getUser(p);
+			if (user.isVanished())
+			{
+				user.toggleVanished();
+				p.sendMessage(_("unvanishedReload"));
+			}
+		}
 		i18n.onDisable();
 		Economy.setEss(null);
 		Trade.closeLog();
@@ -288,20 +315,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 				}
 				catch (final Exception ex)
 				{
-					final ArrayList<StackTraceElement> elements = new ArrayList<StackTraceElement>(Arrays.asList(ex.getStackTrace()));
-					elements.remove(0);
-					final ArrayList<StackTraceElement> toRemove = new ArrayList<StackTraceElement>();
-					for (final StackTraceElement e : elements)
-					{
-						if (e.getClassName().equals("com.earth2me.essentials.Essentials"))
-						{
-							toRemove.add(e);
-						}
-					}
-					elements.removeAll(toRemove);
-					final StackTraceElement[] trace = elements.toArray(new StackTraceElement[elements.size()]);
-					ex.setStackTrace(trace);
-					ex.printStackTrace();
+					Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
 					sender.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
 					return true;
 				}
@@ -314,7 +328,6 @@ public class Essentials extends JavaPlugin implements IEssentials
 			if (sender instanceof Player)
 			{
 				user = getUser(sender);
-				LOGGER.log(Level.INFO, String.format("[PLAYER_COMMAND] %s: /%s %s ", ((Player)sender).getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)));
 			}

 			// New mail notification
@@ -435,6 +448,16 @@ public class Essentials extends JavaPlugin implements IEssentials
 		return backup;
 	}

+	public Metrics getMetrics()
+	{
+		return metrics;
+	}
+
+	public void setMetrics(Metrics metrics)
+	{
+		this.metrics = metrics;
+	}
+
 	@Override
 	public User getUser(final Object base)
 	{
@@ -444,15 +467,21 @@ public class Essentials extends JavaPlugin implements IEssentials
 		}
 		if (base instanceof String)
 		{
-			final User user = userMap.getUser((String)base);
-			if (user != null && user.getBase() instanceof OfflinePlayer)
-			{
-				((OfflinePlayer)user.getBase()).setName((String)base);
-			}
-			return user;
+			return getOfflineUser((String)base);
 		}
 		return null;
 	}
+	
+	@Override
+	public User getOfflineUser(final String name)
+	{
+		final User user = userMap.getUser(name);
+		if (user != null && user.getBase() instanceof OfflinePlayer)
+		{
+			((OfflinePlayer)user.getBase()).setName(name);
+		}
+		return user;
+	}

 	private <T extends Player> User getUser(final T base)
 	{
@@ -465,6 +494,13 @@ public class Essentials extends JavaPlugin implements IEssentials
 		{
 			return (User)base;
 		}
+
+		if (userMap == null)
+		{
+			LOGGER.log(Level.WARNING, "Essentials userMap not initialized");
+			return null;
+		}
+
 		User user = userMap.getUser(base.getName());

 		if (user == null)
@@ -478,17 +514,6 @@ public class Essentials extends JavaPlugin implements IEssentials
 		return user;
 	}

-	@Override
-	public User getOfflineUser(final String name)
-	{
-		final User user = userMap.getUser(name);
-		if (user != null && user.getBase() instanceof OfflinePlayer)
-		{
-			((OfflinePlayer)user.getBase()).setName(name);
-		}
-		return user;
-	}
-
 	@Override
 	public World getWorld(final String name)
 	{
@@ -531,7 +556,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		for (Player player : players)
 		{
 			final User user = getUser(player);
-			if (!user.isIgnoredPlayer(sender.getName()))
+			if (!user.isIgnoredPlayer(sender))
 			{
 				player.sendMessage(message);
 			}
@@ -599,15 +624,28 @@ public class Essentials extends JavaPlugin implements IEssentials
 	{
 		return i18n;
 	}
-	
-	private static class EssentialsWorldListener implements Listener, Runnable {
+
+	@Override
+	public EssentialsTimer getTimer()
+	{
+		return timer;
+	}
+
+	@Override
+	public List<String> getVanishedPlayers()
+	{
+		return vanishedPlayers;
+	}
+
+
+	private static class EssentialsWorldListener implements Listener, Runnable
+	{
 		private transient final IEssentials ess;

 		public EssentialsWorldListener(final IEssentials ess)
 		{
 			this.ess = ess;
 		}
-		

 		@EventHandler(priority = EventPriority.LOW)
 		public void onWorldLoad(final WorldLoadEvent event)
@@ -616,7 +654,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 			ess.getWarps().reloadConfig();
 			for (IConf iConf : ((Essentials)ess).confList)
 			{
-				if (iConf instanceof IEssentialsModule) {
+				if (iConf instanceof IEssentialsModule)
+				{
 					iConf.reloadConfig();
 				}
 			}
@@ -629,7 +668,8 @@ public class Essentials extends JavaPlugin implements IEssentials
 			ess.getWarps().reloadConfig();
 			for (IConf iConf : ((Essentials)ess).confList)
 			{
-				if (iConf instanceof IEssentialsModule) {
+				if (iConf instanceof IEssentialsModule)
+				{
 					iConf.reloadConfig();
 				}
 			}
@@ -17,22 +17,18 @@ public class EssentialsBlockListener implements Listener
 		this.ess = ess;
 	}

-	@EventHandler(priority = EventPriority.LOWEST)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onBlockPlace(final BlockPlaceEvent event)
 	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		final User user = ess.getUser(event.getPlayer());
 		// Do not rely on getItemInHand();
-		// http://leaky.bukkit.org/issues/663
+		// http://leaky.bukkit.org/issues/663		
 		final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
 		if (is == null)
 		{
 			return;
 		}
-		boolean unlimitedForUser = user.hasUnlimited(is);
+		final User user = ess.getUser(event.getPlayer());
+		final boolean unlimitedForUser = user.hasUnlimited(is);
 		if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
 		{
 			ess.scheduleSyncDelayedTask(
@@ -1,21 +1,24 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import com.google.common.io.Files;
 import java.io.*;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Server;
-import org.bukkit.World;
+import org.bukkit.*;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;


 public class EssentialsConf extends YamlConfiguration
@@ -24,14 +27,16 @@ public class EssentialsConf extends YamlConfiguration
 	private transient File configFile;
 	private transient String templateName = null;
 	private transient Class<?> resourceClass = EssentialsConf.class;
+	private static final Charset UTF8 = Charset.forName("UTF-8");

 	public EssentialsConf(final File configFile)
 	{
 		super();
 		this.configFile = configFile;
 	}
+	private final byte[] bytebuffer = new byte[1024];

-	public void load()
+	public synchronized void load()
 	{
 		configFile = configFile.getAbsoluteFile();
 		if (!configFile.getParentFile().exists())
@@ -86,33 +91,58 @@ public class EssentialsConf extends YamlConfiguration
 			}
 			else
 			{
-				try
-				{
-					LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
-					if (!configFile.createNewFile())
-					{
-						LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
-					}
-				}
-				catch (IOException ex)
-				{
-					LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
-				}
+				return;
 			}
 		}


 		try
 		{
-			super.load(configFile);
-		}
-		catch (FileNotFoundException ex)
-		{
-			LOGGER.log(Level.SEVERE, null, ex);
+			final FileInputStream inputStream = new FileInputStream(configFile);
+			try
+			{
+				final ByteBuffer buffer = ByteBuffer.allocate((int)configFile.length());
+				int length;
+				while ((length = inputStream.read(bytebuffer)) != -1)
+				{
+					buffer.put(bytebuffer, 0, length);
+				}
+				buffer.rewind();
+				final CharBuffer data = CharBuffer.allocate((int)configFile.length());
+				CharsetDecoder decoder = UTF8.newDecoder();
+				CoderResult result = decoder.decode(buffer, data, true);
+				if (result.isError())
+				{
+					buffer.rewind();
+					data.clear();
+					LOGGER.log(Level.INFO, "File " + configFile.getAbsolutePath().toString() + " is not utf-8 encoded, trying " + Charset.defaultCharset().displayName());
+					decoder = Charset.defaultCharset().newDecoder();
+					result = decoder.decode(buffer, data, true);
+					if (result.isError())
+					{
+						throw new InvalidConfigurationException("Invalid Characters in file " + configFile.getAbsolutePath().toString());
+					}
+					else
+					{
+						decoder.flush(data);
+					}
+				}
+				else
+				{
+					decoder.flush(data);
+				}
+				final int end = data.position();
+				data.rewind();
+				super.loadFromString(data.subSequence(0, end).toString());
+			}
+			finally
+			{
+				inputStream.close();
+			}
 		}
 		catch (IOException ex)
 		{
-			LOGGER.log(Level.SEVERE, null, ex);
+			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
 		}
 		catch (InvalidConfigurationException ex)
 		{
@@ -301,27 +331,339 @@ public class EssentialsConf extends YamlConfiguration
 			return def;
 		}
 	}
-	
-	public void save() {
+
+	public void save()
+	{
 		try
 		{
 			save(configFile);
 		}
 		catch (IOException ex)
 		{
-			LOGGER.log(Level.SEVERE, null, ex);
+			LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
 		}
 	}
-	
-	public Object getProperty(String path) {
+
+	public void saveWithError() throws IOException
+	{
+		save(configFile);
+	}
+
+	@Override
+	public synchronized void save(final File file) throws IOException
+	{
+		if (file == null)
+		{
+			throw new IllegalArgumentException("File cannot be null");
+		}
+
+		Files.createParentDirs(file);
+
+		final String data = saveToString();
+
+		if (data.length() == 0)
+		{
+			return;
+		}
+
+		if (!configFile.exists())
+		{
+			try
+			{
+				LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
+				if (!configFile.createNewFile())
+				{
+					LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
+				}
+			}
+			catch (IOException ex)
+			{
+				LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
+			}
+		}
+
+
+		final OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), UTF8);
+
+		try
+		{
+			writer.write(data);
+		}
+		finally
+		{
+			writer.close();
+		}
+	}
+
+	public Object getProperty(String path)
+	{
 		return get(path);
 	}
-	
-	public void setProperty(String path, Object object) {
+
+	public void setProperty(String path, Object object)
+	{
 		set(path, object);
 	}
-	
-	public void removeProperty(String path) {
+
+	public void removeProperty(String path)
+	{
 		set(path, null);
 	}
+
+	@Override
+	public synchronized Object get(String path)
+	{
+		return super.get(path);
+	}
+
+	@Override
+	public synchronized Object get(String path, Object def)
+	{
+		return super.get(path, def);
+	}
+
+	@Override
+	public synchronized boolean getBoolean(String path)
+	{
+		return super.getBoolean(path);
+	}
+
+	@Override
+	public synchronized boolean getBoolean(String path, boolean def)
+	{
+		return super.getBoolean(path, def);
+	}
+
+	@Override
+	public synchronized List<Boolean> getBooleanList(String path)
+	{
+		return super.getBooleanList(path);
+	}
+
+	@Override
+	public synchronized List<Byte> getByteList(String path)
+	{
+		return super.getByteList(path);
+	}
+
+	@Override
+	public synchronized List<Character> getCharacterList(String path)
+	{
+		return super.getCharacterList(path);
+	}
+
+	@Override
+	public synchronized ConfigurationSection getConfigurationSection(String path)
+	{
+		return super.getConfigurationSection(path);
+	}
+
+	@Override
+	public synchronized double getDouble(String path)
+	{
+		return super.getDouble(path);
+	}
+
+	@Override
+	public synchronized List<Double> getDoubleList(String path)
+	{
+		return super.getDoubleList(path);
+	}
+
+	@Override
+	public synchronized List<Float> getFloatList(String path)
+	{
+		return super.getFloatList(path);
+	}
+
+	@Override
+	public synchronized int getInt(String path)
+	{
+		return super.getInt(path);
+	}
+
+	@Override
+	public synchronized int getInt(String path, int def)
+	{
+		return super.getInt(path, def);
+	}
+
+	@Override
+	public synchronized List<Integer> getIntegerList(String path)
+	{
+		return super.getIntegerList(path);
+	}
+
+	@Override
+	public synchronized ItemStack getItemStack(String path, ItemStack def)
+	{
+		return super.getItemStack(path, def);
+	}
+
+	@Override
+	public synchronized Set<String> getKeys(boolean deep)
+	{
+		return super.getKeys(deep);
+	}
+
+	@Override
+	public synchronized List<?> getList(String path)
+	{
+		return super.getList(path);
+	}
+
+	@Override
+	public synchronized List<?> getList(String path, List<?> def)
+	{
+		return super.getList(path, def);
+	}
+
+	@Override
+	public synchronized long getLong(String path)
+	{
+		return super.getLong(path);
+	}
+
+	@Override
+	public synchronized List<Long> getLongList(String path)
+	{
+		return super.getLongList(path);
+	}
+
+	public synchronized Map<String, Object> getMap()
+	{
+		return map;
+	}
+
+	@Override
+	public synchronized List<Map<?, ?>> getMapList(String path)
+	{
+		return super.getMapList(path);
+	}
+
+	@Override
+	public synchronized OfflinePlayer getOfflinePlayer(String path)
+	{
+		return super.getOfflinePlayer(path);
+	}
+
+	@Override
+	public synchronized OfflinePlayer getOfflinePlayer(String path, OfflinePlayer def)
+	{
+		return super.getOfflinePlayer(path, def);
+	}
+
+	@Override
+	public synchronized List<Short> getShortList(String path)
+	{
+		return super.getShortList(path);
+	}
+
+	@Override
+	public synchronized String getString(String path)
+	{
+		return super.getString(path);
+	}
+
+	@Override
+	public synchronized String getString(String path, String def)
+	{
+		return super.getString(path, def);
+	}
+
+	@Override
+	public synchronized List<String> getStringList(String path)
+	{
+		return super.getStringList(path);
+	}
+
+	@Override
+	public synchronized Map<String, Object> getValues(boolean deep)
+	{
+		return super.getValues(deep);
+	}
+
+	@Override
+	public synchronized Vector getVector(String path)
+	{
+		return super.getVector(path);
+	}
+
+	@Override
+	public synchronized Vector getVector(String path, Vector def)
+	{
+		return super.getVector(path, def);
+	}
+
+	@Override
+	public synchronized boolean isBoolean(String path)
+	{
+		return super.isBoolean(path);
+	}
+
+	@Override
+	public synchronized boolean isConfigurationSection(String path)
+	{
+		return super.isConfigurationSection(path);
+	}
+
+	@Override
+	public synchronized boolean isDouble(String path)
+	{
+		return super.isDouble(path);
+	}
+
+	@Override
+	public synchronized boolean isInt(String path)
+	{
+		return super.isInt(path);
+	}
+
+	@Override
+	public synchronized boolean isItemStack(String path)
+	{
+		return super.isItemStack(path);
+	}
+
+	@Override
+	public synchronized boolean isList(String path)
+	{
+		return super.isList(path);
+	}
+
+	@Override
+	public synchronized boolean isLong(String path)
+	{
+		return super.isLong(path);
+	}
+
+	@Override
+	public synchronized boolean isOfflinePlayer(String path)
+	{
+		return super.isOfflinePlayer(path);
+	}
+
+	@Override
+	public synchronized boolean isSet(String path)
+	{
+		return super.isSet(path);
+	}
+
+	@Override
+	public synchronized boolean isString(String path)
+	{
+		return super.isString(path);
+	}
+
+	@Override
+	public synchronized boolean isVector(String path)
+	{
+		return super.isVector(path);
+	}
+
+	@Override
+	public synchronized void set(String path, Object value)
+	{
+		super.set(path, value);
+	}
 }
@@ -2,9 +2,12 @@ package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.bukkit.Material;
-import org.bukkit.entity.Animals;
+import org.bukkit.entity.Ageable;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -16,6 +19,7 @@ import org.bukkit.inventory.ItemStack;

 public class EssentialsEntityListener implements Listener
 {
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private final IEssentials ess;

 	public EssentialsEntityListener(IEssentials ess)
@@ -23,42 +27,73 @@ public class EssentialsEntityListener implements Listener
 		this.ess = ess;
 	}

-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onEntityDamage(EntityDamageEvent event)
+	// This method does something undocumented reguarding certain bucket types #EasterEgg
+	@EventHandler(priority = EventPriority.LOW)
+	public void onEntityDamage(final EntityDamageByEntityEvent event)
 	{
-		if (event instanceof EntityDamageByEntityEvent)
+		final Entity eAttack = event.getDamager();
+		final Entity eDefend = event.getEntity();
+		if (eDefend instanceof Player && eAttack instanceof Player)
 		{
-			EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
-			Entity eAttack = edEvent.getDamager();
-			Entity eDefend = edEvent.getEntity();
-			if (eDefend instanceof Player && eAttack instanceof Player)
-			{
-				User defender = ess.getUser(eDefend);
-				User attacker = ess.getUser(eAttack);
-				attacker.updateActivity(true);
-				ItemStack is = attacker.getItemInHand();
-				List<String> commandList = attacker.getPowertool(is);
-				if (commandList != null && !commandList.isEmpty())
-				{
-					for (String command : commandList)
-					{
+			final User defender = ess.getUser(eDefend);
+			final User attacker = ess.getUser(eAttack);

-						if (command != null && !command.isEmpty())
-						{
-							attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
-							event.setCancelled(true);
-							return;
-						}
+			if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
+				&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
+			{
+				event.setCancelled(true);
+			}
+
+			if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())
+			{
+				event.setCancelled(true);
+			}
+
+			if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp"))
+			{
+				event.setCancelled(true);
+			}
+
+			if (attacker.isHidden() && !attacker.isAuthorized("essentials.vanish.pvp"))
+			{
+				event.setCancelled(true);
+			}
+
+			attacker.updateActivity(true);
+			final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
+			if (commandList != null && !commandList.isEmpty())
+			{
+				for (final String command : commandList)
+				{
+					if (command != null && !command.isEmpty())
+					{
+						ess.scheduleSyncDelayedTask(
+								new Runnable()
+								{
+									@Override
+									public void run()
+									{
+										attacker.getServer().dispatchCommand(attacker.getBase(), command.replaceAll("\\{player\\}", defender.getName()));
+										LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command));
+									}
+								});
+
+						event.setCancelled(true);
+						return;
 					}
 				}
 			}
-			if (eDefend instanceof Animals && eAttack instanceof Player)
+		}
+		else if (eAttack instanceof Player)
+		{
+			final User player = ess.getUser(eAttack);
+			player.updateActivity(true);
+			if (eDefend instanceof Ageable)
 			{
-				User player = ess.getUser(eAttack);
-				ItemStack hand = player.getItemInHand();
+				final ItemStack hand = player.getItemInHand();
 				if (hand != null && hand.getType() == Material.MILK_BUCKET)
 				{
-					((Animals)eDefend).setAge(-24000);
+					((Ageable)eDefend).setBaby();
 					hand.setType(Material.BUCKET);
 					player.setItemInHand(hand);
 					player.updateInventory();
@@ -66,6 +101,11 @@ public class EssentialsEntityListener implements Listener
 				}
 			}
 		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityDamage(final EntityDamageEvent event)
+	{
 		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
 			final Player player = (Player)event.getEntity();
@@ -75,8 +115,8 @@ public class EssentialsEntityListener implements Listener
 		}
 	}

-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onEntityCombust(EntityCombustEvent event)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityCombust(final EntityCombustEvent event)
 	{
 		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
@@ -85,26 +125,33 @@ public class EssentialsEntityListener implements Listener
 	}

 	@EventHandler(priority = EventPriority.LOWEST)
-	public void onEntityDeath(final EntityDeathEvent event)
+	public void onPlayerDeathEvent(final PlayerDeathEvent event)
 	{
-		if (event instanceof PlayerDeathEvent)
+		final User user = ess.getUser(event.getEntity());
+		if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
 		{
-			final PlayerDeathEvent pdevent = (PlayerDeathEvent)event;
-			final User user = ess.getUser(pdevent.getEntity());
-			if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
-			{
-				user.setLastLocation();
-				user.sendMessage(_("backAfterDeath"));
-			}
-			if (!ess.getSettings().areDeathMessagesEnabled())
-			{
-				pdevent.setDeathMessage("");
-			}
+			user.setLastLocation();
+			user.sendMessage(_("backAfterDeath"));
+		}
+		if (!ess.getSettings().areDeathMessagesEnabled())
+		{
+			event.setDeathMessage("");
 		}
 	}

-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onFoodLevelChange(FoodLevelChangeEvent event)
+	@EventHandler(priority = EventPriority.LOW)
+	public void onPlayerDeathExpEvent(final PlayerDeathEvent event)
+	{
+		final User user = ess.getUser(event.getEntity());
+		if (user.isAuthorized("essentials.keepxp"))
+		{
+			event.setKeepLevel(true);
+			event.setDroppedExp(0);
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onFoodLevelChange(final FoodLevelChangeEvent event)
 	{
 		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
@@ -112,8 +159,8 @@ public class EssentialsEntityListener implements Listener
 		}
 	}

-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onEntityRegainHealth(EntityRegainHealthEvent event)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onEntityRegainHealth(final EntityRegainHealthEvent event)
 	{
 		if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player
 			&& ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers())
@@ -121,4 +168,16 @@ public class EssentialsEntityListener implements Listener
 			event.setCancelled(true);
 		}
 	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPotionSplashEvent(final PotionSplashEvent event)
+	{
+		for (LivingEntity entity : event.getAffectedEntities())
+		{
+			if (entity instanceof Player && ess.getUser(entity).isGodModeEnabled())
+			{
+				event.setIntensity(entity, 0d);
+			}
+		}
+	}
 }
@@ -12,30 +12,34 @@ import java.util.List;
 import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.Server;
+import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.*;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;


 public class EssentialsPlayerListener implements Listener
 {
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private final transient Server server;
 	private final transient IEssentials ess;
+	private static final int AIR = Material.AIR.getId();
+	private static final int BED = Material.BED_BLOCK.getId();

 	public EssentialsPlayerListener(final IEssentials parent)
 	{
 		this.ess = parent;
-		this.server = parent.getServer();
 	}

 	@EventHandler(priority = EventPriority.NORMAL)
@@ -43,14 +47,11 @@ public class EssentialsPlayerListener implements Listener
 	{
 		final User user = ess.getUser(event.getPlayer());
 		updateCompass(user);
-		if (ess.getSettings().changeDisplayName())
-		{
-			user.setDisplayNick();
-		}
+		user.setDisplayNick();
 	}

 	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerChat(final PlayerChatEvent event)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
 		if (user.isMuted())
@@ -63,31 +64,37 @@ public class EssentialsPlayerListener implements Listener
 		while (it.hasNext())
 		{
 			final User u = ess.getUser(it.next());
-			if (u.isIgnoredPlayer(user.getName()))
+			if (u.isIgnoredPlayer(user))
 			{
 				it.remove();
 			}
 		}
 		user.updateActivity(true);
-		if (ess.getSettings().changeDisplayName())
-		{
-			user.setDisplayNick();
-		}
+		user.setDisplayNick();
 	}

-	@EventHandler(priority = EventPriority.HIGH)
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onPlayerMove(final PlayerMoveEvent event)
 	{
-		if (event.isCancelled())
+		if ((!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
+			|| event.getFrom().getBlockX() == event.getTo().getBlockX()
+			   && event.getFrom().getBlockZ() == event.getTo().getBlockZ()
+			   && event.getFrom().getBlockY() == event.getTo().getBlockY())
 		{
 			return;
 		}
-		final User user = ess.getUser(event.getPlayer());

+		final User user = ess.getUser(event.getPlayer());
 		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
 		{
 			final Location from = event.getFrom();
-			final Location to = event.getTo().clone();
+			final Location origTo = event.getTo();
+			final Location to = origTo.clone();
+			if (ess.getSettings().cancelAfkOnMove() && origTo.getY() >= from.getBlockY() + 1)
+			{
+				user.updateActivity(true);
+				return;
+			}
 			to.setX(from.getX());
 			to.setY(from.getY());
 			to.setZ(from.getZ());
@@ -101,7 +108,6 @@ public class EssentialsPlayerListener implements Listener
 			}
 			return;
 		}
-
 		final Location afk = user.getAfkPosition();
 		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
 		{
@@ -115,12 +121,15 @@ public class EssentialsPlayerListener implements Listener
 		final User user = ess.getUser(event.getPlayer());
 		if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
 		{
-			user.toggleGodModeEnabled();
+			user.setGodModeEnabled(false);
 		}
-		if (user.getSavedInventory() != null)
+		if (user.isVanished())
 		{
-			user.getInventory().setContents(user.getSavedInventory());
-			user.setSavedInventory(null);
+			user.toggleVanished();
+		}
+		if (!user.isJailed())
+		{
+			user.setLastLocation();
 		}
 		user.updateActivity(false);
 		user.dispose();
@@ -129,15 +138,40 @@ public class EssentialsPlayerListener implements Listener
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerJoin(final PlayerJoinEvent event)
 	{
-		ess.getBackup().onPlayerJoin();
-		final User user = ess.getUser(event.getPlayer());
-
-		if (ess.getSettings().changeDisplayName())
+		ess.scheduleAsyncDelayedTask(new Runnable()
 		{
-			user.setDisplayNick();
+			@Override
+			public void run()
+			{
+				delayedJoin(event.getPlayer());
+			}
+		});
+	}
+
+	public void delayedJoin(final Player player)
+	{
+		if (!player.isOnline())
+		{
+			return;
 		}
-		user.setLastLoginAddress(user.getAddress().getAddress().getHostAddress());
+		ess.getBackup().onPlayerJoin();
+		final User user = ess.getUser(player);
+		user.setDisplayNick();
+		updateCompass(user);
+		user.setLastLogin(System.currentTimeMillis());
 		user.updateActivity(false);
+
+		if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
+		{
+			for (String p : ess.getVanishedPlayers())
+			{
+				Player toVanish = ess.getUser(p).getBase();
+				if (toVanish.isOnline()) {
+					user.hidePlayer(toVanish);
+				}
+			}
+		}
+
 		if (user.isAuthorized("essentials.sleepingignored"))
 		{
 			user.setSleepingIgnored(true);
@@ -179,39 +213,7 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}

-	@EventHandler(priority = EventPriority.HIGH)
-	public void onPlayerLogin(final PlayerLoginEvent event)
-	{
-		if (event.getResult() != Result.ALLOWED && event.getResult() != Result.KICK_FULL && event.getResult() != Result.KICK_BANNED)
-		{
-			return;
-		}
-		User user = ess.getUser(event.getPlayer());
-		user.setNPC(false);
-
-		final long currentTime = System.currentTimeMillis();
-		final boolean banExpired = user.checkBanTimeout(currentTime);
-		user.checkMuteTimeout(currentTime);
-		user.checkJailTimeout(currentTime);
-
-		if (banExpired == false && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
-		{
-			final String banReason = user.getBanReason();
-			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason"));
-			return;
-		}
-
-		if (server.getOnlinePlayers().length >= server.getMaxPlayers() && !user.isAuthorized("essentials.joinfullserver"))
-		{
-			event.disallow(Result.KICK_FULL, _("serverFull"));
-			return;
-		}
-		event.allow();
-
-		user.setLastLogin(System.currentTimeMillis());
-		updateCompass(user);
-	}
-
+	// Makes the compass item ingame always point to the first essentials home.  #EasterEgg
 	private void updateCompass(final User user)
 	{
 		Location loc = user.getHome(user.getLocation());
@@ -221,33 +223,78 @@ public class EssentialsPlayerListener implements Listener
 		}
 		if (loc != null)
 		{
-			user.setCompassTarget(loc);
+			final Location updateLoc = loc;
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					user.setCompassTarget(updateLoc);
+				}
+			});
 		}
 	}

 	@EventHandler(priority = EventPriority.HIGH)
-	public void onPlayerTeleport(final PlayerTeleportEvent event)
+	public void onPlayerLogin(final PlayerLoginEvent event)
 	{
-		if (event.isCancelled())
+		switch (event.getResult())
 		{
+		case ALLOWED:
+		case KICK_FULL:
+		case KICK_BANNED:
+			break;
+		default:
 			return;
 		}

 		final User user = ess.getUser(event.getPlayer());
-		//There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
-		if ((event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND) && ess.getSettings().registerBackInListener())
+		if (user.isNPC())
 		{
-			user.setLastLocation();
+			user.setNPC(false);
 		}

-		if (ess.getSettings().changeDisplayName())
+		final long currentTime = System.currentTimeMillis();
+		final boolean banExpired = user.checkBanTimeout(currentTime);
+		user.checkMuteTimeout(currentTime);
+		user.checkJailTimeout(currentTime);
+
+		if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
 		{
-			user.setDisplayNick();
+			final String banReason = user.getBanReason();
+			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason"));
+			return;
 		}
-		updateCompass(user);
+
+		if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
+		{
+			event.disallow(Result.KICK_FULL, _("serverFull"));
+			return;
+		}
+		event.allow();
 	}

-	@EventHandler(priority = EventPriority.HIGH)
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+	public void onPlayerTeleport(final PlayerTeleportEvent event)
+	{
+		final boolean backListener = ess.getSettings().registerBackInListener();
+		final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
+		if (backListener || teleportInvulnerability)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			//There is TeleportCause.COMMMAND but plugins have to actively pass the cause in on their teleports.
+			if (backListener && (event.getCause() == TeleportCause.PLUGIN || event.getCause() == TeleportCause.COMMAND))
+			{
+				user.setLastLocation();
+			}
+			if (teleportInvulnerability)
+			{
+				user.enableInvulnerabilityAfterTeleport();
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onPlayerEggThrow(final PlayerEggThrowEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
@@ -259,7 +306,7 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}

-	@EventHandler(priority = EventPriority.HIGH)
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
@@ -276,121 +323,221 @@ public class EssentialsPlayerListener implements Listener
 			});
 		}
 	}
+	private final static List<String> COMMANDS = Arrays.asList("msg", "r", "mail", "m", "t", "whisper", "emsg", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm");

-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onPlayerAnimation(final PlayerAnimationEvent event)
-	{
-		final User user = ess.getUser(event.getPlayer());
-		user.updateActivity(true);
-		if (event.getAnimationType() == PlayerAnimationType.ARM_SWING
-			&& user.hasPowerTools() && user.arePowerToolsEnabled())
-		{
-			usePowertools(user);
-		}
-	}
-
-	private void usePowertools(final User user)
-	{
-		final ItemStack is = user.getItemInHand();
-		int id;
-		if (is == null || (id = is.getTypeId()) == 0)
-		{
-			return;
-		}
-		final List<String> commandList = user.getPowertool(id);
-		if (commandList == null || commandList.isEmpty())
-		{
-			return;
-		}
-
-		// We need to loop through each command and execute
-		for (String command : commandList)
-		{
-			if (command.matches(".*\\{player\\}.*"))
-			{
-				//user.sendMessage("Click a player to use this command");
-				continue;
-			}
-			else if (command.startsWith("c:"))
-			{
-				user.chat(command.substring(2));
-			}
-			else
-			{
-				user.getServer().dispatchCommand(user.getBase(), command);
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
 	{
-		if (event.isCancelled())
-		{
-			return;
-		}
-		final User user = ess.getUser(event.getPlayer());
+		final Player player = event.getPlayer();
 		final String cmd = event.getMessage().toLowerCase(Locale.ENGLISH).split(" ")[0].replace("/", "").toLowerCase(Locale.ENGLISH);
-		final List<String> commands = Arrays.asList("msg", "r", "mail", "m", "t", "emsg", "tell", "er", "reply", "ereply", "email");
-		if (commands.contains(cmd))
+		if (COMMANDS.contains(cmd))
 		{
-			for (Player player : ess.getServer().getOnlinePlayers())
+			for (Player onlinePlayer : ess.getServer().getOnlinePlayers())
 			{
-				User spyer = ess.getUser(player);
-				if (spyer.isSocialSpyEnabled() && !user.equals(spyer))
+				final User spyer = ess.getUser(onlinePlayer);
+				if (spyer.isSocialSpyEnabled() && !player.equals(onlinePlayer))
 				{
-					player.sendMessage(user.getDisplayName() + " : " + event.getMessage());
+					onlinePlayer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
 				}
 			}
 		}
-		if (!cmd.equalsIgnoreCase("afk"))
+		else if (!cmd.equalsIgnoreCase("afk"))
 		{
+			final User user = ess.getUser(player);
 			user.updateActivity(true);
 		}
 	}

+	@EventHandler(priority = EventPriority.LOW)
+	public void onPlayerChangedWorldHack(final PlayerChangedWorldEvent event)
+	{
+		final Player user = event.getPlayer();
+		if (user.getGameMode() != GameMode.CREATIVE) {
+			user.setAllowFlight(false);	
+		}		
+		user.setFlySpeed(0.1f);
+		user.setWalkSpeed(0.2f);
+	}
+
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
 	{
-		if (ess.getSettings().getNoGodWorlds().contains(event.getPlayer().getLocation().getWorld().getName()))
+		final User user = ess.getUser(event.getPlayer());
+		final String newWorld = event.getPlayer().getLocation().getWorld().getName();
+		user.setDisplayNick();
+		updateCompass(user);
+		if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
 		{
-			User user = ess.getUser(event.getPlayer());
-			if (user.isGodModeEnabledRaw())
+			user.sendMessage(_("noGodWorldWarning"));
+		}
+
+		if (!event.getPlayer().getWorld().getName().equals(newWorld))
+		{
+			user.sendMessage(_("currentWorld", newWorld));
+		}
+	}
+
+	@EventHandler(priority = EventPriority.NORMAL)
+	public void onPlayerInteract(final PlayerInteractEvent event)
+	{
+		switch (event.getAction())
+		{
+		case RIGHT_CLICK_BLOCK:
+			if (!event.isCancelled() && event.getClickedBlock().getTypeId() == BED && ess.getSettings().getUpdateBedAtDaytime())
 			{
-				user.sendMessage(_("noGodWorldWarning"));
+				Player player = event.getPlayer();
+				player.setBedSpawnLocation(event.getClickedBlock().getLocation());
+				player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+			}
+			break;
+		case LEFT_CLICK_AIR:
+			if (event.getPlayer().isFlying())
+			{
+				final User user = ess.getUser(event.getPlayer());
+				if (user.isFlyClickJump())
+				{
+					useFlyClickJump(user);
+					return;
+				}
+			}
+		case LEFT_CLICK_BLOCK:
+			if (event.getItem() != null && event.getItem().getTypeId() != AIR)
+			{
+				final User user = ess.getUser(event.getPlayer());
+				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
+				{
+					event.setCancelled(true);
+				}
+			}
+			break;
+		default:
+			break;
+		}
+	}
+
+	// This method allows the /jump lock feature to work, allows teleporting while flying #EasterEgg
+	private void useFlyClickJump(final User user)
+	{
+		try
+		{
+			final Location otarget = Util.getTarget(user);
+
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							Location loc = user.getLocation();
+							loc.setX(otarget.getX());
+							loc.setZ(otarget.getZ());
+							while (Util.isBlockDamaging(loc.getWorld(), loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()))
+							{
+								loc.setY(loc.getY() + 1d);
+							}
+							user.getBase().teleport(loc, TeleportCause.PLUGIN);
+						}
+					});
+		}
+		catch (Exception ex)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				LOGGER.log(Level.WARNING, ex.getMessage(), ex);
+			}
+		}
+	}
+
+	private boolean usePowertools(final User user, final int id)
+	{
+		final List<String> commandList = user.getPowertool(id);
+		if (commandList == null || commandList.isEmpty())
+		{
+			return false;
+		}
+		boolean used = false;
+		// We need to loop through each command and execute
+		for (final String command : commandList)
+		{
+			if (command.contains("{player}"))
+			{
+				continue;
+			}
+			else if (command.startsWith("c:"))
+			{
+				used = true;
+				user.chat(command.substring(2));
+			}
+			else
+			{
+				used = true;
+				ess.scheduleSyncDelayedTask(
+						new Runnable()
+						{
+							@Override
+							public void run()
+							{
+								user.getServer().dispatchCommand(user.getBase(), command);
+								LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
+							}
+						});
+			}
+		}
+		return used;
+	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPlayerPickupItem(final PlayerPickupItemEvent event)
+	{
+		if (ess.getSettings().getDisableItemPickupWhileAfk())
+		{
+			if (ess.getUser(event.getPlayer()).isAfk())
+			{
+				event.setCancelled(true);
+			}
+		}
+	}
+
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+	public void onInventoryClickEvent(final InventoryClickEvent event)
+	{
+		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
+		{
+			final User user = ess.getUser(event.getWhoClicked());
+			final InventoryHolder invHolder = event.getView().getTopInventory().getHolder();
+			if (invHolder != null && invHolder instanceof HumanEntity)
+			{
+				final User invOwner = ess.getUser((HumanEntity)invHolder);
+				if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify")
+										|| invOwner.isAuthorized("essentials.invsee.preventmodify")
+										|| !invOwner.isOnline()))
+				{
+					event.setCancelled(true);
+				}
+			}
+		}
+		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
+		{
+			final User user = ess.getUser(event.getWhoClicked());
+			if (user.isEnderSee() && (!user.isAuthorized("essentials.enderchest.modify")))
+			{
+				event.setCancelled(true);
 			}
 		}
 	}

 	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerInteract(final PlayerInteractEvent event)
+	public void onInventoryCloseEvent(final InventoryCloseEvent event)
 	{
-		if (event.isCancelled())
+		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
 		{
-			return;
+			final User user = ess.getUser(event.getPlayer());
+			user.setInvSee(false);
 		}
-		if (event.getAction() != Action.RIGHT_CLICK_BLOCK)
+		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
 		{
-			return;
-		}
-
-		if (ess.getSettings().getUpdateBedAtDaytime() && event.getClickedBlock().getType() == Material.BED_BLOCK)
-		{
-			event.getPlayer().setBedSpawnLocation(event.getClickedBlock().getLocation());
+			final User user = ess.getUser(event.getPlayer());
+			user.setEnderSee(false);
 		}
 	}
-
-	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerPickupItem(PlayerPickupItemEvent event)
-	{
-		if (event.isCancelled() || !ess.getSettings().getDisableItemPickupWhileAfk())
-		{
-			return;
-		}
-		final User user = ess.getUser(event.getPlayer());
-		if (user.isAfk())
-		{
-			event.setCancelled(true);
-		}
-	}
-}
+}
@@ -20,17 +20,23 @@ public class EssentialsPluginListener implements Listener, IConf
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPluginEnable(final PluginEnableEvent event)
 	{
+		if (event.getPlugin().getName().equals("EssentialsChat")) {
+			ess.getSettings().setEssentialsChatActive(true);
+		}
 		ess.getPermissionsHandler().checkPermissions();
 		ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin());
 		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager()))
 		{
-			ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
+			ess.getLogger().log(Level.INFO, "Payment method found (" + ess.getPaymentMethod().getMethod().getLongName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
 		}
 	}

 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPluginDisable(final PluginDisableEvent event)
 	{
+		if (event.getPlugin().getName().equals("EssentialsChat")) {
+			ess.getSettings().setEssentialsChatActive(false);
+		}
 		ess.getPermissionsHandler().checkPermissions();
 		ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin());
 		// Check to see if the plugin thats being disabled is the one we are using
@@ -2,6 +2,7 @@ package com.earth2me.essentials;

 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.Set;
 import java.util.logging.Level;
 import org.bukkit.entity.Player;
@@ -11,6 +12,8 @@ public class EssentialsTimer implements Runnable
 {
 	private final transient IEssentials ess;
 	private final transient Set<User> onlineUsers = new HashSet<User>();
+	private transient long lastPoll = System.currentTimeMillis();
+	private final transient LinkedList<Float> history = new LinkedList<Float>();

 	EssentialsTimer(final IEssentials ess)
 	{
@@ -21,6 +24,21 @@ public class EssentialsTimer implements Runnable
 	public void run()
 	{
 		final long currentTime = System.currentTimeMillis();
+		long timeSpent = (currentTime - lastPoll) / 1000;
+		if (timeSpent == 0)
+		{
+			timeSpent = 1;
+		}
+		if (history.size() > 10)
+		{
+			history.remove();
+		}
+		float tps = 100f / timeSpent;
+		if (tps <= 20)
+		{
+			history.add(tps);
+		}
+		lastPoll = currentTime;
 		for (Player player : ess.getServer().getOnlinePlayers())
 		{
 			try
@@ -48,6 +66,20 @@ public class EssentialsTimer implements Runnable
 			}
 			user.checkMuteTimeout(currentTime);
 			user.checkJailTimeout(currentTime);
+			user.resetInvulnerabilityAfterTeleport();
 		}
 	}
+
+	public float getAverageTPS()
+	{
+		float avg = 0;
+		for (Float f : history)
+		{
+			if (f != null)
+			{
+				avg += f;
+			}
+		}
+		return avg / history.size();
+	}
 }
@@ -1,9 +1,9 @@
 package com.earth2me.essentials;

+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.craftbukkit.FakeWorld;
 import com.earth2me.essentials.settings.Spawns;
 import com.earth2me.essentials.storage.YamlStorageWriter;
-import static com.earth2me.essentials.I18n._;
 import java.io.*;
 import java.math.BigInteger;
 import java.security.DigestInputStream;
@@ -271,18 +271,18 @@ public class EssentialsUpgrade
 				if (config.hasProperty("powertools"))
 				{
 					@SuppressWarnings("unchecked")
-					final Map<Integer, Object> powertools = (Map<Integer, Object>)config.getProperty("powertools");
+					final Map<String, Object> powertools = config.getConfigurationSection("powertools").getValues(false);
 					if (powertools == null)
 					{
 						continue;
 					}
-					for (Map.Entry<Integer, Object> entry : powertools.entrySet())
+					for (Map.Entry<String, Object> entry : powertools.entrySet())
 					{
 						if (entry.getValue() instanceof String)
 						{
 							List<String> temp = new ArrayList<String>();
 							temp.add((String)entry.getValue());
-							((Map<Integer, Object>)powertools).put(entry.getKey(), temp);
+							((Map<String, Object>)powertools).put(entry.getKey(), temp);
 						}
 					}
 					config.save();
@@ -730,7 +730,7 @@ public class EssentialsUpgrade
 		doneFile.setProperty("updateSpawnsToNewSpawnsConfig", true);
 		doneFile.save();
 	}
-	
+
 	private void updateJailsToNewJailsConfig()
 	{
 		if (doneFile.getBoolean("updateJailsToNewJailsConfig", false))
@@ -778,6 +778,17 @@ public class EssentialsUpgrade
 		doneFile.save();
 	}

+	private void warnMetrics()
+	{
+		if (doneFile.getBoolean("warnMetrics", false))
+		{
+			return;
+		}
+		ess.getSettings().setMetricsEnabled(false);
+		doneFile.setProperty("warnMetrics", true);
+		doneFile.save();
+	}
+
 	public void beforeSettings()
 	{
 		if (!ess.getDataFolder().exists())
@@ -800,5 +811,6 @@ public class EssentialsUpgrade
 		deleteOldItemsCsv();
 		updateSpawnsToNewSpawnsConfig();
 		updateJailsToNewJailsConfig();
+		warnMetrics();
 	}
 }
@@ -70,7 +70,8 @@ public class I18n implements II18n

 	public static String _(final String string, final Object... objects)
 	{
-		if (instance == null) {
+		if (instance == null)
+		{
 			return "";
 		}
 		if (objects.length == 0)
@@ -85,11 +86,20 @@ public class I18n implements II18n

 	public String format(final String string, final Object... objects)
 	{
-		final String format = translate(string);
+		String format = translate(string);
 		MessageFormat messageFormat = messageFormatCache.get(format);
 		if (messageFormat == null)
 		{
-			messageFormat = new MessageFormat(format);
+			try
+			{
+				messageFormat = new MessageFormat(format);
+			}
+			catch (IllegalArgumentException e)
+			{
+				ess.getLogger().log(Level.SEVERE, "Invalid Translation key for '" + string + "': " + e.getMessage());
+				format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
+				messageFormat = new MessageFormat(format);
+			}
 			messageFormatCache.put(format, messageFormat);
 		}
 		return messageFormat.format(objects);
@@ -114,6 +124,7 @@ public class I18n implements II18n
 		{
 			currentLocale = new Locale(parts[0], parts[1], parts[2]);
 		}
+		ResourceBundle.clearCache();
 		Logger.getLogger("Minecraft").log(Level.INFO, String.format("Using locale %s", currentLocale.toString()));
 		customBundle = ResourceBundle.getBundle(MESSAGES, currentLocale, new FileResClassLoader(I18n.class.getClassLoader(), ess));
 		localeBundle = ResourceBundle.getBundle(MESSAGES, currentLocale);
@@ -132,7 +143,7 @@ public class I18n implements II18n
 	{
 		private final transient File dataFolder;

-		public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
+		FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
 		{
 			super(classLoader);
 			this.dataFolder = ess.getDataFolder();
@@ -1,9 +1,5 @@
 package com.earth2me.essentials;

-/**
- * @deprecated New interface will be IReload in api package
- */
-@Deprecated
 public interface IConf {
 	public void reloadConfig();
 }
@@ -1,18 +1,17 @@
 package com.earth2me.essentials;

 import com.earth2me.essentials.api.IJails;
+import com.earth2me.essentials.metrics.Metrics;
 import com.earth2me.essentials.perm.PermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
+import java.util.List;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;

-/**
- * @deprecated This will be moved to the api package soon
- */
-@Deprecated
+
 public interface IEssentials extends Plugin
 {
 	void addReloadListener(IConf listener);
@@ -64,4 +63,12 @@ public interface IEssentials extends Plugin
 	ItemDb getItemDb();

 	UserMap getUserMap();
+	
+	Metrics getMetrics();
+	
+	void setMetrics(Metrics metrics);
+	
+	EssentialsTimer getTimer();
+	
+	List<String> getVanishedPlayers();
 }
@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.bukkit.ChatColor;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventPriority;


@@ -19,6 +20,8 @@ public interface ISettings extends IConf

 	boolean getAnnounceNewPlayers();

+	String getNewPlayerKit();
+
 	String getBackupCommand();

 	long getBackupInterval();
@@ -39,9 +42,9 @@ public interface ISettings extends IConf

 	double getHealCooldown();

-	Object getKit(String name);
+	Map<String, Object> getKit(String name);

-	Map<String, Object> getKits();
+	ConfigurationSection getKits();

 	String getLocale();

@@ -89,10 +92,6 @@ public interface ISettings extends IConf

 	boolean isCommandOverridden(String name);

-	boolean isCommandRestricted(IEssentialsCommand cmd);
-
-	boolean isCommandRestricted(String label);
-
 	boolean isDebug();

 	boolean isEcoDisabled();
@@ -107,20 +106,24 @@ public interface ISettings extends IConf

 	boolean showNonEssCommandsInHelp();

-	boolean spawnIfNoHome();
-
 	boolean warnOnBuildDisallow();

 	boolean warnOnSmite();

 	double getMaxMoney();

+	double getMinMoney();
+
 	boolean isEcoLogEnabled();

+	boolean isEcoLogUpdateEnabled();
+
 	boolean removeGodOnDisconnect();

 	boolean changeDisplayName();

+	boolean changePlayerListName();
+
 	boolean isPlayerCommand(String string);

 	boolean useBukkitPermissions();
@@ -137,6 +140,8 @@ public interface ISettings extends IConf

 	boolean getFreezeAfkPlayers();

+	boolean cancelAfkOnMove();
+
 	boolean areDeathMessagesEnabled();

 	public void setDebug(boolean debug);
@@ -147,7 +152,9 @@ public interface ISettings extends IConf

 	boolean getRepairEnchanted();

-	boolean getIsWorldTeleportPermissions();
+	boolean isWorldTeleportPermissions();
+
+	boolean isWorldHomePermissions();

 	boolean registerBackInListener();

@@ -156,4 +163,24 @@ public interface ISettings extends IConf
 	EventPriority getRespawnPriority();

 	long getTpaAcceptCancellation();
+
+	boolean isMetricsEnabled();
+
+	void setMetricsEnabled(boolean metricsEnabled);
+
+	long getTeleportInvulnerability();
+
+	boolean isTeleportInvulnerability();
+
+	long getLoginAttackDelay();
+
+	int getSignUsePerSecond();
+
+	double getMaxFlySpeed();
+
+	double getMaxWalkSpeed();
+
+	public int getMailsPerMinute();
+
+	public void setEssentialsChatActive(boolean b);
 }
@@ -1,16 +1,10 @@
 package com.earth2me.essentials;

 import com.earth2me.essentials.commands.IEssentialsCommand;
-import java.net.InetSocketAddress;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.PlayerInventory;


-/**
- * @deprecated This will be moved to the api package soon
- */
-@Deprecated
 public interface IUser extends Player
 {
 	long getLastTeleportTimestamp();
@@ -32,6 +26,8 @@ public interface IUser extends Player
 	void takeMoney(double value);

 	void giveMoney(double value);
+	
+	boolean canAfford(double value);

 	String getGroup();

@@ -1,11 +1,8 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.api.IItemDb;
 import static com.earth2me.essentials.I18n._;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import com.earth2me.essentials.api.IItemDb;
+import java.util.*;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;

@@ -20,6 +17,7 @@ public class ItemDb implements IConf, IItemDb
 		file = new ManagedFile("items.csv", ess);
 	}
 	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
+	private final transient Map<ItemData, List<String>> names = new HashMap<ItemData, List<String>>();
 	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
 	private final transient ManagedFile file;

@@ -35,6 +33,7 @@ public class ItemDb implements IConf, IItemDb

 		durabilities.clear();
 		items.clear();
+		names.clear();

 		for (String line : lines)
 		{
@@ -51,9 +50,25 @@ public class ItemDb implements IConf, IItemDb
 			}

 			final int numeric = Integer.parseInt(parts[1]);
+			final short data = parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0;
+			String itemName = parts[0].toLowerCase(Locale.ENGLISH);

-			durabilities.put(parts[0].toLowerCase(Locale.ENGLISH), parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0);
-			items.put(parts[0].toLowerCase(Locale.ENGLISH), numeric);
+			durabilities.put(itemName, data);
+			items.put(itemName, numeric);
+
+			ItemData itemData = new ItemData(numeric, data);
+			if (names.containsKey(itemData))
+			{
+				List<String> nameList = names.get(itemData);
+				nameList.add(itemName);
+				Collections.sort(nameList, new LengthCompare());
+			}
+			else
+			{
+				List<String> nameList = new ArrayList<String>();
+				nameList.add(itemName);
+				names.put(itemData, nameList);
+			}
 		}
 	}

@@ -119,4 +134,81 @@ public class ItemDb implements IConf, IItemDb
 		retval.setDurability(metaData);
 		return retval;
 	}
+
+	public String names(ItemStack item)
+	{
+		ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
+		List<String> nameList = names.get(itemData);
+		if (nameList == null) {
+			itemData = new ItemData(item.getTypeId(), (short) 0);
+			nameList = names.get(itemData);
+			if (nameList == null) {
+				return null;
+			}
+		}
+		
+		if (nameList.size() > 15)
+		{
+			nameList = nameList.subList(0, 14);
+		}
+		return Util.joinList(", ", nameList);
+	}
+
+	class ItemData
+	{
+		final private int itemNo;
+		final private short itemData;
+
+		ItemData(final int itemNo, final short itemData)
+		{
+			this.itemNo = itemNo;
+			this.itemData = itemData;
+		}
+
+		public int getItemNo()
+		{
+			return itemNo;
+		}
+
+		public short getItemData()
+		{
+			return itemData;
+		}
+
+		@Override
+		public int hashCode()
+		{
+			return (31 * itemNo) ^ itemData;
+		}
+
+		@Override
+		public boolean equals(Object o)
+		{
+			if (o == null)
+			{
+				return false;
+			}
+			if (!(o instanceof ItemData))
+			{
+				return false;
+			}
+			ItemData pairo = (ItemData)o;
+			return this.itemNo == pairo.getItemNo()
+				   && this.itemData == pairo.getItemData();
+		}
+	}
+
+	class LengthCompare implements java.util.Comparator<String>
+	{
+		public LengthCompare()
+		{
+			super();
+		}
+
+		@Override
+		public int compare(String s1, String s2)
+		{
+			return s1.length() - s2.length();
+		}
+	}
 }
@@ -9,12 +9,16 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockDamageEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
@@ -26,21 +30,20 @@ import org.bukkit.plugin.PluginManager;
 public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.settings.Jails> implements IJails
 {
 	private static final transient Logger LOGGER = Bukkit.getLogger();
+	private static transient boolean enabled = false;

 	public Jails(final IEssentials ess)
 	{
 		super(ess, com.earth2me.essentials.settings.Jails.class);
 		reloadConfig();
-		registerListeners();
 	}

 	private void registerListeners()
 	{
+		enabled = true;
 		final PluginManager pluginManager = ess.getServer().getPluginManager();
-		final JailBlockListener blockListener = new JailBlockListener();
-		final JailPlayerListener playerListener = new JailPlayerListener();
+		final JailListener blockListener = new JailListener();
 		pluginManager.registerEvents(blockListener, ess);
-		pluginManager.registerEvents(playerListener, ess);
 	}

 	@Override
@@ -49,6 +52,24 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		return new File(ess.getDataFolder(), "jail.yml");
 	}

+	@Override
+	public void finishRead()
+	{
+		if (enabled == false && getCount() > 0)
+		{
+			registerListeners();
+		}
+	}
+
+	@Override
+	public void finishWrite()
+	{
+		if (enabled == false)
+		{
+			registerListeners();
+		}
+	}
+
 	@Override
 	public Location getJail(final String jailName) throws Exception
 	{
@@ -115,7 +136,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		acquireReadLock();
 		try
 		{
-			if (!(user.getBase() instanceof OfflinePlayer))
+			if (user.isOnline())
 			{
 				Location loc = getJail(jail);
 				user.getTeleport().now(loc, false, TeleportCause.COMMAND);
@@ -146,10 +167,23 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 		}
 	}

-
-	private class JailBlockListener implements Listener
+	@Override
+	public int getCount()
 	{
-		@EventHandler(priority = EventPriority.LOW)
+		try
+		{
+			return getList().size();
+		}
+		catch (Exception ex)
+		{
+			return 0;
+		}
+	}
+
+
+	private class JailListener implements Listener
+	{
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 		public void onBlockBreak(final BlockBreakEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
@@ -159,7 +193,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			}
 		}

-		@EventHandler(priority = EventPriority.LOW)
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 		public void onBlockPlace(final BlockPlaceEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
@@ -169,7 +203,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			}
 		}

-		@EventHandler(priority = EventPriority.LOW)
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 		public void onBlockDamage(final BlockDamageEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
@@ -178,12 +212,26 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 				event.setCancelled(true);
 			}
 		}
-	}

+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+		public void onEntityDamageByEntity(final EntityDamageByEntityEvent event)
+		{
+			if (event.getCause() != DamageCause.ENTITY_ATTACK || event.getEntity().getType() != EntityType.PLAYER)
+			{
+				return;
+			}
+			final Entity damager = event.getDamager();
+			if (damager.getType() == EntityType.PLAYER)
+			{
+				final User user = ess.getUser(damager);
+				if (user != null && user.isJailed())
+				{
+					event.setCancelled(true);
+				}
+			}
+		}

-	private class JailPlayerListener implements Listener
-	{
-		@EventHandler(priority = EventPriority.LOW)
+		@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 		public void onPlayerInteract(final PlayerInteractEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
@@ -193,7 +241,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			}
 		}

-		@EventHandler(priority = EventPriority.HIGH)
+		@EventHandler(priority = EventPriority.HIGHEST)
 		public void onPlayerRespawn(final PlayerRespawnEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
@@ -246,7 +294,7 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			user.sendMessage(_("jailMessage"));
 		}

-		@EventHandler(priority = EventPriority.HIGH)
+		@EventHandler(priority = EventPriority.HIGHEST)
 		public void onPlayerJoin(final PlayerJoinEvent event)
 		{
 			final User user = ess.getUser(event.getPlayer());
@@ -1,10 +1,14 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.capitalCase;
 import com.earth2me.essentials.commands.NoChargeException;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import java.util.*;
+import java.util.logging.Level;
 import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;


@@ -15,60 +19,79 @@ public class Kit
 	{
 		try
 		{
-			final Map<String, Object> kits = ess.getSettings().getKits();
+			final ConfigurationSection kits = ess.getSettings().getKits();
 			final StringBuilder list = new StringBuilder();
-			for (String kiteItem : kits.keySet())
+			for (String kiteItem : kits.getKeys(false))
 			{
-				if (user.isAuthorized("essentials.kit." + kiteItem.toLowerCase(Locale.ENGLISH)))
+				if (user == null || user.isAuthorized("essentials.kits." + kiteItem.toLowerCase(Locale.ENGLISH)))
 				{
-					list.append(" ").append(kiteItem);
+					list.append(" ").append(capitalCase(kiteItem));
 				}
 			}
-			return list.toString();
+			return list.toString().trim();
 		}
 		catch (Exception ex)
 		{
-			throw new Exception(_("kitError"));
+			throw new Exception(_("kitError"), ex);
 		}

 	}

 	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws NoChargeException
 	{
+		if (user.isAuthorized("essentials.kit.exemptdelay")) {
+			return;
+		}
+		
+		final Calendar time = new GregorianCalendar();
+
+		// Take the current time, and remove the delay from it.
 		final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
-		final Calendar c = new GregorianCalendar();
-		c.add(Calendar.SECOND, -(int)delay);
-		c.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
+		final Calendar earliestTime = new GregorianCalendar();
+		earliestTime.add(Calendar.SECOND, -(int)delay);
+		earliestTime.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
+		// This value contains the most recent time a kit could have been used that would allow another use.
+		final long earliestLong = earliestTime.getTimeInMillis();

-		final long mintime = c.getTimeInMillis();
+		// When was the last kit used?
+		final long lastTime = user.getKitTimestamp(kitName);

-		final Long lastTime = user.getKitTimestamp(kitName);
-		if (lastTime == null || lastTime < mintime)
+		if (lastTime < earliestLong)
 		{
-			final Calendar now = new GregorianCalendar();
-			user.setKitTimestamp(kitName, now.getTimeInMillis());
+			user.setKitTimestamp(kitName, time.getTimeInMillis());
+		}
+		else if (lastTime > time.getTimeInMillis())
+		{
+			// This is to make sure time didn't get messed up on last kit use.
+			// If this happens, let's give the user the benifit of the doubt.
+			user.setKitTimestamp(kitName, time.getTimeInMillis());
 		}
 		else
 		{
-			final Calendar future = new GregorianCalendar();
-			future.setTimeInMillis(lastTime);
-			future.add(Calendar.SECOND, (int)delay);
-			future.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-			user.sendMessage(_("kitTimed", Util.formatDateDiff(future.getTimeInMillis())));
+			time.setTimeInMillis(lastTime);
+			time.add(Calendar.SECOND, (int)delay);
+			time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+			user.sendMessage(_("kitTimed", Util.formatDateDiff(time.getTimeInMillis())));
 			throw new NoChargeException();
 		}
 	}

-	public static List<String> getItems(final User user, final Map<String, Object> els) throws Exception
+	public static List<String> getItems(final User user, final Map<String, Object> kit) throws Exception
 	{
+		if (kit == null)
+		{
+			throw new Exception(_("kitError2"));
+		}
+	
+
 		try
 		{
-			return (List<String>)els.get("items");
+			return (List<String>)kit.get("items");
 		}
 		catch (Exception e)
 		{
 			user.sendMessage(_("kitError2"));
-			throw new Exception(_("kitErrorHelp"));
+			throw new Exception(_("kitErrorHelp"), e);
 		}
 	}

@@ -79,18 +102,55 @@ public class Kit
 			boolean spew = false;
 			for (String d : items)
 			{
-				final String[] parts = d.split("[^0-9]+", 3);
-				final int id = Material.getMaterial(Integer.parseInt(parts[0])).getId();
-				final int amount = parts.length > 1 ? Integer.parseInt(parts[parts.length > 2 ? 2 : 1]) : 1;
-				final short data = parts.length > 2 ? Short.parseShort(parts[1]) : 0;
+				final String[] parts = d.split(" ");
+				final String[] item = parts[0].split("[:+',;.]", 2);
+				final int id = Material.getMaterial(Integer.parseInt(item[0])).getId();
+				final short data = item.length > 1 ? Short.parseShort(item[1]) : 0;
+				final int amount = parts.length > 1 ? Integer.parseInt(parts[1]) : 1;
+
+				final ItemStack stack = new ItemStack(id, amount, data);
+				if (parts.length > 2)
+				{
+					for (int i = 2; i < parts.length; i++)
+					{
+						final String[] split = parts[i].split("[:+',;.]", 2);
+						if (split.length < 1)
+						{
+							continue;
+						}
+						final Enchantment enchantment = Enchantments.getByName(split[0]);
+						if (enchantment == null)
+						{
+							throw new Exception("Enchantment not found: " + split[0]);
+						}
+						int level;
+						if (split.length > 1)
+						{
+							level = Integer.parseInt(split[1]);
+						}
+						else
+						{
+							level = enchantment.getMaxLevel();
+						}
+						try
+						{
+							stack.addEnchantment(enchantment, level);
+						}
+						catch (Exception ex)
+						{
+							throw new Exception("Enchantment " + enchantment.getName() + ": " + ex.getMessage(), ex);
+						}
+					}
+				}
+
 				final Map<Integer, ItemStack> overfilled;
 				if (user.isAuthorized("essentials.oversizedstacks"))
 				{
-					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, ess.getSettings().getOversizedStackSize(), new ItemStack(id, amount, data));
+					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, ess.getSettings().getOversizedStackSize(), stack);
 				}
 				else
 				{
-					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, new ItemStack(id, amount, data));
+					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, 0, stack);
 				}
 				for (ItemStack itemStack : overfilled.values())
 				{
@@ -107,7 +167,15 @@ public class Kit
 		catch (Exception e)
 		{
 			user.updateInventory();
-			throw new Exception(_("kitError2"));
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.WARNING, e.getMessage());
+			}
+			else
+			{
+				ess.getLogger().log(Level.WARNING, e.getMessage());
+			}
+			throw new Exception(_("kitError2"), e);
 		}
 	}
 }
@@ -1,48 +1,47 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Server;
-import org.bukkit.entity.CreatureType;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;


 public enum Mob
 {
-	CHICKEN("Chicken", Enemies.FRIENDLY, CreatureType.CHICKEN),
-	COW("Cow", Enemies.FRIENDLY, CreatureType.COW),
-	CREEPER("Creeper", Enemies.ENEMY, CreatureType.CREEPER),
-	GHAST("Ghast", Enemies.ENEMY, CreatureType.GHAST),
-	GIANT("Giant", Enemies.ENEMY, CreatureType.GIANT),
-	PIG("Pig", Enemies.FRIENDLY, CreatureType.PIG),
-	PIGZOMB("PigZombie", Enemies.NEUTRAL, CreatureType.PIG_ZOMBIE),
-	SHEEP("Sheep", Enemies.FRIENDLY, "", CreatureType.SHEEP),
-	SKELETON("Skeleton", Enemies.ENEMY, CreatureType.SKELETON),
-	SLIME("Slime", Enemies.ENEMY, CreatureType.SLIME),
-	SPIDER("Spider", Enemies.ENEMY, CreatureType.SPIDER),
-	SQUID("Squid", Enemies.FRIENDLY, CreatureType.SQUID),
-	ZOMBIE("Zombie", Enemies.ENEMY, CreatureType.ZOMBIE),
-	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF),
-	CAVESPIDER("CaveSpider", Enemies.ENEMY, CreatureType.CAVE_SPIDER),
-	ENDERMAN("Enderman", Enemies.ENEMY, "", CreatureType.ENDERMAN),
-	SILVERFISH("Silverfish", Enemies.ENEMY, "", CreatureType.SILVERFISH),
-	ENDERDRAGON("EnderDragon", Enemies.ENEMY, CreatureType.ENDER_DRAGON),
-	VILLAGER("Villager", Enemies.FRIENDLY, CreatureType.VILLAGER),
-	BLAZE("Blaze", Enemies.ENEMY, CreatureType.BLAZE),
-	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, CreatureType.MUSHROOM_COW),
-	MAGMACUBE("MagmaCube", Enemies.ENEMY, CreatureType.MAGMA_CUBE),
-	SNOWMAN("Snowman", Enemies.FRIENDLY, "", CreatureType.SNOWMAN);
+	CHICKEN("Chicken", Enemies.FRIENDLY, EntityType.CHICKEN),
+	COW("Cow", Enemies.FRIENDLY, EntityType.COW),
+	CREEPER("Creeper", Enemies.ENEMY, EntityType.CREEPER),
+	GHAST("Ghast", Enemies.ENEMY, EntityType.GHAST),
+	GIANT("Giant", Enemies.ENEMY, EntityType.GIANT),
+	PIG("Pig", Enemies.FRIENDLY, EntityType.PIG),
+	PIGZOMB("PigZombie", Enemies.NEUTRAL, EntityType.PIG_ZOMBIE),
+	SHEEP("Sheep", Enemies.FRIENDLY, "", EntityType.SHEEP),
+	SKELETON("Skeleton", Enemies.ENEMY, EntityType.SKELETON),
+	SLIME("Slime", Enemies.ENEMY, EntityType.SLIME),
+	SPIDER("Spider", Enemies.ENEMY, EntityType.SPIDER),
+	SQUID("Squid", Enemies.FRIENDLY, EntityType.SQUID),
+	ZOMBIE("Zombie", Enemies.ENEMY, EntityType.ZOMBIE),
+	WOLF("Wolf", Enemies.NEUTRAL, EntityType.WOLF),
+	CAVESPIDER("CaveSpider", Enemies.ENEMY, EntityType.CAVE_SPIDER),
+	ENDERMAN("Enderman", Enemies.ENEMY, "", EntityType.ENDERMAN),
+	SILVERFISH("Silverfish", Enemies.ENEMY, "", EntityType.SILVERFISH),
+	ENDERDRAGON("EnderDragon", Enemies.ENEMY, EntityType.ENDER_DRAGON),
+	VILLAGER("Villager", Enemies.FRIENDLY, EntityType.VILLAGER),
+	BLAZE("Blaze", Enemies.ENEMY, EntityType.BLAZE),
+	MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, EntityType.MUSHROOM_COW),
+	MAGMACUBE("MagmaCube", Enemies.ENEMY, EntityType.MAGMA_CUBE),
+	SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN),
+	OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT),
+	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM);
 	
 	public static final Logger logger = Logger.getLogger("Minecraft");

-	private Mob(String n, Enemies en, String s, CreatureType type)
+	private Mob(String n, Enemies en, String s, EntityType type)
 	{
 		this.suffix = s;
 		this.name = n;
@@ -50,7 +49,7 @@ public enum Mob
 		this.bukkitType = type;
 	}

-	private Mob(String n, Enemies en, CreatureType type)
+	private Mob(String n, Enemies en, EntityType type)
 	{
 		this.name = n;
 		this.type = en;
@@ -59,7 +58,7 @@ public enum Mob
 	public String suffix = "s";
 	final public String name;
 	final public Enemies type;
-	final private CreatureType bukkitType;
+	final private EntityType bukkitType;
 	private static final Map<String, Mob> hashMap = new HashMap<String, Mob>();

 	static
@@ -71,7 +70,7 @@ public enum Mob
 	}
 	
 	public static Set<String> getMobList() {
-		return hashMap.keySet();
+		return Collections.unmodifiableSet(hashMap.keySet());
 	}

 	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
@@ -99,7 +98,7 @@ public enum Mob
 		final protected String type;
 	}

-	public CreatureType getType()
+	public EntityType getType()
 	{
 		return bukkitType;
 	}
@@ -1,18 +1,23 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.craftbukkit.OfflineBedLocation;
 import static com.earth2me.essentials.I18n._;
 import java.net.InetSocketAddress;
 import java.util.*;
 import lombok.Delegate;
 import org.bukkit.*;
 import org.bukkit.block.Block;
+import org.bukkit.conversations.Conversation;
+import org.bukkit.conversations.ConversationAbandonedEvent;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.InventoryView.Property;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.map.MapView;
+import org.bukkit.metadata.MetadataValue;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;
@@ -21,7 +26,6 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.Vector;

-
 public class OfflinePlayer implements Player
 {
 	private final transient IEssentials ess;
@@ -172,11 +176,6 @@ public class OfflinePlayer implements Player
 		return false;
 	}

-	public boolean isPlayer()
-	{
-		return false;
-	}
-
 	@Override
 	public int getRemainingAir()
 	{
@@ -901,4 +900,209 @@ public class OfflinePlayer implements Player
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	@Override
+	public <T extends Projectile> T launchProjectile(Class<? extends T> arg0)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public EntityType getType()
+	{
+		return EntityType.PLAYER;
+	}
+
+	@Override
+	public <T> void playEffect(Location lctn, Effect effect, T t)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean setWindowProperty(Property prprt, int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public InventoryView getOpenInventory()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public InventoryView openInventory(Inventory invntr)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public InventoryView openWorkbench(Location lctn, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public InventoryView openEnchanting(Location lctn, boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void openInventory(InventoryView iv)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void closeInventory()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public ItemStack getItemOnCursor()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setItemOnCursor(ItemStack is)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setMetadata(String string, MetadataValue mv)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public List<MetadataValue> getMetadata(String string)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean hasMetadata(String string)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void removeMetadata(String string, Plugin plugin)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+
+	@Override
+	public boolean isConversing()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void acceptConversationInput(String string)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean beginConversation(Conversation c)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void abandonConversation(Conversation c)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void sendMessage(String[] strings)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean isBlocking()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void abandonConversation(Conversation arg0, ConversationAbandonedEvent arg1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean isFlying()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setFlying(boolean arg0)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+	
+	@Override
+	public int getExpToLevel()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean hasLineOfSight(Entity entity)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean isValid()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setFlySpeed(float value) throws IllegalArgumentException
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setWalkSpeed(float value) throws IllegalArgumentException
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public float getFlySpeed()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public float getWalkSpeed()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public Inventory getEnderChest()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void playSound(Location arg0, Sound arg1, float arg2, float arg3)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }
@@ -5,15 +5,15 @@ import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.signs.EssentialsSign;
 import com.earth2me.essentials.signs.Signs;
 import com.earth2me.essentials.textreader.IText;
-import com.earth2me.essentials.textreader.KeywordReplacer;
 import com.earth2me.essentials.textreader.SimpleTextInput;
-import com.earth2me.essentials.textreader.SimpleTextPager;
 import java.io.File;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.ChatColor;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.event.EventPriority;
 import org.bukkit.inventory.ItemStack;

@@ -23,6 +23,7 @@ public class Settings implements ISettings
 	private final transient EssentialsConf config;
 	private final static Logger logger = Logger.getLogger("Minecraft");
 	private final transient IEssentials ess;
+	private boolean metricsEnabled = true;

 	public Settings(IEssentials ess)
 	{
@@ -53,19 +54,21 @@ public class Settings implements ISettings
 	@Override
 	public int getHomeLimit(final User user)
 	{
-		final Set<String> homeList = getMultipleHomes();
-		if (homeList == null)
+		int limit = 1;
+		if (user.isAuthorized("essentials.sethome.multiple"))
 		{
-			//TODO: Replace this code to remove backwards compat, after settings are automatically updated
-			// return getHomeLimit("default");
-			return config.getInt("multiple-homes", 5);
+			limit = getHomeLimit("default");
 		}
-		int limit = getHomeLimit("default");
-		for (String set : homeList)
+
+		final Set<String> homeList = getMultipleHomes();
+		if (homeList != null)
 		{
-			if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set)))
+			for (String set : homeList)
 			{
-				limit = getHomeLimit(set);
+				if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set)))
+				{
+					limit = getHomeLimit(set);
+				}
 			}
 		}
 		return limit;
@@ -76,11 +79,17 @@ public class Settings implements ISettings
 	{
 		return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3));
 	}
+	private int chatRadius = 0;
+
+	private int _getChatRadius()
+	{
+		return config.getInt("chat.radius", config.getInt("chat-radius", 0));
+	}

 	@Override
 	public int getChatRadius()
 	{
-		return config.getInt("chat.radius", config.getInt("chat-radius", 0));
+		return chatRadius;
 	}

 	@Override
@@ -112,39 +121,29 @@ public class Settings implements ISettings
 	{
 		return isCommandDisabled(cmd.getName());
 	}
+	private Set<String> disabledCommands = new HashSet<String>();

 	@Override
 	public boolean isCommandDisabled(String label)
 	{
+		return disabledCommands.contains(label);
+	}
+
+	private Set<String> getDisabledCommands()
+	{
+		Set<String> disCommands = new HashSet<String>();
 		for (String c : config.getStringList("disabled-commands"))
 		{
-			if (!c.equalsIgnoreCase(label))
-			{
-				continue;
-			}
-			return true;
+			disCommands.add(c.toLowerCase(Locale.ENGLISH));
 		}
-		return config.getBoolean("disable-" + label.toLowerCase(Locale.ENGLISH), false);
-	}
-
-	@Override
-	public boolean isCommandRestricted(IEssentialsCommand cmd)
-	{
-		return isCommandRestricted(cmd.getName());
-	}
-
-	@Override
-	public boolean isCommandRestricted(String label)
-	{
-		for (String c : config.getStringList("restricted-commands"))
+		for (String c : config.getKeys(false))
 		{
-			if (!c.equalsIgnoreCase(label))
+			if (c.startsWith("disable-"))
 			{
-				continue;
+				disCommands.add(c.substring(8).toLowerCase(Locale.ENGLISH));
 			}
-			return true;
 		}
-		return config.getBoolean("restrict-" + label.toLowerCase(Locale.ENGLISH), false);
+		return disCommands;
 	}

 	@Override
@@ -174,6 +173,7 @@ public class Settings implements ISettings
 		}
 		return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false);
 	}
+	private ConfigurationSection commandCosts;

 	@Override
 	public double getCommandCost(IEssentialsCommand cmd)
@@ -181,21 +181,49 @@ public class Settings implements ISettings
 		return getCommandCost(cmd.getName());
 	}

-	@Override
-	public double getCommandCost(String label)
+	public ConfigurationSection _getCommandCosts()
 	{
-		double cost = config.getDouble("command-costs." + label, 0.0);
-		if (cost == 0.0)
+		if (config.isConfigurationSection("command-costs"))
 		{
-			cost = config.getDouble("cost-" + label, 0.0);
+			final ConfigurationSection section = config.getConfigurationSection("command-costs");
+			final ConfigurationSection newSection = new MemoryConfiguration();
+			for (String command : section.getKeys(false))
+			{
+				if (section.isDouble(command))
+				{
+					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getDouble(command));
+				}
+				else if (section.isInt(command))
+				{
+					newSection.set(command.toLowerCase(Locale.ENGLISH), (double)section.getInt(command));
+				}
+			}
+			return newSection;
 		}
-		return cost;
+		return null;
+	}
+
+	@Override
+	public double getCommandCost(String name)
+	{
+		name = name.replace('.', '_').replace('/', '_');
+		if (commandCosts != null)
+		{
+			return commandCosts.getDouble(name, 0.0);
+		}
+		return 0.0;
+	}
+	private String nicknamePrefix = "~";
+
+	private String _getNicknamePrefix()
+	{
+		return config.getString("nickname-prefix", "~");
 	}

 	@Override
 	public String getNicknamePrefix()
 	{
-		return config.getString("nickname-prefix", "~");
+		return nicknamePrefix;
 	}

 	@Override
@@ -209,39 +237,65 @@ public class Settings implements ISettings
 	{
 		return config.getDouble("heal-cooldown", 0);
 	}
+	private ConfigurationSection kits;

-	@Override
-	public Object getKit(String name)
+	public ConfigurationSection _getKits()
 	{
-		Map<String, Object> kits = (Map<String, Object>)config.get("kits");
-		for (Map.Entry<String, Object> entry : kits.entrySet())
+		if (config.isConfigurationSection("kits"))
 		{
-			if (entry.getKey().equalsIgnoreCase(name.replace('.', '_').replace('/', '_')))
+			final ConfigurationSection section = config.getConfigurationSection("kits");
+			final ConfigurationSection newSection = new MemoryConfiguration();
+			for (String kitItem : section.getKeys(false))
 			{
-				return entry.getValue();
+				if (section.isConfigurationSection(kitItem))
+				{
+					newSection.set(kitItem.toLowerCase(Locale.ENGLISH), section.getConfigurationSection(kitItem));
+				}
 			}
+			return newSection;
 		}
 		return null;
 	}

 	@Override
-	public Map<String, Object> getKits()
+	public ConfigurationSection getKits()
 	{
-		return (Map<String, Object>)config.get("kits");
+		return kits;
 	}

 	@Override
-	public ChatColor getOperatorColor() throws Exception
+	public Map<String, Object> getKit(String name)
+	{
+		name = name.replace('.', '_').replace('/', '_');
+		if (getKits() != null)
+		{
+			final ConfigurationSection kits = getKits();
+			if (kits.isConfigurationSection(name))
+			{
+				return kits.getConfigurationSection(name).getValues(true);
+			}
+		}
+		return null;
+	}
+	private ChatColor operatorColor = null;
+
+	@Override
+	public ChatColor getOperatorColor()
+	{
+		return operatorColor;
+	}
+
+	private ChatColor _getOperatorColor()
 	{
 		String colorName = config.getString("ops-name-color", null);

 		if (colorName == null)
 		{
-			return ChatColor.RED;
+			return ChatColor.DARK_RED;
 		}
 		if ("none".equalsIgnoreCase(colorName) || colorName.isEmpty())
 		{
-			throw new Exception();
+			return null;
 		}

 		try
@@ -282,7 +336,7 @@ public class Settings implements ISettings
 	@Override
 	public boolean areSignsDisabled()
 	{
-		return enabledSigns.isEmpty();
+		return !signsEnabled;
 	}

 	@Override
@@ -296,7 +350,7 @@ public class Settings implements ISettings
 	{
 		return config.getString("backup.command", null);
 	}
-	private Map<String, MessageFormat> chatFormats = new HashMap<String, MessageFormat>();
+	private Map<String, MessageFormat> chatFormats = Collections.synchronizedMap(new HashMap<String, MessageFormat>());

 	@Override
 	public MessageFormat getChatFormat(String group)
@@ -306,13 +360,14 @@ public class Settings implements ISettings
 		{
 			String format = config.getString("chat.group-formats." + (group == null ? "Default" : group),
 											 config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
-			format = Util.replaceColor(format);
+			format = Util.replaceFormat(format);
 			format = format.replace("{DISPLAYNAME}", "%1$s");
 			format = format.replace("{GROUP}", "{0}");
 			format = format.replace("{MESSAGE}", "%2$s");
 			format = format.replace("{WORLDNAME}", "{1}");
 			format = format.replace("{SHORTWORLDNAME}", "{2}");
-			format = format.replaceAll("\\{(\\D*)\\}", "\\[$1\\]");
+			format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
+			format = "§r".concat(format);
 			mFormat = new MessageFormat(format);
 			chatFormats.put(group, mFormat);
 		}
@@ -328,7 +383,13 @@ public class Settings implements ISettings
 	@Override
 	public IText getAnnounceNewPlayerFormat()
 	{
-		return new SimpleTextInput(Util.replaceColor(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!")));		
+		return new SimpleTextInput(Util.replaceFormat(config.getString("newbies.announce-format", "&dWelcome {DISPLAYNAME} to the server!")));
+	}
+
+	@Override
+	public String getNewPlayerKit()
+	{
+		return config.getString("newbies.kit", "");
 	}

 	@Override
@@ -354,9 +415,31 @@ public class Settings implements ISettings
 	{
 		config.load();
 		noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds"));
-		enabledSigns = getEnabledSigns();
-		itemSpawnBl = getItemSpawnBlacklist();
+		enabledSigns = _getEnabledSigns();
+		teleportInvulnerability = _isTeleportInvulnerability();
+		disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
+		registerBackInListener = _registerBackInListener();
+		cancelAfkOnMove = _cancelAfkOnMove();
+		getFreezeAfkPlayers = _getFreezeAfkPlayers();
+		itemSpawnBl = _getItemSpawnBlacklist();
+		loginAttackDelay = _getLoginAttackDelay();
+		signUsePerSecond = _getSignUsePerSecond();
+		kits = _getKits();
 		chatFormats.clear();
+		changeDisplayName = _changeDisplayName();
+		disabledCommands = getDisabledCommands();
+		nicknamePrefix = _getNicknamePrefix();
+		operatorColor = _getOperatorColor();
+		changePlayerListName = _changePlayerListName();
+		configDebug = _isDebug();
+		prefixsuffixconfigured = _isPrefixSuffixConfigured();
+		addprefixsuffix = _addPrefixSuffix();
+		disablePrefix = _disablePrefix();
+		disableSuffix = _disableSuffix();
+		chatRadius = _getChatRadius();
+		commandCosts = _getCommandCosts();
+		warnOnBuildDisallow = _warnOnBuildDisallow();
+		mailsPerMinute = _getMailsPerMinute();
 	}
 	private List<Integer> itemSpawnBl = new ArrayList<Integer>();

@@ -366,7 +449,7 @@ public class Settings implements ISettings
 		return itemSpawnBl;
 	}

-	private List<Integer> getItemSpawnBlacklist()
+	private List<Integer> _getItemSpawnBlacklist()
 	{
 		final List<Integer> epItemSpwn = new ArrayList<Integer>();
 		if (ess.getItemDb() == null)
@@ -394,6 +477,7 @@ public class Settings implements ISettings
 		return epItemSpwn;
 	}
 	private List<EssentialsSign> enabledSigns = new ArrayList<EssentialsSign>();
+	private boolean signsEnabled = false;

 	@Override
 	public List<EssentialsSign> enabledSigns()
@@ -401,7 +485,7 @@ public class Settings implements ISettings
 		return enabledSigns;
 	}

-	private List<EssentialsSign> getEnabledSigns()
+	private List<EssentialsSign> _getEnabledSigns()
 	{
 		List<EssentialsSign> newSigns = new ArrayList<EssentialsSign>();

@@ -412,6 +496,11 @@ public class Settings implements ISettings
 			{
 				continue;
 			}
+			if (signName.equals("COLOR") || signName.equals("COLOUR"))
+			{
+				signsEnabled = true;
+				continue;
+			}
 			try
 			{
 				newSigns.add(Signs.valueOf(signName).getSign());
@@ -419,28 +508,36 @@ public class Settings implements ISettings
 			catch (Exception ex)
 			{
 				logger.log(Level.SEVERE, _("unknownItemInList", signName, "enabledSigns"));
+				continue;
 			}
+			signsEnabled = true;
 		}
 		return newSigns;
 	}
+	private boolean warnOnBuildDisallow;

-	@Override
-	public boolean spawnIfNoHome()
+	private boolean _warnOnBuildDisallow()
 	{
-		return config.getBoolean("spawn-if-no-home", false);
+		return config.getBoolean("protect.disable.warn-on-build-disallow", false);
 	}

 	@Override
 	public boolean warnOnBuildDisallow()
 	{
-		return config.getBoolean("protect.disable.warn-on-build-disallow", false);
+		return warnOnBuildDisallow;
 	}
 	private boolean debug = false;
+	private boolean configDebug = false;
+
+	private boolean _isDebug()
+	{
+		return config.getBoolean("debug", false);
+	}

 	@Override
 	public boolean isDebug()
 	{
-		return debug || config.getBoolean("debug", false);
+		return debug || configDebug;
 	}

 	@Override
@@ -464,7 +561,7 @@ public class Settings implements ISettings
 	@Override
 	public String getCurrencySymbol()
 	{
-		return config.getString("currency-symbol", "$").substring(0, 1).replaceAll("[0-9]", "$");
+		return config.getString("currency-symbol", "$").concat("$").substring(0, 1).replaceAll("[0-9]", "$");
 	}

 	@Override
@@ -533,6 +630,22 @@ public class Settings implements ISettings
 		}
 		return max;
 	}
+	private final static double MINMONEY = -10000000000000.0;
+
+	@Override
+	public double getMinMoney()
+	{
+		double min = config.getDouble("min-money", MINMONEY);
+		if (min > 0)
+		{
+			min = -min;
+		}
+		if (min < MINMONEY)
+		{
+			min = MINMONEY;
+		}
+		return min;
+	}

 	@Override
 	public boolean isEcoLogEnabled()
@@ -540,16 +653,40 @@ public class Settings implements ISettings
 		return config.getBoolean("economy-log-enabled", false);
 	}

+	@Override
+	public boolean isEcoLogUpdateEnabled()
+	{
+		return config.getBoolean("economy-log-update-enabled", false);
+	}
+
 	@Override
 	public boolean removeGodOnDisconnect()
 	{
 		return config.getBoolean("remove-god-on-disconnect", false);
 	}
+	private boolean changeDisplayName = true;
+
+	private boolean _changeDisplayName()
+	{
+		return config.getBoolean("change-displayname", true);
+	}

 	@Override
 	public boolean changeDisplayName()
 	{
-		return config.getBoolean("change-displayname", true);
+		return changeDisplayName;
+	}
+	private boolean changePlayerListName = false;
+
+	private boolean _changePlayerListName()
+	{
+		return config.getBoolean("change-playerlist", false);
+	}
+
+	@Override
+	public boolean changePlayerListName()
+	{
+		return changePlayerListName;
 	}

 	@Override
@@ -557,25 +694,56 @@ public class Settings implements ISettings
 	{
 		return config.getBoolean("use-bukkit-permissions", false);
 	}
+	private boolean prefixsuffixconfigured = false;
+	private boolean addprefixsuffix = false;
+	private boolean essentialsChatActive = false;
+
+	private boolean _addPrefixSuffix()
+	{
+		return config.getBoolean("add-prefix-suffix", false);
+	}
+
+	private boolean _isPrefixSuffixConfigured()
+	{
+		return config.hasProperty("add-prefix-suffix");
+	}
+
+	@Override
+	public void setEssentialsChatActive(boolean essentialsChatActive)
+	{
+		this.essentialsChatActive = essentialsChatActive;
+	}

 	@Override
 	public boolean addPrefixSuffix()
 	{
-		return config.getBoolean("add-prefix-suffix", ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat"));
+		return prefixsuffixconfigured ? addprefixsuffix : essentialsChatActive;
 	}
+	private boolean disablePrefix = false;

-	@Override
-	public boolean disablePrefix()
+	private boolean _disablePrefix()
 	{
 		return config.getBoolean("disablePrefix", false);
 	}

 	@Override
-	public boolean disableSuffix()
+	public boolean disablePrefix()
+	{
+		return disablePrefix;
+	}
+	private boolean disableSuffix = false;
+
+	private boolean _disableSuffix()
 	{
 		return config.getBoolean("disableSuffix", false);
 	}

+	@Override
+	public boolean disableSuffix()
+	{
+		return disableSuffix;
+	}
+
 	@Override
 	public long getAutoAfk()
 	{
@@ -587,12 +755,30 @@ public class Settings implements ISettings
 	{
 		return config.getLong("auto-afk-kick", -1);
 	}
+	private boolean getFreezeAfkPlayers;

 	@Override
 	public boolean getFreezeAfkPlayers()
+	{
+		return getFreezeAfkPlayers;
+	}
+
+	private boolean _getFreezeAfkPlayers()
 	{
 		return config.getBoolean("freeze-afk-players", false);
 	}
+	private boolean cancelAfkOnMove;
+
+	@Override
+	public boolean cancelAfkOnMove()
+	{
+		return cancelAfkOnMove;
+	}
+
+	private boolean _cancelAfkOnMove()
+	{
+		return config.getBoolean("cancel-afk-on-move", true);
+	}

 	@Override
 	public boolean areDeathMessagesEnabled()
@@ -620,21 +806,39 @@ public class Settings implements ISettings
 	}

 	@Override
-	public boolean getIsWorldTeleportPermissions()
+	public boolean isWorldTeleportPermissions()
 	{
 		return config.getBoolean("world-teleport-permissions", false);
 	}

+	@Override
+	public boolean isWorldHomePermissions()
+	{
+		return config.getBoolean("world-home-permissions", false);
+	}
+	private boolean registerBackInListener;
+
 	@Override
 	public boolean registerBackInListener()
+	{
+		return registerBackInListener;
+	}
+
+	private boolean _registerBackInListener()
 	{
 		return config.getBoolean("register-back-in-listener", false);
 	}
+	private boolean disableItemPickupWhileAfk;

 	@Override
 	public boolean getDisableItemPickupWhileAfk()
 	{
-		return config.getBoolean("disable-item-pickup-while-afk", true);
+		return disableItemPickupWhileAfk;
+	}
+
+	private boolean _getDisableItemPickupWhileAfk()
+	{
+		return config.getBoolean("disable-item-pickup-while-afk", false);
 	}

 	@Override
@@ -669,4 +873,86 @@ public class Settings implements ISettings
 	{
 		return config.getLong("tpa-accept-cancellation", 0);
 	}
+
+	@Override
+	public boolean isMetricsEnabled()
+	{
+		return metricsEnabled;
+	}
+
+	@Override
+	public void setMetricsEnabled(boolean metricsEnabled)
+	{
+		this.metricsEnabled = metricsEnabled;
+	}
+	private boolean teleportInvulnerability;
+
+	@Override
+	public long getTeleportInvulnerability()
+	{
+		return config.getLong("teleport-invulnerability", 0) * 1000;
+	}
+
+	private boolean _isTeleportInvulnerability()
+	{
+		return (config.getLong("teleport-invulnerability", 0) > 0);
+	}
+
+	@Override
+	public boolean isTeleportInvulnerability()
+	{
+		return teleportInvulnerability;
+	}
+	private long loginAttackDelay;
+
+	private long _getLoginAttackDelay()
+	{
+		return config.getLong("login-attack-delay", 0) * 1000;
+	}
+
+	@Override
+	public long getLoginAttackDelay()
+	{
+		return loginAttackDelay;
+	}
+	private int signUsePerSecond;
+
+	private int _getSignUsePerSecond()
+	{
+		final int perSec = config.getInt("sign-use-per-second", 4);
+		return perSec > 0 ? perSec : 1;
+	}
+
+	@Override
+	public int getSignUsePerSecond()
+	{
+		return signUsePerSecond;
+	}
+
+	@Override
+	public double getMaxFlySpeed()
+	{
+		double maxSpeed = config.getDouble("max-fly-speed", 1.0);
+		return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
+	}
+
+	//This option does not exist in the config.yml because it wasn't yet implemented in bukkit
+	//The code was commented out in the /speed command
+	@Override
+	public double getMaxWalkSpeed()
+	{
+		double maxSpeed = config.getDouble("max-walk-speed", 0.8);
+		return maxSpeed > 1.0 ? 1.0 : Math.abs(maxSpeed);
+	}
+	
+	private int mailsPerMinute;
+
+	private int _getMailsPerMinute() {
+		return config.getInt("mails-per-minute", 1000);
+	}
+	@Override
+	public int getMailsPerMinute()
+	{
+		return mailsPerMinute;
+	}
 }
@@ -1,6 +1,5 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.craftbukkit.FakeExplosion;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -46,8 +45,12 @@ public class TNTExplodeListener implements Listener, Runnable
 		{
 			return;
 		}
-		FakeExplosion.createExplosion(event, ess.getServer(), ess.getServer().getOnlinePlayers());
+		if (event.blockList().size() < 1)
+		{
+			return;
+		}
 		event.setCancelled(true);
+		event.getLocation().getWorld().createExplosion(event.getLocation(), 0F);
 	}

 	@Override
@@ -1,13 +1,11 @@
 package com.earth2me.essentials;

-import com.earth2me.essentials.api.ITeleport;
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import com.earth2me.essentials.api.ITeleport;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
 import org.bukkit.Location;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -18,36 +16,38 @@ public class Teleport implements Runnable, ITeleport
 	private static final double MOVE_CONSTANT = 0.3;


-	private static class Target
+	private class Target
 	{
 		private final Location location;
-		private final Entity entity;
+		private final String name;

-		public Target(Location location)
+		Target(Location location)
 		{
 			this.location = location;
-			this.entity = null;
+			this.name = null;
 		}

-		public Target(Entity entity)
+		Target(Player entity)
 		{
-			this.entity = entity;
+			this.name = entity.getName();
 			this.location = null;
 		}

 		public Location getLocation()
 		{
-			if (this.entity != null)
+			if (this.name != null)
 			{
-				return this.entity.getLocation();
+
+				return ess.getServer().getPlayerExact(name).getLocation();
 			}
 			return location;
 		}
 	}
 	private IUser user;
+	private IUser teleportUser;
 	private int teleTimer = -1;
 	private long started;	// time this task was initiated
-	private long delay;		// how long to delay the teleport
+	private long tpdelay;		// how long to delay the teleport
 	private int health;
 	// note that I initially stored a clone of the location for reference, but...
 	// when comparing locations, I got incorrect mismatches (rounding errors, looked like)
@@ -62,13 +62,19 @@ public class Teleport implements Runnable, ITeleport
 	private TeleportCause cause;

 	private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
+	{
+		initTimer(delay, user, target, chargeFor, cause);
+	}
+
+	private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause)
 	{
 		this.started = System.currentTimeMillis();
-		this.delay = delay;
-		this.health = user.getHealth();
-		this.initX = Math.round(user.getLocation().getX() * MOVE_CONSTANT);
-		this.initY = Math.round(user.getLocation().getY() * MOVE_CONSTANT);
-		this.initZ = Math.round(user.getLocation().getZ() * MOVE_CONSTANT);
+		this.tpdelay = delay;
+		this.health = teleportUser.getHealth();
+		this.initX = Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT);
+		this.initY = Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT);
+		this.initZ = Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT);
+		this.teleportUser = teleportUser;
 		this.teleportTarget = target;
 		this.chargeFor = chargeFor;
 		this.cause = cause;
@@ -80,31 +86,38 @@ public class Teleport implements Runnable, ITeleport

 		if (user == null || !user.isOnline() || user.getLocation() == null)
 		{
-			cancel();
+			cancel(false);
 			return;
 		}
-		if (Math.round(user.getLocation().getX() * MOVE_CONSTANT) != initX
-			|| Math.round(user.getLocation().getY() * MOVE_CONSTANT) != initY
-			|| Math.round(user.getLocation().getZ() * MOVE_CONSTANT) != initZ
-			|| user.getHealth() < health)
-		{	// user moved, cancel teleport
+		if (teleportUser == null || !teleportUser.isOnline() || teleportUser.getLocation() == null)
+		{
+			cancel(false);
+			return;
+		}
+
+		if (!user.isAuthorized("essentials.teleport.timer.move")
+			&& (Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT) != initX
+				|| Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT) != initY
+				|| Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT) != initZ
+				|| teleportUser.getHealth() < health))
+		{
+			// user moved, cancel teleport
 			cancel(true);
 			return;
 		}
-
-		health = user.getHealth();  // in case user healed, then later gets injured
-
+		health = teleportUser.getHealth();  // in case user healed, then later gets injured
 		long now = System.currentTimeMillis();
-		if (now > started + delay)
+		if (now > started + tpdelay)
 		{
 			try
 			{
 				cooldown(false);
-				user.sendMessage(_("teleportationCommencing"));
+				teleportUser.sendMessage(_("teleportationCommencing"));
 				try
 				{

-					now(teleportTarget, cause);
+					teleportUser.getTeleport().now(teleportTarget, cause);
+					cancel(false);
 					if (chargeFor != null)
 					{
 						chargeFor.charge(user);
@@ -118,6 +131,10 @@ public class Teleport implements Runnable, ITeleport
 			catch (Exception ex)
 			{
 				user.sendMessage(_("cooldownWithMessage", ex.getMessage()));
+				if (user != teleportUser)
+				{
+					teleportUser.sendMessage(_("cooldownWithMessage", ex.getMessage()));
+				}
 			}
 		}
 	}
@@ -128,44 +145,45 @@ public class Teleport implements Runnable, ITeleport
 		this.ess = ess;
 	}

-	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		final Player player = user.getBase();
-		final Location bed = player.getBedSpawnLocation();
-		final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, bed == null ? player.getWorld().getSpawnLocation() : bed, bed != null);
-		ess.getServer().getPluginManager().callEvent(pre);
-		teleport(new Target(pre.getRespawnLocation()), chargeFor, cause);
-	}
-
-	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
-	{
-		Location loc = ess.getWarps().getWarp(warp);
-		teleport(new Target(loc), chargeFor, cause);
-		user.sendMessage(_("warpingTo", warp));
-	}
-
 	public void cooldown(boolean check) throws Exception
 	{
-		Calendar now = new GregorianCalendar();
+		final Calendar time = new GregorianCalendar();
 		if (user.getLastTeleportTimestamp() > 0)
 		{
-			double cooldown = ess.getSettings().getTeleportCooldown();
-			Calendar cooldownTime = new GregorianCalendar();
-			cooldownTime.setTimeInMillis(user.getLastTeleportTimestamp());
-			cooldownTime.add(Calendar.SECOND, (int)cooldown);
-			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
-			if (cooldownTime.after(now) && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+			// Take the current time, and remove the delay from it.
+			final double cooldown = ess.getSettings().getTeleportCooldown();
+			final Calendar earliestTime = new GregorianCalendar();
+			earliestTime.add(Calendar.SECOND, -(int)cooldown);
+			earliestTime.add(Calendar.MILLISECOND, -(int)((cooldown * 1000.0) % 1000.0));
+			// This value contains the most recent time a teleport could have been used that would allow another use.
+			final long earliestLong = earliestTime.getTimeInMillis();
+
+			// When was the last teleport used?
+			final Long lastTime = user.getLastTeleportTimestamp();
+
+			if (lastTime > time.getTimeInMillis())
 			{
-				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(cooldownTime.getTimeInMillis())));
+				// This is to make sure time didn't get messed up on last kit use.
+				// If this happens, let's give the user the benifit of the doubt.
+				user.setLastTeleportTimestamp(time.getTimeInMillis());
+				return;
+			}
+			else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+			{
+				time.setTimeInMillis(lastTime);
+				time.add(Calendar.SECOND, (int)cooldown);
+				time.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
+				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
 			}
 		}
 		// if justCheck is set, don't update lastTeleport; we're just checking
 		if (!check)
 		{
-			user.setLastTeleportTimestamp(now.getTimeInMillis());
+			user.setLastTeleportTimestamp(time.getTimeInMillis());
 		}
 	}

+	//If we need to cancel a pending teleport call this method
 	public void cancel(boolean notifyUser)
 	{
 		if (teleTimer == -1)
@@ -178,6 +196,10 @@ public class Teleport implements Runnable, ITeleport
 			if (notifyUser)
 			{
 				user.sendMessage(_("pendingTeleportCancelled"));
+				if (teleportUser != user)
+				{
+					teleportUser.sendMessage(_("pendingTeleportCancelled"));
+				}
 			}
 		}
 		finally
@@ -186,22 +208,46 @@ public class Teleport implements Runnable, ITeleport
 		}
 	}

-	public void cancel()
+	//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
+	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
 	{
-		cancel(false);
-	}
-	
-	public void teleport(Location loc, Trade chargeFor) throws Exception
-	{
-		teleport(new Target(loc), chargeFor, TeleportCause.PLUGIN);
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		now(new Target(loc), cause);
 	}

+	public void now(Player entity, boolean cooldown, TeleportCause cause) throws Exception
+	{
+		if (cooldown)
+		{
+			cooldown(false);
+		}
+		now(new Target(entity), cause);
+	}
+
+	private void now(Target target, TeleportCause cause) throws Exception
+	{
+		cancel(false);
+		user.setLastLocation();
+		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), cause);
+	}
+
+	//The teleport function is used when you want to normally teleport someone to a location or player.
+	//This method is nolonger used internally and will be removed.
+	@Deprecated
+	public void teleport(Location loc, Trade chargeFor) throws Exception
+	{
+		teleport(loc, chargeFor, TeleportCause.PLUGIN);
+	}
+		
 	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		teleport(new Target(loc), chargeFor, cause);
 	}

-	public void teleport(Entity entity, Trade chargeFor, TeleportCause cause) throws Exception
+	public void teleport(Player entity, Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		teleport(new Target(entity), chargeFor, cause);
 	}
@@ -226,65 +272,84 @@ public class Teleport implements Runnable, ITeleport
 			return;
 		}

-		cancel();
-		Calendar c = new GregorianCalendar();
-		c.add(Calendar.SECOND, (int)delay);
-		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
-		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
+		cancel(false);
+		warnUser(user, delay);
 		initTimer((long)(delay * 1000.0), target, chargeFor, cause);

 		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
 	}

-	private void now(Target target, TeleportCause cause) throws Exception
+	//The teleportToMe function is a wrapper used to handle teleporting players to them, like /tphere
+	public void teleportToMe(User otherUser, Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		cancel();
-		user.setLastLocation();
-		user.getBase().teleport(Util.getSafeDestination(target.getLocation()), cause);
-	}
+		Target target = new Target(user);

-	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
+		double delay = ess.getSettings().getTeleportDelay();
+
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(user);
+		}
+		cooldown(true);
+		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
 		{
 			cooldown(false);
+			otherUser.getTeleport().now(target, cause);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(user);
+			}
+			return;
 		}
-		now(new Target(loc), cause);
+
+		cancel(false);
+		warnUser(otherUser, delay);
+		initTimer((long)(delay * 1000.0), otherUser, target, chargeFor, cause);
+
+		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
 	}

-	public void now(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
+	private void warnUser(final IUser user, final double delay)
 	{
-		cooldown(false);
-		chargeFor.charge(user);
-		now(new Target(loc), cause);
+		Calendar c = new GregorianCalendar();
+		c.add(Calendar.SECOND, (int)delay);
+		c.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+		user.sendMessage(_("dontMoveMessage", Util.formatDateDiff(c.getTimeInMillis())));
 	}

-	public void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception
+	//The respawn function is a wrapper used to handle tp fallback, on /jail and /home
+	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
 	{
-		if (cooldown)
-		{
-			cooldown(false);
-		}
-		now(new Target(entity), cause);
+		final Player player = user.getBase();
+		final Location bed = player.getBedSpawnLocation();
+		final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, bed == null ? player.getWorld().getSpawnLocation() : bed, bed != null);
+		ess.getServer().getPluginManager().callEvent(pre);
+		teleport(new Target(pre.getRespawnLocation()), chargeFor, cause);
 	}

+	//The warp function is a wrapper used to teleport a player to a /warp
+	public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
+	{
+		Location loc = ess.getWarps().getWarp(warp);
+		user.sendMessage(_("warpingTo", warp));
+		teleport(new Target(loc), chargeFor, cause);		
+	}
+
+	//The back function is a wrapper used to teleport a player /back to their previous location.	
 	public void back(Trade chargeFor) throws Exception
 	{
 		teleport(new Target(user.getLastLocation()), chargeFor, TeleportCause.COMMAND);
 	}

+	//This function is used to throw a user back after a jail sentence
 	public void back() throws Exception
 	{
 		now(new Target(user.getLastLocation()), TeleportCause.COMMAND);
 	}

-	public void home(IUser user, String home, Trade chargeFor) throws Exception
+	//This function handles teleporting to /home
+	public void home(Location loc, Trade chargeFor) throws Exception
 	{
-		final Location loc = user.getHome(home);
-		if (loc == null)
-		{
-			throw new NotEnoughArgumentsException();
-		}
 		teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);
 	}
 }
@@ -1,8 +1,8 @@
 package com.earth2me.essentials;

+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.craftbukkit.SetExpFix;
-import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -20,6 +20,7 @@ import org.bukkit.inventory.ItemStack;
 public class Trade
 {
 	private final transient String command;
+	private final transient Trade fallbackTrade;
 	private final transient Double money;
 	private final transient ItemStack itemStack;
 	private final transient Integer exp;
@@ -27,27 +28,33 @@ public class Trade

 	public Trade(final String command, final IEssentials ess)
 	{
-		this(command, null, null, null, ess);
+		this(command, null, null, null, null, ess);
+	}
+
+	public Trade(final String command, final Trade fallback, final IEssentials ess)
+	{
+		this(command, fallback, null, null, null, ess);
 	}

 	public Trade(final double money, final IEssentials ess)
 	{
-		this(null, money, null, null, ess);
+		this(null, null, money, null, null, ess);
 	}

 	public Trade(final ItemStack items, final IEssentials ess)
 	{
-		this(null, null, items, null, ess);
+		this(null, null, null, items, null, ess);
 	}

 	public Trade(final int exp, final IEssentials ess)
 	{
-		this(null, null, null, exp, ess);
+		this(null, null, null, null, exp, ess);
 	}

-	private Trade(final String command, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
+	private Trade(final String command, final Trade fallback, final Double money, final ItemStack item, final Integer exp, final IEssentials ess)
 	{
 		this.command = command;
+		this.fallbackTrade = fallback;
 		this.money = money;
 		this.itemStack = item;
 		this.exp = exp;
@@ -56,11 +63,15 @@ public class Trade

 	public void isAffordableFor(final IUser user) throws ChargeException
 	{
-		final double mon = user.getMoney();
+
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
+		}
+
 		if (getMoney() != null
-			&& mon < getMoney()
 			&& getMoney() > 0
-			&& !user.isAuthorized("essentials.eco.loan"))
+			&& !user.canAfford(getMoney()))
 		{
 			throw new ChargeException(_("notEnoughMoney"));
 		}
@@ -71,12 +82,10 @@ public class Trade
 			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 		}

+		double money;
 		if (command != null && !command.isEmpty()
-			&& !user.isAuthorized("essentials.nocommandcost.all")
-			&& !user.isAuthorized("essentials.nocommandcost." + command)
-			&& mon < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
-			&& 0 < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
-			&& !user.isAuthorized("essentials.eco.loan"))
+			&& 0 < (money = getCommandCost(user))
+			&& !user.canAfford(money))
 		{
 			throw new ChargeException(_("notEnoughMoney"));
 		}
@@ -141,10 +150,14 @@ public class Trade

 	public void charge(final IUser user) throws ChargeException
 	{
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "charging user " + user.getName());
+		}
+
 		if (getMoney() != null)
 		{
-			final double mon = user.getMoney();
-			if (mon < getMoney() && getMoney() > 0 && !user.isAuthorized("essentials.eco.loan"))
+			if (!user.canAfford(getMoney()) && getMoney() > 0.0d)
 			{
 				throw new ChargeException(_("notEnoughMoney"));
 			}
@@ -159,13 +172,10 @@ public class Trade
 			InventoryWorkaround.removeItem(user.getInventory(), true, true, getItemStack());
 			user.updateInventory();
 		}
-		if (command != null && !command.isEmpty()
-			&& !user.isAuthorized("essentials.nocommandcost.all")
-			&& !user.isAuthorized("essentials.nocommandcost." + command))
+		if (command != null)
 		{
-			final double mon = user.getMoney();
-			final double cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (mon < cost && cost > 0 && !user.isAuthorized("essentials.eco.loan"))
+			final double cost = getCommandCost(user);
+			if (!user.canAfford(cost) && cost > 0.0d)
 			{
 				throw new ChargeException(_("notEnoughMoney"));
 			}
@@ -196,11 +206,39 @@ public class Trade
 	{
 		return exp;
 	}
+
+	public Double getCommandCost(final IUser user)
+	{
+		double cost = 0.0d;
+		if (command != null && !command.isEmpty())
+		{
+			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
+			if (cost == 0.0d && fallbackTrade != null)
+			{
+				cost = fallbackTrade.getCommandCost(user);
+			}
+
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.INFO, "calculated command (" + command + ") cost for " + user.getName() + " as " + cost);
+			}
+		}
+		if (cost != 0.0d && (user.isAuthorized("essentials.nocommandcost.all")
+							 || user.isAuthorized("essentials.nocommandcost." + command)))
+		{
+			return 0.0d;
+		}
+		return cost;
+	}
 	private static FileWriter fw = null;

 	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
 	{
-		if (!ess.getSettings().isEcoLogEnabled())
+		//isEcoLogUpdateEnabled() - This refers to log entries with no location, ie API updates #EasterEgg
+		//isEcoLogEnabled() - This refers to log entries with with location, ie /pay /sell and eco signs.
+		
+		if ((loc == null && !ess.getSettings().isEcoLogUpdateEnabled())
+			|| (loc != null && !ess.getSettings().isEcoLogEnabled()))
 		{
 			return;
 		}
@@ -11,6 +11,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;


 public class User extends UserData implements Comparable<User>, IReplyTo, IUser
@@ -18,12 +19,17 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	private CommandSender replyTo = null;
 	private transient User teleportRequester;
 	private transient boolean teleportRequestHere;
+	private transient boolean vanished;
 	private transient final Teleport teleport;
 	private transient long teleportRequestTime;
 	private transient long lastOnlineActivity;
+	private transient long lastThrottledAction;
 	private transient long lastActivity = System.currentTimeMillis();
 	private boolean hidden = false;
+	private boolean rightClickJump = false;
 	private transient Location afkPosition = null;
+	private boolean invSee = false;
+	private boolean enderSee = false;
 	private static final Logger logger = Logger.getLogger("Minecraft");

 	User(final Player base, final IEssentials ess)
@@ -57,22 +63,44 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	@Override
 	public boolean isAuthorized(final String node)
 	{
+		final boolean result = isAuthorizedCheck(node);
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "checking if " + base.getName() + " has " + node + " - " + result);
+		}
+		return result;
+	}
+	
+	private boolean isAuthorizedCheck(final String node) 
+	{
+
 		if (base instanceof OfflinePlayer)
 		{
 			return false;
 		}

-		if (isOp())
-		{
-			return true;
-		}
-
 		if (isJailed())
 		{
 			return false;
 		}

-		return ess.getPermissionsHandler().hasPermission(base, node);
+		try
+		{
+			return ess.getPermissionsHandler().hasPermission(base, node);
+		}
+		catch (Exception ex)
+		{
+			if (ess.getSettings().isDebug())
+			{
+				ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage(), ex);
+			}
+			else
+			{
+				ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage());
+			}
+
+			return false;
+		}
 	}

 	public void healCooldown() throws Exception
@@ -101,21 +129,21 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser

 	public void giveMoney(final double value, final CommandSender initiator)
 	{
-		if (value == 0)
+		if (value == 0.0d)
 		{
 			return;
 		}
 		setMoney(getMoney() + value);
-		sendMessage(_("addedToAccount", Util.formatCurrency(value, ess)));
+		sendMessage(_("addedToAccount", Util.displayCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage(_("addedToOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
+			initiator.sendMessage(_("addedToOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
 		}
 	}

 	public void payUser(final User reciever, final double value) throws Exception
 	{
-		if (value == 0)
+		if (value == 0.0d)
 		{
 			return;
 		}
@@ -123,8 +151,8 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		{
 			setMoney(getMoney() - value);
 			reciever.setMoney(reciever.getMoney() + value);
-			sendMessage(_("moneySentTo", Util.formatCurrency(value, ess), reciever.getDisplayName()));
-			reciever.sendMessage(_("moneyRecievedFrom", Util.formatCurrency(value, ess), getDisplayName()));
+			sendMessage(_("moneySentTo", Util.displayCurrency(value, ess), reciever.getDisplayName()));
+			reciever.sendMessage(_("moneyRecievedFrom", Util.displayCurrency(value, ess), getDisplayName()));
 		}
 		else
 		{
@@ -140,22 +168,36 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser

 	public void takeMoney(final double value, final CommandSender initiator)
 	{
-		if (value == 0)
+		if (value == 0.0d)
 		{
 			return;
 		}
 		setMoney(getMoney() - value);
-		sendMessage(_("takenFromAccount", Util.formatCurrency(value, ess)));
+		sendMessage(_("takenFromAccount", Util.displayCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage(_("takenFromOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
+			initiator.sendMessage(_("takenFromOthersAccount", Util.displayCurrency(value, ess), this.getDisplayName(), Util.displayCurrency(getMoney(), ess)));
 		}
 	}

+	@Override
 	public boolean canAfford(final double cost)
 	{
+		return canAfford(cost, true);
+	}
+
+	public boolean canAfford(final double cost, final boolean permcheck)
+	{
+		if (cost <= 0.0d)
+		{
+			return true;
+		}
 		final double mon = getMoney();
-		return mon >= cost || isAuthorized("essentials.eco.loan");
+		if (!permcheck || isAuthorized("essentials.eco.loan"))
+		{
+			return (mon - cost) >= ess.getSettings().getMinMoney();
+		}
+		return cost <= mon;
 	}

 	public void dispose()
@@ -178,7 +220,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	@Override
 	public int compareTo(final User other)
 	{
-		return Util.stripColor(this.getDisplayName()).compareToIgnoreCase(Util.stripColor(other.getDisplayName()));
+		return Util.stripFormat(this.getDisplayName()).compareToIgnoreCase(Util.stripFormat(other.getDisplayName()));
 	}

 	@Override
@@ -208,16 +250,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		return getHome(getHomes().get(0));
 	}

-	public void setHome()
-	{
-		setHome("home", getLocation());
-	}
-
-	public void setHome(final String name)
-	{
-		setHome(name, getLocation());
-	}
-
 	@Override
 	public void setLastLocation()
 	{
@@ -236,92 +268,109 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		return teleportRequester;
 	}

-	public boolean isTeleportRequestHere()
+	public boolean isTpRequestHere()
 	{
 		return teleportRequestHere;
 	}

-	public String getNick(boolean addprefixsuffix)
+	public String getNick(final boolean longnick)
 	{
-		final StringBuilder nickname = new StringBuilder();
+		final StringBuilder prefix = new StringBuilder();
+		String nickname;
+		String suffix = "";
 		final String nick = getNickname();
 		if (ess.getSettings().isCommandDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
 		{
-			nickname.append(getName());
+			nickname = getName();
 		}
 		else
 		{
-			nickname.append(ess.getSettings().getNicknamePrefix()).append(nick);
+			nickname = ess.getSettings().getNicknamePrefix() + nick;
 		}
+
 		if (isOp())
 		{
 			try
 			{
-				nickname.insert(0, ess.getSettings().getOperatorColor().toString());
-				nickname.append("§f");
+				final ChatColor opPrefix = ess.getSettings().getOperatorColor();
+				if (opPrefix != null && opPrefix.toString().length() > 0)
+				{
+					prefix.insert(0, opPrefix.toString());
+					suffix = "§r";
+				}
 			}
 			catch (Exception e)
 			{
 			}
 		}

-		if (addprefixsuffix && ess.getSettings().addPrefixSuffix())
+		if (ess.getSettings().addPrefixSuffix())
 		{
+			//These two extra toggles are not documented, because they are mostly redundant #EasterEgg
 			if (!ess.getSettings().disablePrefix())
 			{
-				final String prefix = ess.getPermissionsHandler().getPrefix(base).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
-				nickname.insert(0, prefix);
+				final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', '§');
+				prefix.insert(0, ptext);
+				suffix = "§r";
 			}
 			if (!ess.getSettings().disableSuffix())
 			{
-				final String suffix = ess.getPermissionsHandler().getSuffix(base).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
-				nickname.append(suffix);
-				if (suffix.length() < 2 || !suffix.substring(suffix.length() - 2, suffix.length() - 1).equals("§"))
-				{
-					nickname.append("§f");
-				}
-			}
-			else
-			{
-				nickname.append("§f");
+				final String stext = ess.getPermissionsHandler().getSuffix(base).replace('&', '§');
+				suffix = stext + "§r";
+				suffix = suffix.replace("§f§f", "§f").replace("§f§r", "§r").replace("§r§r", "§r");
 			}
 		}
-
-		return nickname.toString();
+		final String strPrefix = prefix.toString();
+		String output = strPrefix + nickname + suffix;
+		if (!longnick && output.length() > 16)
+		{
+			output = strPrefix + nickname;
+		}
+		if (!longnick && output.length() > 16)
+		{
+			output = Util.lastCode(strPrefix) + nickname;
+		}
+		if (!longnick && output.length() > 16)
+		{
+			output = Util.lastCode(strPrefix) + nickname.substring(0, 14);
+		}
+		if (output.charAt(output.length() - 1) == '§')
+		{
+			output = output.substring(0, output.length() - 1);
+		}
+		return output;
 	}

 	public void setDisplayNick()
 	{
-		String name = getNick(true);
-		setDisplayName(name);
-		if (name.length() > 16)
+		if (base.isOnline() && ess.getSettings().changeDisplayName())
 		{
-			name = getNick(false);
-		}
-		if (name.length() > 16)
-		{
-			name = name.substring(0, name.charAt(15) == '§' ? 15 : 16);
-		}
-		try
-		{
-			setPlayerListName(name);
-		}
-		catch (IllegalArgumentException e)
-		{
-			logger.log(Level.INFO, "Playerlist for " + name + " was not updated. Use a shorter displayname prefix.");
+			setDisplayName(getNick(true));
+			if (ess.getSettings().changePlayerListName())
+			{
+				String name = getNick(false);
+				try
+				{
+					setPlayerListName(name);
+				}
+				catch (IllegalArgumentException e)
+				{
+					if (ess.getSettings().isDebug())
+					{
+						logger.log(Level.INFO, "Playerlist for " + name + " was not updated. Name clashed with another online player.");
+					}
+				}
+			}
 		}
 	}

 	@Override
 	public String getDisplayName()
 	{
-		if (!(base instanceof OfflinePlayer) && ess.getSettings().changeDisplayName())
-		{
-			setDisplayNick();
-		}
 		return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
 	}

+	@Override
 	public Teleport getTeleport()
 	{
 		return teleport;
@@ -379,6 +428,15 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			}
 		}
 		super.setMoney(value);
+		Trade.log("Update", "Set", "API", getName(), new Trade(value, ess), null, null, null, ess);
+	}
+
+	public void updateMoneyCache(final double value)
+	{
+		if (ess.getPaymentMethod().hasMethod() && super.getMoney() != value)
+		{
+			super.setMoney(value);
+		}
 	}

 	@Override
@@ -413,6 +471,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	public void setHidden(final boolean hidden)
 	{
 		this.hidden = hidden;
+		if (hidden == true)
+		{
+			setLastLogout(getLastOnlineActivity());
+		}
 	}

 	//Returns true if status expired during this check
@@ -430,6 +492,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			}
 			catch (Exception ex)
 			{
+				try
+				{
+					getTeleport().respawn(null, TeleportCause.PLUGIN);
+				}
+				catch (Exception ex1)
+				{
+				}
 			}
 			return true;
 		}
@@ -468,6 +537,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			setAfk(false);
 			if (broadcast && !isHidden())
 			{
+				setDisplayNick();
 				ess.broadcastMessage(this, _("userIsNotAway", getDisplayName()));
 			}
 		}
@@ -495,11 +565,12 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			}
 		}
 		final long autoafk = ess.getSettings().getAutoAfk();
-		if (!isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && isAuthorized("essentials.afk"))
+		if (!isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && isAuthorized("essentials.afk.auto"))
 		{
 			setAfk(true);
 			if (!isHidden())
 			{
+				setDisplayNick();
 				ess.broadcastMessage(this, _("userIsAway", getDisplayName()));
 			}
 		}
@@ -510,16 +581,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		return afkPosition;
 	}

-	@Override
-	public boolean toggleGodModeEnabled()
-	{
-		if (!isGodModeEnabled())
-		{
-			setFoodLevel(20);
-		}
-		return super.toggleGodModeEnabled();
-	}
-
 	@Override
 	public boolean isGodModeEnabled()
 	{
@@ -532,6 +593,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		return super.isGodModeEnabled();
 	}

+	@Override
 	public String getGroup()
 	{
 		return ess.getPermissionsHandler().getGroup(base);
@@ -555,4 +617,116 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	{
 		return teleportRequestTime;
 	}
+
+	public boolean isInvSee()
+	{
+		return invSee;
+	}
+
+	public void setInvSee(final boolean set)
+	{
+		invSee = set;
+	}
+
+	public boolean isEnderSee()
+	{
+		return enderSee;
+	}
+
+	public void setEnderSee(final boolean set)
+	{
+		enderSee = set;
+	}
+	private transient long teleportInvulnerabilityTimestamp = 0;
+
+	public void enableInvulnerabilityAfterTeleport()
+	{
+		final long time = ess.getSettings().getTeleportInvulnerability();
+		if (time > 0)
+		{
+			teleportInvulnerabilityTimestamp = System.currentTimeMillis() + time;
+		}
+	}
+
+	public void resetInvulnerabilityAfterTeleport()
+	{
+		if (teleportInvulnerabilityTimestamp != 0
+			&& teleportInvulnerabilityTimestamp < System.currentTimeMillis())
+		{
+			teleportInvulnerabilityTimestamp = 0;
+		}
+	}
+
+	public boolean hasInvulnerabilityAfterTeleport()
+	{
+		return teleportInvulnerabilityTimestamp != 0 && teleportInvulnerabilityTimestamp >= System.currentTimeMillis();
+	}
+
+	public boolean isVanished()
+	{
+		return vanished;
+	}
+
+	public void setVanished(final boolean set)
+	{
+		vanished = set;
+		if (set)
+		{
+			for (Player p : ess.getServer().getOnlinePlayers())
+			{
+				if (!ess.getUser(p).isAuthorized("essentials.vanish.see"))
+				{
+					p.hidePlayer(getBase());
+				}
+			}
+			setHidden(true);
+			ess.getVanishedPlayers().add(getName());
+		}
+		else
+		{
+			for (Player p : ess.getServer().getOnlinePlayers())
+			{
+				p.showPlayer(getBase());
+			}
+			setHidden(false);
+			ess.getVanishedPlayers().remove(getName());
+		}
+	}
+
+	public void toggleVanished()
+	{
+		final boolean set = !vanished;
+		this.setVanished(set);
+	}
+
+	public boolean checkSignThrottle()
+	{
+		if (isSignThrottled())
+		{
+			return true;
+		}
+		updateThrottle();
+		return false;
+	}
+
+	public boolean isSignThrottled()
+	{
+		final long minTime = lastThrottledAction + (1000 / ess.getSettings().getSignUsePerSecond());
+		return (System.currentTimeMillis() < minTime);
+	}
+
+	public void updateThrottle()
+	{
+		lastThrottledAction = System.currentTimeMillis();;
+	}
+
+	public boolean isFlyClickJump()
+	{
+		return rightClickJump;
+	}
+
+	public void setRightClickJump(boolean rightClickJump)
+	{
+		this.rightClickJump = rightClickJump;
+	}
 }
@@ -1,10 +1,11 @@
 package com.earth2me.essentials;

+import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.util.*;
-import java.util.logging.Logger;
 import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

@@ -12,14 +13,14 @@ import org.bukkit.inventory.ItemStack;
 public abstract class UserData extends PlayerExtension implements IConf
 {
 	protected final transient IEssentials ess;
-	private final EssentialsConf config;
-	private static final Logger logger = Logger.getLogger("Minecraft");
+	private EssentialsConf config;
+	private final File folder;

 	protected UserData(Player base, IEssentials ess)
 	{
 		super(base);
 		this.ess = ess;
-		File folder = new File(ess.getDataFolder(), "userdata");
+		folder = new File(ess.getDataFolder(), "userdata");
 		if (!folder.exists())
 		{
 			folder.mkdirs();
@@ -28,6 +29,13 @@ public abstract class UserData extends PlayerExtension implements IConf
 		reloadConfig();
 	}

+	public final void reset()
+	{
+		config.getFile().delete();
+		config = new EssentialsConf(new File(folder, Util.sanitizeFileName(base.getName()) + ".yml"));
+		reloadConfig();
+	}
+
 	@Override
 	public final void reloadConfig()
 	{
@@ -41,10 +49,9 @@ public abstract class UserData extends PlayerExtension implements IConf
 		lastHealTimestamp = _getLastHealTimestamp();
 		jail = _getJail();
 		mails = _getMails();
-		savedInventory = _getSavedInventory();
 		teleportEnabled = getTeleportEnabled();
 		ignoredPlayers = getIgnoredPlayers();
-		godmode = getGodModeEnabled();
+		godmode = _getGodModeEnabled();
 		muted = getMuted();
 		muteTimeout = _getMuteTimeout();
 		jailed = getJailed();
@@ -58,6 +65,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 		isNPC = _isNPC();
 		arePowerToolsEnabled = _arePowerToolsEnabled();
 		kitTimestamps = _getKitTimestamps();
+		nickname = _getNickname();
 	}
 	private double money;

@@ -94,39 +102,32 @@ public abstract class UserData extends PlayerExtension implements IConf

 	private Map<String, Object> _getHomes()
 	{
-		Object o = config.getProperty("homes");
-
-		if (o instanceof Map)
+		if (config.isConfigurationSection("homes"))
 		{
-			return (Map<String, Object>)o;
+			return config.getConfigurationSection("homes").getValues(false);
 		}
-		else
-		{
-			return new HashMap<String, Object>();
-		}
-
+		return new HashMap<String, Object>();
 	}

-	public Location getHome(String name) throws Exception
+	private String getHomeName(String search)
 	{
-		Location loc = config.getLocation("homes." + name, getServer());
-		if (loc == null)
+		if (Util.isInt(search))
 		{
 			try
 			{
-				loc = config.getLocation("homes." + getHomes().get(Integer.parseInt(name) - 1), getServer());
+				search = getHomes().get(Integer.parseInt(search) - 1);
 			}
-			catch (IndexOutOfBoundsException e)
+			catch (Exception e)
 			{
-				return null;
-			}
-			catch (NumberFormatException e)
-			{
-				return null;
 			}
 		}
-
-		return loc;
+		return search;
+	}
+		
+	public Location getHome(String name) throws Exception
+	{
+		String search = getHomeName(name);
+		return config.getLocation("homes." + search, getServer());	
 	}

 	public Location getHome(final Location world)
@@ -154,13 +155,13 @@ public abstract class UserData extends PlayerExtension implements IConf

 	public List<String> getHomes()
 	{
-		return new ArrayList(homes.keySet());
+		return new ArrayList<String>(homes.keySet());
 	}

 	public void setHome(String name, Location loc)
 	{
 		//Invalid names will corrupt the yaml
-		name = Util.sanitizeFileName(name);
+		name = Util.safeString(name);
 		homes.put(name, loc);
 		config.setProperty("homes." + name, loc);
 		config.save();
@@ -168,21 +169,20 @@ public abstract class UserData extends PlayerExtension implements IConf

 	public void delHome(String name) throws Exception
 	{
-		String search = name;
+		String search = getHomeName(name);
 		if (!homes.containsKey(search))
 		{
-			search = Util.sanitizeFileName(name);
+			search = Util.safeString(search);
 		}
 		if (homes.containsKey(search))
 		{
-			homes.remove(name);
-			config.removeProperty("homes." + name);
+			homes.remove(search);
+			config.removeProperty("homes." + search);
 			config.save();
 		}
 		else
 		{
-			//TODO: move this message to messages file
-			throw new Exception("Home " + name + " doesn't exist");
+			throw new Exception(_("invalidHome", search));
 		}
 	}

@@ -194,14 +194,21 @@ public abstract class UserData extends PlayerExtension implements IConf
 		}
 		return false;
 	}
+	private String nickname;

-	public String getNickname()
+	public String _getNickname()
 	{
 		return config.getString("nickname");
 	}

+	public String getNickname()
+	{
+		return nickname;
+	}
+
 	public void setNickname(String nick)
 	{
+		nickname = nick;
 		config.setProperty("nickname", nick);
 		config.save();
 	}
@@ -235,22 +242,15 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("unlimited", unlimited);
 		config.save();
 	}
-	private Map<Integer, Object> powertools;
+	private Map<String, Object> powertools;

-	@SuppressWarnings("unchecked")
-	private Map<Integer, Object> _getPowertools()
+	private Map<String, Object> _getPowertools()
 	{
-		Object o = config.getProperty("powertools");
-
-		if (o instanceof Map)
+		if (config.isConfigurationSection("powertools"))
 		{
-			return (Map<Integer, Object>)o;
+			return config.getConfigurationSection("powertools").getValues(false);
 		}
-		else
-		{
-			return new HashMap<Integer, Object>();
-		}
-
+		return new HashMap<String, Object>();
 	}

 	public void clearAllPowertools()
@@ -260,25 +260,27 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.save();
 	}

+	@SuppressWarnings("unchecked")
 	public List<String> getPowertool(ItemStack stack)
 	{
-		return (List<String>)powertools.get(stack.getTypeId());
+		return (List<String>)powertools.get("" + stack.getTypeId());
 	}
-	
+
+	@SuppressWarnings("unchecked")
 	public List<String> getPowertool(int id)
 	{
-		return (List<String>)powertools.get(id);
+		return (List<String>)powertools.get("" + id);
 	}

 	public void setPowertool(ItemStack stack, List<String> commandList)
 	{
 		if (commandList == null || commandList.isEmpty())
 		{
-			powertools.remove(stack.getTypeId());
+			powertools.remove("" + stack.getTypeId());
 		}
 		else
 		{
-			powertools.put(stack.getTypeId(), commandList);
+			powertools.put("" + stack.getTypeId(), commandList);
 		}
 		config.setProperty("powertools", powertools);
 		config.save();
@@ -411,50 +413,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		mails.add(mail);
 		setMails(mails);
 	}
-	private ItemStack[] savedInventory;
-
-	public ItemStack[] getSavedInventory()
-	{
-		return savedInventory;
-	}
-
-	private ItemStack[] _getSavedInventory()
-	{
-		int size = config.getInt("inventory.size", 0);
-		if (size < 1 || (getInventory() != null && size > getInventory().getSize()))
-		{
-			return null;
-		}
-		ItemStack[] is = new ItemStack[size];
-		for (int i = 0; i < size; i++)
-		{
-			is[i] = config.getItemStack("inventory." + i);
-		}
-		return is;
-	}
-
-	public void setSavedInventory(ItemStack[] is)
-	{
-		if (is == null || is.length == 0)
-		{
-			savedInventory = null;
-			config.removeProperty("inventory");
-		}
-		else
-		{
-			savedInventory = is;
-			config.setProperty("inventory.size", is.length);
-			for (int i = 0; i < is.length; i++)
-			{
-				if (is[i] == null || is[i].getType() == Material.AIR)
-				{
-					continue;
-				}
-				config.setProperty("inventory." + i, is[i]);
-			}
-		}
-		config.save();
-	}
 	private boolean teleportEnabled;

 	private boolean getTeleportEnabled()
@@ -491,14 +449,14 @@ public abstract class UserData extends PlayerExtension implements IConf

 	public List<String> getIgnoredPlayers()
 	{
-		return config.getStringList("ignore");
+		return Collections.synchronizedList(config.getStringList("ignore"));
 	}

 	public void setIgnoredPlayers(List<String> players)
 	{
 		if (players == null || players.isEmpty())
 		{
-			ignoredPlayers = new ArrayList<String>();
+			ignoredPlayers = Collections.synchronizedList(new ArrayList<String>());
 			config.removeProperty("ignore");
 		}
 		else
@@ -509,26 +467,37 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.save();
 	}

-	public boolean isIgnoredPlayer(String name)
+	@Deprecated
+	public boolean isIgnoredPlayer(final String userName)
 	{
-		return ignoredPlayers.contains(name.toLowerCase(Locale.ENGLISH));
+		final IUser user = ess.getUser(userName);
+		if (user == null || !user.isOnline())
+		{
+			return false;
+		}
+		return isIgnoredPlayer(user);
 	}

-	public void setIgnoredPlayer(String name, boolean set)
+	public boolean isIgnoredPlayer(IUser user)
+	{
+		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isAuthorized("essentials.chat.ignoreexempt"));
+	}
+
+	public void setIgnoredPlayer(IUser user, boolean set)
 	{
 		if (set)
 		{
-			ignoredPlayers.add(name.toLowerCase(Locale.ENGLISH));
+			ignoredPlayers.add(user.getName().toLowerCase(Locale.ENGLISH));
 		}
 		else
 		{
-			ignoredPlayers.remove(name.toLowerCase(Locale.ENGLISH));
+			ignoredPlayers.remove(user.getName().toLowerCase(Locale.ENGLISH));
 		}
 		setIgnoredPlayers(ignoredPlayers);
 	}
 	private boolean godmode;

-	private boolean getGodModeEnabled()
+	private boolean _getGodModeEnabled()
 	{
 		return config.getBoolean("godmode", false);
 	}
@@ -544,16 +513,9 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("godmode", set);
 		config.save();
 	}
-
-	public boolean toggleGodModeEnabled()
-	{
-		boolean ret = !isGodModeEnabled();
-		setGodModeEnabled(ret);
-		return ret;
-	}
 	private boolean muted;

-	private boolean getMuted()
+	public boolean getMuted()
 	{
 		return config.getBoolean("muted", false);
 	}
@@ -569,13 +531,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("muted", set);
 		config.save();
 	}
-
-	public boolean toggleMuted()
-	{
-		boolean ret = !isMuted();
-		setMuted(ret);
-		return ret;
-	}
 	private long muteTimeout;

 	private long _getMuteTimeout()
@@ -645,7 +600,7 @@ public abstract class UserData extends PlayerExtension implements IConf

 	public void setBanReason(String reason)
 	{
-		config.setProperty("ban.reason", reason);
+		config.setProperty("ban.reason", Util.sanitizeString(reason));
 		config.save();
 	}

@@ -671,10 +626,19 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return lastLogin;
 	}

-	public void setLastLogin(long time)
+	private void _setLastLogin(long time)
 	{
 		lastLogin = time;
 		config.setProperty("timestamps.login", time);
+	}
+
+	public void setLastLogin(long time)
+	{
+		_setLastLogin(time);
+		if (base.getAddress() != null && base.getAddress().getAddress() != null)
+		{
+			_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
+		}
 		config.save();
 	}
 	private long lastLogout;
@@ -707,11 +671,10 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return lastLoginAddress;
 	}

-	public void setLastLoginAddress(String address)
+	private void _setLastLoginAddress(String address)
 	{
 		lastLoginAddress = address;
 		config.setProperty("ipAddress", address);
-		config.save();
 	}
 	private boolean afk;

@@ -739,7 +702,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return ret;
 	}
 	private boolean newplayer;
-
 	private String geolocation;

 	private String _getGeoLocation()
@@ -827,31 +789,44 @@ public abstract class UserData extends PlayerExtension implements IConf
 	{
 		return config.getBoolean("powertoolsenabled", true);
 	}
-	private Map<String, Object> kitTimestamps;
+	private ConfigurationSection kitTimestamps;

-	private Map<String, Object> _getKitTimestamps()
+	private ConfigurationSection _getKitTimestamps()
 	{
-		final Object map = config.getProperty("timestamps.kits");

-		if (map instanceof Map)
+		if (config.isConfigurationSection("timestamps.kits"))
 		{
-			return (Map<String, Object>)map;
-		}
-		else
-		{
-			return new HashMap<String, Object>();
+			final ConfigurationSection section = config.getConfigurationSection("timestamps.kits");
+			final ConfigurationSection newSection = new MemoryConfiguration();
+			for (String command : section.getKeys(false))
+			{
+				if (section.isLong(command))
+				{
+					newSection.set(command.toLowerCase(Locale.ENGLISH), section.getLong(command));
+				}
+				else if (section.isInt(command))
+				{
+					newSection.set(command.toLowerCase(Locale.ENGLISH), (long)section.getInt(command));
+				}
+			}
+			return newSection;
 		}
+		return new MemoryConfiguration();
 	}

-	public Long getKitTimestamp(final String name)
+	public long getKitTimestamp(String name)
 	{
-		final Number num = (Number)kitTimestamps.get(name.toLowerCase(Locale.ENGLISH));
-		return num == null ? null : num.longValue();
+		name = name.replace('.', '_').replace('/', '_');
+		if (kitTimestamps != null)
+		{
+			return kitTimestamps.getLong(name, 0l);
+		}
+		return 0l;
 	}

 	public void setKitTimestamp(final String name, final long time)
 	{
-		kitTimestamps.put(name.toLowerCase(Locale.ENGLISH), time);
+		kitTimestamps.set(name.toLowerCase(Locale.ENGLISH), time);
 		config.setProperty("timestamps.kits", kitTimestamps);
 		config.save();
 	}
@@ -24,12 +24,19 @@ public class Util
 	private final static Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]");
 	private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");

+	//Used to clean file names before saving to disk
 	public static String sanitizeFileName(final String name)
 	{
-		final String newName = INVALIDFILECHARS.matcher(name.toLowerCase(Locale.ENGLISH)).replaceAll("_");
-		return newName;
+		return safeString(name);
 	}

+	//Used to clean strings/names before saving as filenames/permissions
+	public static String safeString(final String string)
+	{
+		return INVALIDFILECHARS.matcher(string.toLowerCase(Locale.ENGLISH)).replaceAll("_");
+	}
+
+	//Less restrictive string sanitizing, when not used as perm or filename
 	public static String sanitizeString(final String string)
 	{
 		return INVALIDCHARS.matcher(string).replaceAll("");
@@ -80,11 +87,17 @@ public class Util
 			_("second"),
 			_("seconds")
 		};
+		int accuracy = 0;
 		for (int i = 0; i < types.length; i++)
 		{
+			if (accuracy > 2)
+			{
+				break;
+			}
 			int diff = dateDiff(types[i], fromDate, toDate, future);
 			if (diff > 0)
 			{
+				accuracy++;
 				sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
 			}
 		}
@@ -92,7 +105,7 @@ public class Util
 		{
 			return "now";
 		}
-		return sb.toString();
+		return sb.toString().trim();
 	}

 	private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future)
@@ -209,6 +222,13 @@ public class Util
 		{
 			c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
 		}
+
+		Calendar max = new GregorianCalendar();
+		max.add(Calendar.YEAR, 10);
+		if (c.after(max))
+		{
+			return max.getTimeInMillis();
+		}
 		return c.getTimeInMillis();
 	}
 	// The player can stand inside these materials 
@@ -242,6 +262,7 @@ public class Util
 		AIR_MATERIALS.add(Material.REDSTONE_TORCH_OFF.getId());
 		AIR_MATERIALS.add(Material.REDSTONE_TORCH_ON.getId());
 		AIR_MATERIALS.add(Material.STONE_BUTTON.getId());
+		AIR_MATERIALS.add(Material.SNOW.getId());
 		AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());
 		AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
 		AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());
@@ -249,8 +270,10 @@ public class Util
 		AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId());
 		AIR_MATERIALS.add(Material.MELON_STEM.getId());
 		AIR_MATERIALS.add(Material.VINE.getId());
-		AIR_MATERIALS.add(Material.NETHER_WARTS.getId());
+		AIR_MATERIALS.add(Material.FENCE_GATE.getId());
 		AIR_MATERIALS.add(Material.WATER_LILY.getId());
+		AIR_MATERIALS.add(Material.NETHER_FENCE.getId());
+		AIR_MATERIALS.add(Material.NETHER_WARTS.getId());

 		for (Integer integer : AIR_MATERIALS)
 		{
@@ -269,6 +292,46 @@ public class Util
 		}
 		return block.getLocation();
 	}
+	public final static int RADIUS = 3;
+	public final static Vector3D[] VOLUME;
+
+
+	public static class Vector3D
+	{
+		public Vector3D(int x, int y, int z)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+		}
+		public int x;
+		public int y;
+		public int z;
+	}
+
+	static
+	{
+		List<Vector3D> pos = new ArrayList<Vector3D>();
+		for (int x = -RADIUS; x <= RADIUS; x++)
+		{
+			for (int y = -RADIUS; y <= RADIUS; y++)
+			{
+				for (int z = -RADIUS; z <= RADIUS; z++)
+				{
+					pos.add(new Vector3D(x, y, z));
+				}
+			}
+		}
+		Collections.sort(pos, new Comparator<Vector3D>()
+		{
+			@Override
+			public int compare(Vector3D a, Vector3D b)
+			{
+				return (a.x * a.x + a.y * a.y + a.z * a.z) - (b.x * b.x + b.y * b.y + b.z * b.z);
+			}
+		});
+		VOLUME = pos.toArray(new Vector3D[0]);
+	}

 	public static Location getSafeDestination(final Location loc) throws Exception
 	{
@@ -280,33 +343,54 @@ public class Util
 		int x = loc.getBlockX();
 		int y = (int)Math.round(loc.getY());
 		int z = loc.getBlockZ();
+		final int origX = x;
+		final int origY = y;
+		final int origZ = z;

 		while (isBlockAboveAir(world, x, y, z))
 		{
 			y -= 1;
 			if (y < 0)
 			{
+				y = origY;
+				break;
+			}
+		}
+
+		int i = 0;
+		while (isBlockUnsafe(world, x, y, z))
+		{
+			i++;
+			if (i >= VOLUME.length)
+			{
+				x = origX;
+				y = origY + RADIUS;
+				z = origZ;
+				break;
+			}
+			x = origX + VOLUME[i].x;
+			y = origY + VOLUME[i].y;
+			z = origZ + VOLUME[i].z;
+		}
+
+		while (isBlockUnsafe(world, x, y, z))
+		{
+			y += 1;
+			if (y >= world.getMaxHeight())
+			{
+				x += 1;
 				break;
 			}
 		}

-		while (isBlockUnsafe(world, x, y, z))
-		{
-			y += 1;
-			if (y >= 127)
-			{
-				x += 1;
-				break;
-			}
-		}
 		while (isBlockUnsafe(world, x, y, z))
 		{
 			y -= 1;
 			if (y <= 1)
 			{
-				y = 127;
 				x += 1;
-				if (x - 32 > loc.getBlockX())
+				y = world.getHighestBlockYAt(x, z);
+				if (x - 48 > loc.getBlockX())
 				{
 					throw new Exception(_("holeInFloor"));
 				}
@@ -321,6 +405,15 @@ public class Util
 	}

 	public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
+	{
+		if (isBlockDamaging(world, x, y, z))
+		{
+			return true;
+		}
+		return isBlockAboveAir(world, x, y, z);
+	}
+
+	public static boolean isBlockDamaging(final World world, final int x, final int y, final int z)
 	{
 		final Block below = world.getBlockAt(x, y - 1, z);
 		if (below.getType() == Material.LAVA || below.getType() == Material.STATIONARY_LAVA)
@@ -333,12 +426,17 @@ public class Util
 			return true;
 		}

+		if (below.getType() == Material.BED_BLOCK)
+		{
+			return true;
+		}
+
 		if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
 			|| (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
 		{
 			return true;
 		}
-		return isBlockAboveAir(world, x, y, z);
+		return false;
 	}

 	public static ItemStack convertBlockToItem(final Block block)
@@ -422,11 +520,11 @@ public class Util
 		}
 		return is;
 	}
-	private static DecimalFormat df = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
+	private static DecimalFormat dFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));

-	public static String formatCurrency(final double value, final IEssentials ess)
+	public static String formatAsCurrency(final double value)
 	{
-		String str = ess.getSettings().getCurrencySymbol() + df.format(value);
+		String str = dFormat.format(value);
 		if (str.endsWith(".00"))
 		{
 			str = str.substring(0, str.length() - 3);
@@ -434,6 +532,16 @@ public class Util
 		return str;
 	}

+	public static String displayCurrency(final double value, final IEssentials ess)
+	{
+		return _("currency", ess.getSettings().getCurrencySymbol(), formatAsCurrency(value));
+	}
+
+	public static String shortCurrency(final double value, final IEssentials ess)
+	{
+		return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value);
+	}
+
 	public static double roundDouble(final double d)
 	{
 		return Math.round(d * 100.0) / 100.0;
@@ -485,26 +593,113 @@ public class Util
 		}
 		return buf.toString();
 	}
-	private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-FKa-fk]");
-	private static transient final Pattern EASY_COLOR_PATTERN = Pattern.compile("&([0-9a-fk])");

-	public static String stripColor(final String input)
+	public static String lastCode(final String input)
+	{
+		int pos = input.lastIndexOf("§");
+		if (pos == -1 || (pos + 1) == input.length())
+		{
+			return "";
+		}
+		return input.substring(pos, pos + 2);
+	}
+	private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)");
+	private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]");
+	private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])");
+	private static transient final Pattern VANILLA_COLOR_PATTERN = Pattern.compile("\u00A7+[0-9A-Fa-f]");
+	private static transient final Pattern VANILLA_MAGIC_PATTERN = Pattern.compile("\u00A7+[Kk]");
+	private static transient final Pattern VANILLA_FORMAT_PATTERN = Pattern.compile("\u00A7+[L-ORl-or]");
+	private static transient final Pattern REPLACE_COLOR_PATTERN = Pattern.compile("&([0-9a-f])");
+	private static transient final Pattern REPLACE_MAGIC_PATTERN = Pattern.compile("&(k)");
+	private static transient final Pattern REPLACE_FORMAT_PATTERN = Pattern.compile("&([l-or])");
+
+	public static String stripFormat(final String input)
 	{
 		if (input == null)
 		{
 			return null;
 		}
-
-		return VANILLA_COLOR_PATTERN.matcher(input).replaceAll("");
+		return VANILLA_PATTERN.matcher(input).replaceAll("");
 	}

-	public static String replaceColor(final String input)
+	public static String replaceFormat(final String input)
 	{
 		if (input == null)
 		{
 			return null;
 		}
+		return REPLACE_PATTERN.matcher(input).replaceAll("\u00a7$1");
+	}

-		return EASY_COLOR_PATTERN.matcher(input).replaceAll("\u00a7$1");
+	public static String blockURL(final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		String text = URL_PATTERN.matcher(input).replaceAll("$1 $2");
+		while (URL_PATTERN.matcher(text).find())
+		{
+			text = URL_PATTERN.matcher(text).replaceAll("$1 $2");
+		}
+		return text;
+	}
+
+	public static String formatString(final IUser user, final String permBase, final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		String message;
+		if (user.isAuthorized(permBase + ".color"))
+		{
+			message = Util.replaceColor(input, REPLACE_COLOR_PATTERN);
+		}
+		else
+		{
+			message = Util.stripColor(input, VANILLA_COLOR_PATTERN);
+		}
+		if (user.isAuthorized(permBase + ".magic"))
+		{
+			message = Util.replaceColor(message, REPLACE_MAGIC_PATTERN);
+		}
+		else
+		{
+			message = Util.stripColor(message, VANILLA_MAGIC_PATTERN);
+		}
+		if (user.isAuthorized(permBase + ".format"))
+		{
+			message = Util.replaceColor(message, REPLACE_FORMAT_PATTERN);
+		}
+		else
+		{
+			message = Util.stripColor(message, VANILLA_FORMAT_PATTERN);
+		}
+		return message;
+	}
+
+	public static String formatMessage(final IUser user, final String permBase, final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		String message = formatString(user, permBase, input);
+		if (!user.isAuthorized(permBase + ".url"))
+		{
+			message = Util.blockURL(message);
+		}
+		return message;
+	}
+
+	private static String stripColor(final String input, final Pattern pattern)
+	{
+		return pattern.matcher(input).replaceAll("");
+	}
+
+	private static String replaceColor(final String input, final Pattern pattern)
+	{
+		return pattern.matcher(input).replaceAll("\u00a7$1");
 	}
 }
@@ -1,7 +1,9 @@
 package com.earth2me.essentials;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.commands.WarpNotFoundException;
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -48,7 +50,7 @@ public class Warps implements IConf
 		EssentialsConf conf = warpPoints.get(new StringIgnoreCase(warp));
 		if (conf == null)
 		{
-			throw new Exception(_("warpNotExist"));
+			throw new WarpNotFoundException();
 		}
 		return conf.getLocation(null, server);
 	}
@@ -69,7 +71,14 @@ public class Warps implements IConf
 		}
 		conf.setProperty(null, loc);
 		conf.setProperty("name", name);
-		conf.save();
+		try
+		{
+			conf.saveWithError();
+		}
+		catch (IOException ex)
+		{
+			throw new IOException(_("invalidWarpName"));
+		}
 	}

 	public void delWarp(String name) throws Exception
@@ -8,7 +8,6 @@ import com.earth2me.essentials.Util;
 import java.io.File;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.entity.Player;


 /**
@@ -72,17 +71,7 @@ public final class Economy
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		User user;
-		Player player = ess.getServer().getPlayer(name);
-		if (player != null)
-		{
-			user = ess.getUser(player);
-		}
-		else
-		{
-			user = ess.getOfflineUser(name);
-		}
-		return user;
+		return ess.getUser(name);
 	}

 	/**
@@ -115,6 +104,10 @@ public final class Economy
 		{
 			throw new UserDoesNotExistException(name);
 		}
+		if (balance < ess.getSettings().getMinMoney())
+		{
+			throw new NoLoanPermittedException();
+		}
 		if (balance < 0.0 && !user.isAuthorized("essentials.eco.loan"))
 		{
 			throw new NoLoanPermittedException();
@@ -245,7 +238,7 @@ public final class Economy
 		{
 			throw new RuntimeException(noCallBeforeLoad);
 		}
-		return Util.formatCurrency(amount, ess);
+		return Util.displayCurrency(amount, ess);
 	}

 	/**
@@ -1,10 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.util.Map;
-import org.bukkit.command.PluginCommand;
-
-
-public interface IAlternativeCommandsHandler
-{	
-	Map<String, String> disabledCommands();
-}
@@ -1,51 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.perm.IPermissionsHandler;
-import com.earth2me.essentials.register.payment.Methods;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-
-
-public interface IEssentials extends Plugin, IReload
-{
-	void addReloadListener(IReload listener);
-
-	IUser getUser(Object base);
-
-	int broadcastMessage(IUser sender, String message);
-
-	II18n getI18n();
-
-	ISettings getSettings();
-
-	IJails getJail();
-
-	IWarps getWarps();
-
-	IWorth getWorth();
-
-	IItemDb getItemDb();
-
-	IUserMap getUserMap();
-
-	IEssentialsEconomy getEconomy();
-
-	World getWorld(String name);
-
-	Methods getPaymentMethod();
-
-	int scheduleAsyncDelayedTask(Runnable run);
-
-	int scheduleSyncDelayedTask(Runnable run);
-
-	int scheduleSyncDelayedTask(Runnable run, long delay);
-
-	int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
-
-	IPermissionsHandler getPermissionsHandler();
-
-	IAlternativeCommandsHandler getAlternativeCommandsHandler();
-
-	void showCommandError(CommandSender sender, String commandLabel, Throwable exception);
-}
@@ -1,37 +0,0 @@
-package com.earth2me.essentials.api;
-
-
-public interface IEssentialsEconomy
-{
-	double getMoney(String name) throws UserDoesNotExistException;
-
-	void setMoney(String name, double balance) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void add(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void subtract(String name, double amount) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void divide(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void multiply(String name, double value) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException;
-
-	boolean hasEnough(String name, double amount) throws UserDoesNotExistException;
-
-	boolean hasMore(String name, double amount) throws UserDoesNotExistException;
-
-	boolean hasLess(String name, double amount) throws UserDoesNotExistException;
-
-	boolean isNegative(String name) throws UserDoesNotExistException;
-
-	String format(double amount);
-
-	boolean playerExists(String name);
-
-	boolean isNPC(String name) throws UserDoesNotExistException;
-
-	boolean createNPC(String name);
-
-	void removeNPC(String name) throws UserDoesNotExistException;
-}
@@ -10,6 +10,8 @@ public interface IJails extends IReload

 	Collection<String> getList() throws Exception;

+	int getCount();
+
 	void removeJail(String jail) throws Exception;

 	void sendToJail(com.earth2me.essentials.IUser user, String jail) throws Exception;
@@ -1,10 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.settings.Settings;
-import com.earth2me.essentials.storage.IStorageObjectHolder;
-
-
-public interface ISettings extends IStorageObjectHolder<Settings>
-{
-	
-}
@@ -1,43 +0,0 @@
-package com.earth2me.essentials.api;
-
-import com.earth2me.essentials.commands.IEssentialsCommand;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
-
-public interface IUser extends Player, IReload
-{
-	long getLastTeleportTimestamp();
-
-	boolean isAuthorized(String node);
-
-	boolean isAuthorized(IEssentialsCommand cmd);
-
-	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
-
-	void setLastTeleportTimestamp(long time);
-
-	Location getLastLocation();
-
-	Player getBase();
-
-	double getMoney();
-
-	void takeMoney(double value);
-
-	void giveMoney(double value);
-
-	String getGroup();
-
-	void setLastLocation();
-
-	Location getHome(String name) throws Exception;
-
-	Location getHome(Location loc) throws Exception;
-
-	boolean isHidden();
-	
-	ITeleport getTeleport();
-	
-	void setJail(String jail);
-}
@@ -1,20 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.io.File;
-import java.util.Set;
-
-
-public interface IUserMap
-{
-	boolean userExists(final String name);
-
-	IUser getUser(final String name);
-
-	void removeUser(final String name);
-
-	Set<String> getAllUniqueUsers();
-
-	int getUniqueUsers();
-
-	File getUserFile(final String name);
-}
@@ -1,16 +0,0 @@
-package com.earth2me.essentials.api;
-
-import java.util.Collection;
-import org.bukkit.Location;
-
-
-public interface IWarps extends IReload
-{
-	Location getWarp(String warp) throws Exception;
-
-	Collection<String> getWarps();
-
-	void removeWarp(String name) throws Exception;
-
-	void setWarp(String name, Location loc) throws Exception;
-}
@@ -1,11 +0,0 @@
-package com.earth2me.essentials.api;
-
-import org.bukkit.inventory.ItemStack;
-
-
-public interface IWorth extends IReload
-{
-	double getPrice(ItemStack itemStack);
-
-	void setPrice(ItemStack itemStack, double price);
-}
@@ -31,6 +31,7 @@ public class Commandafk extends EssentialsCommand

 	private void toggleAfk(User user)
 	{
+		user.setDisplayNick();
 		if (!user.toggleAfk())
 		{
 			//user.sendMessage(_("markedAsNotAway"));
@@ -6,7 +6,7 @@ import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.entity.TNTPrimed;

-
+// This command has a in theme message that only shows if you supply a parameter #EasterEgg
 public class Commandantioch extends EssentialsCommand
 {
 	public Commandantioch()
@@ -17,8 +17,11 @@ public class Commandantioch extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
-		ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
+		if (args.length > 0)
+		{
+			ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+			ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
+		}		

 		final Location loc = Util.getTarget(user);
 		loc.getWorld().spawn(loc, TNTPrimed.class);
@@ -16,6 +16,11 @@ public class Commandback extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
+		if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions()
+			&& !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName()))
+		{
+			throw new Exception(_("noPerm", "essentials.worlds." + user.getLastLocation().getWorld().getName()));
+		}
 		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
 		user.sendMessage(_("backUsageMsg"));
@@ -19,7 +19,12 @@ public class Commandbackup extends EssentialsCommand
 		final Backup backup = ess.getBackup();
 		if (backup == null)
 		{
-			throw new Exception();
+			throw new Exception(_("backupDisabled"));
+		}
+		final String command = ess.getSettings().getBackupCommand();
+		if (command == null || "".equals(command) || "save-all".equalsIgnoreCase(command))
+		{
+			throw new Exception(_("backupDisabled"));
 		}
 		backup.run();
 		sender.sendMessage(_("backupStarted"));
@@ -21,17 +21,18 @@ public class Commandbalance extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		sender.sendMessage(_("balance", Util.formatCurrency(getPlayer(server, args, 0, true).getMoney(), ess)));
+		sender.sendMessage(_("balance", Util.displayCurrency(getPlayer(server, args, 0, true).getMoney(), ess)));
 	}

 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
+		//TODO: Remove 'other' perm
 		final double bal = (args.length < 1
 							|| !(user.isAuthorized("essentials.balance.others")
 								 || user.isAuthorized("essentials.balance.other"))
 							? user
 							: getPlayer(server, args, 0, true)).getMoney();
-		user.sendMessage(_("balance", Util.formatCurrency(bal, ess)));
+		user.sendMessage(_("balance", Util.displayCurrency(bal, ess)));
 	}
 }
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.User;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.textreader.ArrayListInput;
 import com.earth2me.essentials.textreader.TextPager;
@@ -105,14 +105,18 @@ public class Commandbalancetop extends EssentialsCommand
 			{
 				if (force || cacheage <= System.currentTimeMillis() - CACHETIME)
 				{
-					cache.getLines().clear();
+					cache.getLines().clear();					
 					final Map<String, Double> balances = new HashMap<String, Double>();
+					double totalMoney = 0d;
 					for (String u : ess.getUserMap().getAllUniqueUsers())
 					{
 						final User user = ess.getUserMap().getUser(u);
 						if (user != null)
 						{
-							balances.put(user.getDisplayName(), user.getMoney());
+							final double userMoney = user.getMoney();
+							user.updateMoneyCache(userMoney);
+							totalMoney += userMoney;
+							balances.put(user.getDisplayName(), userMoney);
 						}
 					}

@@ -125,10 +129,12 @@ public class Commandbalancetop extends EssentialsCommand
 							return -entry1.getValue().compareTo(entry2.getValue());
 						}
 					});
+					
+					cache.getLines().add(_("serverTotal", Util.displayCurrency(totalMoney, ess)));
 					int pos = 1;
 					for (Map.Entry<String, Double> entry : sortedEntries)
 					{
-						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.formatCurrency(entry.getValue(), ess));
+						cache.getLines().add(pos + ". " + entry.getKey() + ", " + Util.displayCurrency(entry.getValue(), ess));
 						pos++;
 					}
 					cacheage = System.currentTimeMillis();
@@ -4,6 +4,7 @@ import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.OfflinePlayer;
 import com.earth2me.essentials.User;
+import java.util.logging.Level;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -19,12 +20,22 @@ public class Commandban extends EssentialsCommand
 	@Override
 	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
+		boolean nomatch = false;
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final User user = getPlayer(server, args, 0, true);
-		if (user.getBase() instanceof OfflinePlayer)
+		User user;
+		try
+		{
+			user = getPlayer(server, args, 0, true);
+		}
+		catch (NoSuchFieldException e)
+		{
+			nomatch = true;
+			user = ess.getUser(new OfflinePlayer(args[0], ess));
+		}
+		if (!user.isOnline())
 		{
 			if (sender instanceof Player
 				&& !ess.getUser(sender).isAuthorized("essentials.ban.offline"))
@@ -35,31 +46,38 @@ public class Commandban extends EssentialsCommand
 		}
 		else
 		{
-			if (user.isAuthorized("essentials.ban.exempt"))
+			if (user.isAuthorized("essentials.ban.exempt") && sender instanceof Player)
 			{
 				sender.sendMessage(_("banExempt"));
 				return;
 			}
 		}

+		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
 		String banReason;
 		if (args.length > 1)
 		{
-			banReason = getFinalArg(args, 1);
-			user.setBanReason(banReason);
+			banReason = _("banFormat", getFinalArg(args, 1), senderName);
 		}
 		else
 		{
-			banReason = _("defaultBanReason");
+			banReason = _("banFormat", _("defaultBanReason"), senderName);
 		}
+
+		user.setBanReason(banReason);
 		user.setBanned(true);
 		user.kickPlayer(banReason);
-		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
+		
+		server.getLogger().log(Level.INFO, _("playerBanned", senderName, user.getName(), banReason));
+		
+		if (nomatch) {
+			sender.sendMessage(_("userUnknown", user.getName()));
+		}

 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
 			final User player = ess.getUser(onlinePlayer);
-			if (player.isAuthorized("essentials.ban.notify"))
+			if (onlinePlayer == sender || player.isAuthorized("essentials.ban.notify"))
 			{
 				onlinePlayer.sendMessage(_("playerBanned", senderName, user.getName(), banReason));
 			}
@@ -27,6 +27,10 @@ public class Commandbigtree extends EssentialsCommand
 		{
 			tree = TreeType.BIG_TREE;
 		}
+		else if (args.length > 0 && args[0].equalsIgnoreCase("jungle"))
+		{
+			tree = TreeType.JUNGLE;
+		}
 		else
 		{
 			throw new NotEnoughArgumentsException();
@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;

+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import org.bukkit.Material;
 import org.bukkit.Server;
@@ -29,8 +30,10 @@ public class Commandbreak extends EssentialsCommand
 		}
 		if (block.getType() == Material.BEDROCK && !user.isAuthorized("essentials.break.bedrock"))
 		{
-			throw new Exception("You are not allowed to destroy bedrock."); //TODO: Translation
+			throw new Exception(_("noBreakBedrock"));
 		}
+		//final List<ItemStack> list = (List<ItemStack>)block.getDrops();		
+		//final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase(), list);
 		final BlockBreakEvent event = new BlockBreakEvent(block, user.getBase());
 		server.getPluginManager().callEvent(event);
 		if (event.isCancelled())
@@ -1,6 +1,7 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;

@@ -20,6 +21,6 @@ public class Commandbroadcast extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}

-		ess.broadcastMessage(null, _("broadcast", getFinalArg(args, 0)));
+		ess.broadcastMessage(null, _("broadcast", Util.replaceFormat(getFinalArg(args, 0))));
 	}
 }
@@ -20,6 +20,12 @@ public class Commandburn extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
+		
+		//TODO: TL this
+		if (args[0].trim().length() < 2)
+		{
+			throw new NotEnoughArgumentsException("You need to specify a player to burn.");
+		}

 		for (Player p : server.matchPlayer(args[0]))
 		{
@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;

+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import java.util.Locale;
 import org.bukkit.Server;
@@ -33,7 +34,31 @@ public class Commandeco extends EssentialsCommand
 			throw new NotEnoughArgumentsException(ex);
 		}

-		if (args[1].contentEquals("*"))
+		if (args[1].contentEquals("**"))
+		{
+			for (String sUser : ess.getUserMap().getAllUniqueUsers())
+			{
+				final User player = ess.getUser(sUser);
+				switch (cmd)
+				{
+				case GIVE:
+					player.giveMoney(amount);
+					break;
+
+				case TAKE:
+					if (player.canAfford(amount, false))
+					{
+						player.takeMoney(amount);
+					}					
+					break;
+
+				case RESET:
+					player.setMoney(amount == 0 ? ess.getSettings().getStartingBalance() : amount);
+					break;
+				}
+			}
+		}
+		else if (args[1].contentEquals("*"))
 		{
 			for (Player onlinePlayer : server.getOnlinePlayers())
 			{
@@ -45,6 +70,10 @@ public class Commandeco extends EssentialsCommand
 					break;

 				case TAKE:
+					if (!player.canAfford(amount, false))
+					{
+						throw new Exception(_("notEnoughMoney"));
+					}
 					player.takeMoney(amount);
 					break;

@@ -64,6 +93,10 @@ public class Commandeco extends EssentialsCommand
 				break;

 			case TAKE:
+				if (!player.canAfford(amount, false))
+				{
+					throw new Exception(_("notEnoughMoney"));
+				}
 				player.takeMoney(amount, sender);
 				break;

@@ -4,7 +4,10 @@ import com.earth2me.essentials.Enchantments;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import java.util.*;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 import org.bukkit.Server;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
@@ -0,0 +1,30 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+
+
+public class Commandenderchest extends EssentialsCommand
+{
+	public Commandenderchest()
+	{
+		super("enderchest");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{		
+		if (args.length > 0 && user.isAuthorized("essentials.enderchest.others"))
+		{
+			final User invUser = getPlayer(server, args, 0);
+			user.openInventory(invUser.getEnderChest());
+			user.setEnderSee(true);
+		}
+		else
+		{
+			user.openInventory(user.getEnderChest());
+			user.setEnderSee(false);
+		}
+
+	}
+}
@@ -1,7 +1,9 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.metrics.Metrics;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.Location;
@@ -9,9 +11,10 @@ import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;

-
+// This command has 4 undocumented behaviours #EasterEgg
 public class Commandessentials extends EssentialsCommand
 {
 	public Commandessentials()
@@ -35,16 +38,29 @@ public class Commandessentials extends EssentialsCommand
 		{
 			run_nya(server, sender, commandLabel, args);
 		}
+		else if (args[0].equalsIgnoreCase("moo"))
+		{
+			run_moo(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("reset"))
+		{
+			run_reset(server, sender, commandLabel, args);
+		}
+		else if (args[0].equalsIgnoreCase("opt-out"))
+		{
+			run_optout(server, sender, commandLabel, args);
+		}
 		else {
 			run_reload(server, sender, commandLabel, args);
 		}
 	}
 	
+	//If you do not supply an argument this command will list 'overridden' commands.
 	private void run_disabled(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		sender.sendMessage("Essentials " + ess.getDescription().getVersion());
 		sender.sendMessage("/<command> <reload/debug>");
-		sender.sendMessage(_("blockList"));
+		
 		final StringBuilder disabledCommands = new StringBuilder();
 		for (Map.Entry<String, String> entry : ess.getAlternativeCommandsHandler().disabledCommands().entrySet())
 		{
@@ -53,7 +69,21 @@ public class Commandessentials extends EssentialsCommand
 			}
 			disabledCommands.append(entry.getKey()).append(" => ").append(entry.getValue());
 		}
-		sender.sendMessage(disabledCommands.toString());
+		if (disabledCommands.length() > 0) {
+			sender.sendMessage(_("blockList"));
+			sender.sendMessage(disabledCommands.toString());
+		}
+	}
+	
+	private void run_reset(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException("/<command> reset <player>");
+		}
+		final User user = getPlayer(server, args, 1, true);
+		user.reset();
+		sender.sendMessage("Reset Essentials userdata for player: " + user.getDisplayName());
 	}
 	
 	private void run_debug(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
@@ -144,7 +174,6 @@ public class Commandessentials extends EssentialsCommand
 					}
 				}
 			}, 20, 2);
-			return;
 	}

 	private void stopTune()
@@ -159,4 +188,31 @@ public class Commandessentials extends EssentialsCommand
 		}
 		noteBlocks.clear();
 	}
+	
+	private void run_moo(final Server server, final CommandSender sender, final String command, final String args[])
+	{
+		if(sender instanceof ConsoleCommandSender)
+			sender.sendMessage(new String[]{"         (__)", "         (oo)", "   /------\\/", "  / |    ||", " *  /\\---/\\", "    ~~   ~~", "....\"Have you mooed today?\"..." } );
+		else
+			sender.sendMessage(new String[]{"            (__)", "            (oo)", "   /------\\/", "  /  |      | |", " *  /\\---/\\", "    ~~    ~~", "....\"Have you mooed today?\"..." } );
+	}
+	
+	private void run_optout(final Server server, final CommandSender sender, final String command, final String args[])
+	{
+		final Metrics metrics = ess.getMetrics();
+		try
+		{
+			sender.sendMessage("Essentials collects simple metrics to highlight which features to concentrate work on in the future.");
+			if (metrics.isOptOut()) {
+				metrics.enable();		
+			} else {
+				metrics.disable();
+			}
+			sender.sendMessage("Anonymous Metrics are now: " + (metrics.isOptOut() ? "disabled" : "enabled"));
+		}
+		catch (IOException ex)
+		{
+			sender.sendMessage("Unable to modify 'plugins/PluginMetrics/config.yml': " + ex.getMessage());
+		}
+	}
 }
@@ -0,0 +1,158 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.SetExpFix;
+import java.util.Locale;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandexp extends EssentialsCommand
+{
+	public Commandexp()
+	{
+		super("exp");
+	}
+
+	@Override
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length == 0)
+		{
+			showExp(user, user);
+		}
+		else if (args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set"))
+		{
+			if (args.length == 3 && user.isAuthorized("essentials.exp.set.others"))
+			{
+				expMatch(server, user, args[1], args[2], false);
+			}
+			else
+			{
+				setExp(user, user, args[1], false);
+			}
+		}
+		else if (args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give"))
+		{
+			if (args.length == 3 && user.isAuthorized("essentials.exp.give.others"))
+			{
+				expMatch(server, user, args[1], args[2], true);
+			}
+			else
+			{
+				setExp(user, user, args[1], true);
+			}
+		}
+		else
+		{
+			String match = args[0].trim();
+			if (args.length == 2)
+			{
+				match = args[1].trim();
+			}
+			if (match.equalsIgnoreCase("show") || !user.isAuthorized("essentials.exp.others"))
+			{
+				showExp(user, user);
+			}
+			else
+			{
+				showMatch(server, user, match);
+			}
+		}
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		else if (args.length > 2 && args[0].equalsIgnoreCase("set"))
+		{
+			expMatch(server, sender, args[1], args[2], false);
+		}
+		else if (args.length > 2 && args[0].equalsIgnoreCase("give"))
+		{
+			expMatch(server, sender, args[1], args[2], true);
+		}
+		else
+		{
+			String match = args[0].trim();
+			if (args.length == 2)
+			{
+				match = args[1].trim();
+			}
+			showMatch(server, sender, match);
+		}
+	}
+
+	private void showMatch(final Server server, final CommandSender sender, final String match) throws NotEnoughArgumentsException
+	{
+		boolean foundUser = false;
+		for (Player matchPlayer : server.matchPlayer(match))
+		{
+			foundUser = true;
+			final User target = ess.getUser(matchPlayer);
+			showExp(sender, target);
+		}
+		if (!foundUser)
+		{
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
+		}
+	}
+
+	private void expMatch(final Server server, final CommandSender sender, final String match, String amount, final boolean toggle) throws NotEnoughArgumentsException
+	{
+		boolean foundUser = false;
+		for (Player matchPlayer : server.matchPlayer(match))
+		{
+			final User target = ess.getUser(matchPlayer);
+			setExp(sender, target, amount, toggle);
+			foundUser = true;
+		}
+		if (!foundUser)
+		{
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
+		}
+	}
+
+	private void showExp(final CommandSender sender, final User target)
+	{
+		final int totalExp = SetExpFix.getTotalExperience(target);
+		sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), SetExpFix.getExpUntilNextLevel(target)));
+	}
+
+	private void setExp(final CommandSender sender, final User target, String strAmount, final boolean give)
+	{
+		Long amount;
+		strAmount = strAmount.toLowerCase(Locale.ENGLISH);
+		if (strAmount.startsWith("l"))
+		{
+			strAmount = strAmount.substring(1);			
+			int neededLevel = Integer.parseInt(strAmount);
+			if (give)
+			{
+				neededLevel += target.getLevel();
+			}
+			amount = (long)SetExpFix.getExpToLevel(neededLevel);
+			SetExpFix.setTotalExperience(target, 0);
+		}
+		else {
+			amount = Long.parseLong(strAmount);
+		}
+
+		if (give)
+		{
+			amount += SetExpFix.getTotalExperience(target);
+		}
+		if (amount > Integer.MAX_VALUE)
+		{
+			amount = (long)Integer.MAX_VALUE;
+		}
+		SetExpFix.setTotalExperience(target, amount.intValue());
+		sender.sendMessage(_("expSet", target.getDisplayName(), amount));
+	}
+}
@@ -0,0 +1,77 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commandfly extends EssentialsCommand
+{
+	public Commandfly()
+	{
+		super("fly");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		flyOtherPlayers(server, sender, args);
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.fly.others"))
+		{
+			flyOtherPlayers(server, user, args);
+			return;
+		}
+		user.setAllowFlight(!user.getAllowFlight());
+		if (!user.getAllowFlight())
+		{
+			user.setFlying(false);
+		}
+		user.sendMessage(_("flyMode", _(user.getAllowFlight() ? "enabled" : "disabled"), user.getDisplayName()));
+	}
+
+	private void flyOtherPlayers(final Server server, final CommandSender sender, final String[] args)
+	{
+		for (Player matchPlayer : server.matchPlayer(args[0]))
+		{
+			final User player = ess.getUser(matchPlayer);
+			if (player.isHidden())
+			{
+				continue;
+			}
+
+			if (args.length > 1)
+			{
+				if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
+				{
+					player.setAllowFlight(true);
+				}
+				else
+				{
+					player.setAllowFlight(false);
+				}
+			}
+			else
+			{
+				player.setAllowFlight(!player.getAllowFlight());
+			}
+
+			if (!player.getAllowFlight())
+			{
+				player.setFlying(false);
+			}
+			sender.sendMessage(_("flyMode", _(player.getAllowFlight() ? "enabled" : "disabled"), player.getDisplayName()));
+		}
+	}
+}
@@ -19,39 +19,106 @@ public class Commandgamemode extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length < 1)
+		if (args.length < 2)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-
-		gamemodeOtherPlayers(server, sender, args[0]);
+		GameMode gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+		gamemodeOtherPlayers(server, sender, gameMode, args[1]);
 	}

 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0 && !args[0].trim().isEmpty() && user.isAuthorized("essentials.gamemode.others"))
+		GameMode gameMode;
+		if (args.length == 0)
 		{
-			gamemodeOtherPlayers(server, user, args[0]);
+			gameMode = matchGameMode(commandLabel);
+		}
+		else if (args.length > 1 && args[1].trim().length() > 2 && user.isAuthorized("essentials.gamemode.others"))
+		{
+			gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			gamemodeOtherPlayers(server, user, gameMode, args[1]);
 			return;
 		}
-
-		user.setGameMode(user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
+		else 
+		{
+			try
+			{
+				gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			}
+			catch (NotEnoughArgumentsException e)
+			{
+				if (user.isAuthorized("essentials.gamemode.others"))
+				{
+					gameMode = matchGameMode(commandLabel);
+					gamemodeOtherPlayers(server, user, gameMode, args[0]);
+					return;
+				}
+				throw new NotEnoughArgumentsException();
+			}
+		}
+		if (gameMode == null)
+		{
+			gameMode = user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
+		}
+		user.setGameMode(gameMode);
 		user.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
 	}

-	private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final String name)
+	private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final GameMode gameMode, final String player) throws NotEnoughArgumentsException
 	{
-		for (Player matchPlayer : server.matchPlayer(name))
+		//TODO: TL this
+		if (player.trim().length() < 2 || gameMode == null)
 		{
-			final User player = ess.getUser(matchPlayer);
-			if (player.isHidden())
+			throw new NotEnoughArgumentsException("You need to specify a valid player/mode.");
+		}
+
+		boolean foundUser = false;
+		for (Player matchPlayer : server.matchPlayer(player))
+		{
+			final User user = ess.getUser(matchPlayer);
+			if (user.isHidden())
 			{
 				continue;
 			}
-
-			player.setGameMode(player.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL);
-			sender.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
+			user.setGameMode(gameMode);
+			sender.sendMessage(_("gameMode", _(user.getGameMode().toString().toLowerCase(Locale.ENGLISH)), user.getDisplayName()));
+			foundUser = true;
+		}
+		if (!foundUser)
+		{
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
 		}
 	}
-}
+
+	private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException
+	{
+		GameMode mode = null;
+		if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc")
+			|| modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c"))
+		{
+			mode = GameMode.CREATIVE;
+		}
+		else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms")
+				 || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s"))
+		{
+			mode = GameMode.SURVIVAL;
+		}
+		else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma")
+				 || modeString.contains("advent") || modeString.equalsIgnoreCase("2") || modeString.equalsIgnoreCase("a"))
+		{
+			mode = GameMode.ADVENTURE;
+		}
+		else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt")
+				 || modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t"))
+		{
+			mode = null;
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		return mode;
+	}
+}
@@ -1,6 +1,9 @@
 package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Util;
+import java.lang.management.ManagementFactory;
+import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
@@ -16,16 +19,42 @@ public class Commandgc extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
+		float tps = ess.getTimer().getAverageTPS();
+		ChatColor color;
+		if (tps >= 18)
+		{
+			color = ChatColor.GREEN;
+		}
+		else if (tps >= 15)
+		{
+			color = ChatColor.YELLOW;
+		}
+		else
+		{
+			color = ChatColor.RED;
+		}
+		
+		sender.sendMessage(_("uptime", Util.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime())));
+		sender.sendMessage(_("tps", "" + color + tps));
 		sender.sendMessage(_("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
 		sender.sendMessage(_("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));
-		sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));
+		sender.sendMessage(_("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));		

 		for (World w : server.getWorlds())
 		{
-			sender.sendMessage(
-					(w.getEnvironment() == World.Environment.NETHER ? "Nether" : "World") + " \"" + w.getName() + "\": "
-					+ w.getLoadedChunks().length + _("gcchunks")
-					+ w.getEntities().size() + _("gcentities"));
+			String worldType = "World";
+			switch (w.getEnvironment())
+			{
+			case NETHER:
+				worldType = "Nether";
+				break;
+			case THE_END:
+				worldType = "The End";
+				break;
+			}
+
+			sender.sendMessage(_("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size()));
 		}
+		
 	}
 }
@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;

+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import org.bukkit.Location;
 import org.bukkit.Server;
@@ -12,21 +13,23 @@ public class Commandgetpos extends EssentialsCommand
 	{
 		super("getpos");
 	}
-	
+
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length > 0 && user.isAuthorized("essentials.getpos.others"))
 		{
 			final User otherUser = getPlayer(server, args, 0);
-			outputPosition(user, otherUser.getLocation(), user.getLocation());
-		}
-		else
-		{
-			outputPosition(user, user.getLocation(), null);
+			if (!otherUser.isHidden() || user.isAuthorized("essentials.list.hidden"))
+			{
+				outputPosition(user, otherUser.getLocation(), user.getLocation());
+				return;
+			}
+
 		}
+		outputPosition(user, user.getLocation(), null);
 	}
-	
+
 	@Override
 	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
@@ -37,19 +40,18 @@ public class Commandgetpos extends EssentialsCommand
 		final User user = getPlayer(server, args, 0);
 		outputPosition(sender, user.getLocation(), null);
 	}
-	
-	//TODO: Translate
+
 	private void outputPosition(final CommandSender sender, final Location coords, final Location distance)
 	{
-		sender.sendMessage("§7World: " + coords.getWorld().getName());
-		sender.sendMessage("§7X: " + coords.getBlockX() + " (+East <-> -West)");
-		sender.sendMessage("§7Y: " + coords.getBlockY() + " (+Up <-> -Down)");
-		sender.sendMessage("§7Z: " + coords.getBlockZ() + " (+South <-> -North)");
-		sender.sendMessage("§7Yaw: " + (coords.getYaw() + 180 + 360) % 360 + " (Rotation)");
-		sender.sendMessage("§7Pitch: " + coords.getPitch() + " (Head angle)");
+		sender.sendMessage(_("currentWorld", coords.getWorld().getName()));
+		sender.sendMessage(_("posX", coords.getBlockX()));
+		sender.sendMessage(_("posY", coords.getBlockY()));
+		sender.sendMessage(_("posZ", coords.getBlockZ()));
+		sender.sendMessage(_("posYaw", (coords.getYaw() + 180 + 360) % 360));
+		sender.sendMessage(_("posPitch", coords.getPitch()));
 		if (distance != null && coords.getWorld().equals(distance.getWorld()))
 		{
-			sender.sendMessage("§7Distance: " + coords.distance(distance));
+			sender.sendMessage(_("distance", coords.distance(distance)));
 		}
 	}
 }
@@ -1,9 +1,10 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import java.util.Locale;
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
@@ -19,7 +20,6 @@ public class Commandgive extends EssentialsCommand
 		super("give");
 	}

-	//TODO: move these messages to message file
 	@Override
 	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
@@ -39,12 +39,17 @@ public class Commandgive extends EssentialsCommand
 				: (!ess.getUser(sender).isAuthorized("essentials.itemspawn.exempt")
 				   && !ess.getUser(sender).canSpawnItem(stack.getTypeId()))))
 		{
-			throw new Exception(ChatColor.RED + "You are not allowed to spawn the item " + itemname);
+			throw new Exception(_("cantSpawnItem", itemname));
 		}

 		final User giveTo = getPlayer(server, args, 0);

-		if (args.length > 2 && Integer.parseInt(args[2]) > 0)
+		if (args.length > 3 && Util.isInt(args[2]) && Util.isInt(args[3]))
+		{
+			stack.setAmount(Integer.parseInt(args[2]));
+			stack.setDurability(Short.parseShort(args[3]));
+		}
+		else if (args.length > 2 && Integer.parseInt(args[2]) > 0)
 		{
 			stack.setAmount(Integer.parseInt(args[2]));
 		}
@@ -59,7 +64,7 @@ public class Commandgive extends EssentialsCommand

 		if (args.length > 3)
 		{
-			for (int i = 3; i < args.length; i++)
+			for (int i = Util.isInt(args[3]) ? 4 : 3; i < args.length; i++)
 			{
 				final String[] split = args[i].split("[:+',;.]", 2);
 				if (split.length < 1)
@@ -82,11 +87,11 @@ public class Commandgive extends EssentialsCommand

 		if (stack.getType() == Material.AIR)
 		{
-			throw new Exception(ChatColor.RED + "You can't give air.");
+			throw new Exception(_("cantSpawnItem", "Air"));
 		}

 		final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' ');
-		sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
+		sender.sendMessage(_("giveSpawn", stack.getAmount(), itemName, giveTo.getDisplayName()));
 		if (giveTo.isAuthorized("essentials.oversizedstacks"))
 		{
 			InventoryWorkaround.addItem(giveTo.getInventory(), true, ess.getSettings().getOversizedStackSize(), stack);
@@ -22,31 +22,53 @@ public class Commandgod extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}

-		godOtherPlayers(server, sender, args[0]);
+		godOtherPlayers(server, sender, args);
 	}

 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 0 && !args[0].trim().isEmpty() && user.isAuthorized("essentials.god.others"))
+		if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.god.others"))
 		{
-			godOtherPlayers(server, user, args[0]);
+			godOtherPlayers(server, user, args);
 			return;
 		}
-
-		user.sendMessage(_("godMode", (user.toggleGodModeEnabled() ? _("enabled") : _("disabled"))));
+		user.setGodModeEnabled(!user.isGodModeEnabled());
+		user.sendMessage(_("godMode", (user.isGodModeEnabled() ? _("enabled") : _("disabled"))));
 	}

-	private void godOtherPlayers(final Server server, final CommandSender sender, final String name)
+	private void godOtherPlayers(final Server server, final CommandSender sender, final String[] args)
 	{
-		for (Player matchPlayer : server.matchPlayer(name))
+		for (Player matchPlayer : server.matchPlayer(args[0]))
 		{
 			final User player = ess.getUser(matchPlayer);
 			if (player.isHidden())
 			{
 				continue;
 			}
-			final boolean enabled = player.toggleGodModeEnabled();
+
+			if (args.length > 1)
+			{
+				if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1"))
+				{
+					player.setGodModeEnabled(true);
+				}
+				else
+				{
+					player.setGodModeEnabled(false);
+				}
+			}
+			else
+			{
+				player.setGodModeEnabled(!player.isGodModeEnabled());
+			}
+
+			final boolean enabled = player.isGodModeEnabled();
+			if (enabled)
+			{
+				player.setFoodLevel(20);
+			}
+
 			player.sendMessage(_("godMode", (enabled ? _("enabled") : _("disabled"))));
 			sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", matchPlayer.getDisplayName())));
 		}
@@ -0,0 +1,63 @@
+package com.earth2me.essentials.commands;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
+import org.bukkit.Material;
+import org.bukkit.Server;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+
+public class Commandhat extends EssentialsCommand
+{
+	public Commandhat()
+	{
+		super("hat");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length > 0 && (args[0].contains("rem") || args[0].contains("off") || args[0].equalsIgnoreCase("0")))
+		{
+			final PlayerInventory inv = user.getInventory();
+			final ItemStack head = inv.getHelmet();
+			if (head == null || head.getType() == Material.AIR)
+			{
+				user.sendMessage(_("hatEmpty"));
+			}
+			else
+			{
+				final ItemStack air = new ItemStack(Material.AIR);
+				inv.setHelmet(air);
+				InventoryWorkaround.addItem(user.getInventory(), true, head);
+				user.sendMessage(_("hatRemoved"));
+			}
+		}
+		else
+		{
+			if (user.getItemInHand().getType() != Material.AIR)
+			{
+				final ItemStack hand = user.getItemInHand();
+				if (hand.getType().getMaxDurability() == 0)
+				{
+					final PlayerInventory inv = user.getInventory();
+					final ItemStack head = inv.getHelmet();
+					inv.removeItem(hand);
+					inv.setHelmet(hand);
+					inv.setItemInHand(head);
+					user.sendMessage(_("hatPlaced"));
+				}
+				else
+				{
+					user.sendMessage(_("hatArmor"));
+				}
+			}
+			else
+			{
+				user.sendMessage(_("hatFail"));
+			}
+		}
+	}
+}
@@ -6,6 +6,8 @@ import java.util.List;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;


 public class Commandheal extends EssentialsCommand
@@ -33,9 +35,7 @@ public class Commandheal extends EssentialsCommand
 		{
 			user.healCooldown();
 		}
-		user.setHealth(20);
-		user.setFoodLevel(20);
-		user.sendMessage(_("heal"));
+		healPlayer(user);
 	}

 	@Override
@@ -63,10 +63,19 @@ public class Commandheal extends EssentialsCommand
 			{
 				continue;
 			}
-			p.setHealth(20);
-			p.setFoodLevel(20);
-			p.sendMessage(_("heal"));
+			healPlayer(p);
 			sender.sendMessage(_("healOther", p.getDisplayName()));
 		}
 	}
+
+	private void healPlayer(final Player p)
+	{
+		p.setHealth(20);
+		p.setFoodLevel(20);
+		p.sendMessage(_("heal"));
+		for (PotionEffect effect : p.getActivePotionEffects())
+		{
+			p.removePotionEffect(effect.getType());
+		}
+	}
 }
@@ -4,6 +4,7 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import com.earth2me.essentials.textreader.*;
+import java.util.Locale;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;

@@ -21,6 +22,7 @@ public class Commandhelp extends EssentialsCommand
 		IText output;
 		String pageStr = args.length > 0 ? args[0] : null;
 		String chapterPageStr = args.length > 1 ? args[1] : null;
+		String command = commandLabel;
 		final IText input = new TextInput(user, "help", false, ess);

 		if (input.getLines().isEmpty())
@@ -31,7 +33,12 @@ public class Commandhelp extends EssentialsCommand
 			}
 			else
 			{
-				output = new HelpInput(user, pageStr, ess);
+				if (pageStr.length() > 26)
+				{
+					pageStr = pageStr.substring(0, 25);
+				}
+				output = new HelpInput(user, pageStr.toLowerCase(Locale.ENGLISH), ess);
+				command = command.concat(" ").concat(pageStr);
 				pageStr = chapterPageStr;
 			}
 			chapterPageStr = null;
@@ -41,7 +48,7 @@ public class Commandhelp extends EssentialsCommand
 			output = new KeywordReplacer(input, user, ess);
 		}
 		final TextPager pager = new TextPager(output);
-		pager.showPage(pageStr, chapterPageStr, commandLabel, user);
+		pager.showPage(pageStr, chapterPageStr, command, user);
 	}

 	@Override
@@ -22,8 +22,8 @@ public class Commandhelpop extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-
-		final String message = _("helpOp", user.getDisplayName(), Util.stripColor(getFinalArg(args, 0)));
+		user.setDisplayNick();
+		final String message = _("helpOp", user.getDisplayName(), Util.stripFormat(getFinalArg(args, 0)));
 		logger.log(Level.INFO, message);
 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
@@ -23,7 +23,6 @@ public class Commandhome extends EssentialsCommand
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
 		final Trade charge = new Trade(this.getName(), ess);
-		charge.isAffordableFor(user);
 		User player = user;
 		String homeName = "";
 		String[] nameParts;
@@ -45,7 +44,7 @@ public class Commandhome extends EssentialsCommand
 		}
 		try
 		{
-			if ("bed".equalsIgnoreCase(homeName))
+			if ("bed".equalsIgnoreCase(homeName) && user.isAuthorized("essentials.home.bed"))
 			{
 				final Location bed = player.getBedSpawnLocation();
 				if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK)
@@ -54,7 +53,7 @@ public class Commandhome extends EssentialsCommand
 					throw new NoChargeException();
 				}
 			}
-			user.getTeleport().home(player, homeName.toLowerCase(Locale.ENGLISH), charge);
+			goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge);
 		}
 		catch (NotEnoughArgumentsException e)
 		{
@@ -80,7 +79,7 @@ public class Commandhome extends EssentialsCommand
 			}
 			else if (homes.size() == 1 && player.equals(user))
 			{
-				user.getTeleport().home(player, homes.get(0), charge);
+				goHome(user, player, homes.get(0), charge);
 			}
 			else
 			{
@@ -93,4 +92,19 @@ public class Commandhome extends EssentialsCommand
 		}
 		throw new NoChargeException();
 	}
+
+	private void goHome(final User user, final User player, final String home, final Trade charge) throws Exception
+	{
+		final Location loc = player.getHome(home);
+		if (loc == null)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		if (user.getWorld() != loc.getWorld() && ess.getSettings().isWorldHomePermissions()
+			&& !user.isAuthorized("essentials.worlds." + loc.getWorld().getName()))
+		{
+			throw new Exception(_("noPerm", "essentials.worlds." + loc.getWorld().getName()));
+		}
+		user.getTeleport().home(loc, charge);
+	}
 }
@@ -32,15 +32,14 @@ public class Commandignore extends EssentialsCommand
 		{
 			throw new Exception(_("playerNotFound"));
 		}
-		final String name = player.getName();
-		if (user.isIgnoredPlayer(name))
+		if (user.isIgnoredPlayer(player))
 		{
-			user.setIgnoredPlayer(name, false);
+			user.setIgnoredPlayer(player, false);
 			user.sendMessage(_("unignorePlayer", player.getName()));
 		}
 		else
 		{
-			user.setIgnoredPlayer(name, true);
+			user.setIgnoredPlayer(player, true);
 			user.sendMessage(_("ignorePlayer", player.getName()));
 		}
 	}
@@ -1,10 +1,7 @@
 package com.earth2me.essentials.commands;

-import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import java.util.Arrays;
 import org.bukkit.Server;
-import org.bukkit.inventory.ItemStack;


 public class Commandinvsee extends EssentialsCommand
@@ -17,41 +14,12 @@ public class Commandinvsee extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-
-		if (args.length < 1 && user.getSavedInventory() == null)
+		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		User invUser = user;
-		if (args.length == 1)
-		{
-			invUser = getPlayer(server, args, 0);
-		}
-		if (invUser == user && user.getSavedInventory() != null)
-		{
-			invUser.getInventory().setContents(user.getSavedInventory());
-			user.setSavedInventory(null);
-			user.sendMessage(_("invRestored"));
-			throw new NoChargeException();
-		}
-
-		if (user.getSavedInventory() == null)
-		{
-			user.setSavedInventory(user.getInventory().getContents());
-		}
-		ItemStack[] invUserStack = invUser.getInventory().getContents();
-		final int userStackLength = user.getInventory().getContents().length;
-		if (invUserStack.length < userStackLength)
-		{
-			invUserStack = Arrays.copyOf(invUserStack, userStackLength);
-		}
-		if (invUserStack.length > userStackLength)
-		{
-			throw new Exception(_("invBigger"));
-		}
-		user.getInventory().setContents(invUserStack);
-		user.sendMessage(_("invSee", invUser.getDisplayName()));
-		user.sendMessage(_("invSeeHelp"));
-		throw new NoChargeException();
+		final User invUser = getPlayer(server, args, 0);
+		user.setInvSee(true);
+		user.openInventory(invUser.getInventory());
 	}
 }
@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import java.util.Locale;
 import org.bukkit.Material;
 import org.bukkit.Server;
@@ -36,41 +36,46 @@ public class Commanditem extends EssentialsCommand
 		{
 			throw new Exception(_("cantSpawnItem", itemname));
 		}
-
-		if (args.length > 1 && Integer.parseInt(args[1]) > 0)
+		try
 		{
-			stack.setAmount(Integer.parseInt(args[1]));
-		}
-		else if (ess.getSettings().getDefaultStackSize() > 0)
-		{
-			stack.setAmount(ess.getSettings().getDefaultStackSize());
-		}
-		else if (ess.getSettings().getOversizedStackSize() > 0 && user.isAuthorized("essentials.oversizedstacks"))
-		{
-			stack.setAmount(ess.getSettings().getOversizedStackSize());
-		}
-
-		if (args.length > 2)
-		{
-			for (int i = 2; i < args.length; i++)
+			if (args.length > 1 && Integer.parseInt(args[1]) > 0)
 			{
-				final String[] split = args[i].split("[:+',;.]", 2);
-				if (split.length < 1)
-				{
-					continue;
-				}
-				final Enchantment enchantment = Commandenchant.getEnchantment(split[0], user);
-				int level;
-				if (split.length > 1)
-				{
-					level = Integer.parseInt(split[1]);
-				}
-				else
-				{
-					level = enchantment.getMaxLevel();
-				}
-				stack.addEnchantment(enchantment, level);
+				stack.setAmount(Integer.parseInt(args[1]));
 			}
+			else if (ess.getSettings().getDefaultStackSize() > 0)
+			{
+				stack.setAmount(ess.getSettings().getDefaultStackSize());
+			}
+			else if (ess.getSettings().getOversizedStackSize() > 0 && user.isAuthorized("essentials.oversizedstacks"))
+			{
+				stack.setAmount(ess.getSettings().getOversizedStackSize());
+			}
+			if (args.length > 2)
+			{
+				for (int i = 2; i < args.length; i++)
+				{
+					final String[] split = args[i].split("[:+',;.]", 2);
+					if (split.length < 1)
+					{
+						continue;
+					}
+					final Enchantment enchantment = Commandenchant.getEnchantment(split[0], user);
+					int level;
+					if (split.length > 1)
+					{
+						level = Integer.parseInt(split[1]);
+					}
+					else
+					{
+						level = enchantment.getMaxLevel();
+					}
+					stack.addEnchantment(enchantment, level);
+				}
+			}
+		}
+		catch (NumberFormatException e)
+		{
+			throw new NotEnoughArgumentsException();
 		}

 		if (stack.getType() == Material.AIR)
@@ -1,5 +1,7 @@
 package com.earth2me.essentials.commands;

+import static com.earth2me.essentials.I18n._;
+import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,10 +19,12 @@ public class Commanditemdb extends EssentialsCommand
 	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
 		ItemStack itemStack = null;
+		boolean itemHeld = false;
 		if (args.length < 1)
 		{
 			if (sender instanceof Player)
 			{
+				itemHeld = true;
 				itemStack = ((Player)sender).getItemInHand();
 			}
 			if (itemStack == null)
@@ -32,6 +36,21 @@ public class Commanditemdb extends EssentialsCommand
 		{
 			itemStack = ess.getItemDb().get(args[0]);
 		}
-		sender.sendMessage(itemStack.getType().toString() + "- " + itemStack.getTypeId() + ":" + Integer.toString(itemStack.getData().getData()));
+		sender.sendMessage(_("itemType", itemStack.getType().toString(), itemStack.getTypeId() + ":" + Integer.toString(itemStack.getDurability())));
+
+		if (itemHeld && itemStack.getType() != Material.AIR)
+		{
+			int maxuses = itemStack.getType().getMaxDurability();
+			int durability = ((maxuses + 1) - itemStack.getDurability());
+			if (maxuses != 0)
+			{
+				sender.sendMessage(_("durability", Integer.toString(durability)));
+			}
+		}
+		final String itemNameList = ess.getItemDb().names(itemStack);
+		if (itemNameList != null)
+		{
+			sender.sendMessage(_("itemNames", ess.getItemDb().names(itemStack)));
+		}
 	}
 }
@@ -8,7 +8,7 @@ import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

-
+// This method contains an undocumented sub command #EasterEgg
 public class Commandjump extends EssentialsCommand
 {
 	public Commandjump()
@@ -19,6 +19,21 @@ public class Commandjump extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
+		if (args.length > 0 && args[0].contains("lock") && user.isAuthorized("essentials.jump.lock"))
+		{
+			if (user.isFlyClickJump())
+			{
+				user.setRightClickJump(false);
+				user.sendMessage("Flying wizard mode disabled");
+			}
+			else
+			{
+				user.setRightClickJump(true);
+				user.sendMessage("Enabling flying wizard mode");
+			}
+			return;
+		}
+
 		Location loc;
 		final Location cloc = user.getLocation();

@@ -37,5 +52,6 @@ public class Commandjump extends EssentialsCommand
 		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
 		user.getTeleport().teleport(loc, charge, TeleportCause.COMMAND);
+		throw new NoChargeException();
 	}
 }
@@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
 import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import java.util.logging.Level;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -23,21 +24,29 @@ public class Commandkick extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}

-		final User user = getPlayer(server, args, 0);
-		if (user.isAuthorized("essentials.kick.exempt"))
-		{
-			throw new Exception(_("kickExempt"));
+		final User target = getPlayer(server, args, 0, true);
+		if (sender instanceof Player) {
+			User user = ess.getUser(sender);
+			if (target.isHidden() && !user.isAuthorized("essentials.list.hidden")) {
+				throw new PlayerNotFoundException();
+			}
+			if (target.isAuthorized("essentials.kick.exempt"))
+			{
+				throw new Exception(_("kickExempt"));
+			}
 		}
 		final String kickReason = args.length > 1 ? getFinalArg(args, 1) : _("kickDefault");
-		user.kickPlayer(kickReason);
+		target.kickPlayer(kickReason);
 		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
+		
+		server.getLogger().log(Level.INFO, _("playerKicked", senderName, target.getName(), kickReason));

 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
 			User player = ess.getUser(onlinePlayer);
 			if (player.isAuthorized("essentials.kick.notify"))
 			{
-				onlinePlayer.sendMessage(_("playerKicked", senderName, user.getName(), kickReason));
+				onlinePlayer.sendMessage(_("playerKicked", senderName, target.getName(), kickReason));
 			}
 		}
 	}
@@ -27,5 +27,6 @@ public class Commandkickall extends EssentialsCommand
 				onlinePlayer.kickPlayer(args.length > 0 ? getFinalArg(args, 0) : _("kickDefault"));
 			}
 		}
+		sender.sendMessage(_("kickedAll"));
 	}
 }
@@ -22,17 +22,28 @@ public class Commandkill extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}

+		//TODO: TL this
+		if (args[0].trim().length() < 2)
+		{
+			throw new NotEnoughArgumentsException("You need to specify a player to kill.");
+		}
+
 		for (Player matchPlayer : server.matchPlayer(args[0]))
 		{
-			final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, 1000);
+			final EntityDamageEvent ede = new EntityDamageEvent(matchPlayer, sender instanceof Player && ((Player)sender).getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE);
 			server.getPluginManager().callEvent(ede);
-			if (ede.isCancelled() && !sender.hasPermission("essentials.kill.force"))
+			if (ede.isCancelled() && sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.kill.force"))
 			{
 				continue;
 			}

-			matchPlayer.damage(1000);
-			matchPlayer.setHealth(0);
+			matchPlayer.damage(Short.MAX_VALUE);
+					
+			if (matchPlayer.getHealth() > 0)
+			{
+				matchPlayer.setHealth(0);
+			}
+
 			sender.sendMessage(_("kill", matchPlayer.getDisplayName()));
 		}
 	}
@@ -1,26 +1,14 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.Mob;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Mob;
 import java.util.Collections;
 import java.util.Locale;
 import org.bukkit.Chunk;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.ComplexLivingEntity;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Flying;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.NPC;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Snowman;
-import org.bukkit.entity.WaterMob;
-import org.bukkit.entity.Wolf;
+import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDeathEvent;


@@ -61,7 +49,7 @@ public class Commandkillall extends EssentialsCommand
 				}
 				catch (NumberFormatException e)
 				{
-					throw new Exception(_("numberRequired"));
+					throw new Exception(_("numberRequired"), e);
 				}
 			}
 		}
@@ -121,11 +109,18 @@ public class Commandkillall extends EssentialsCommand
 						continue;
 					}
 				}
+				if(entity instanceof Ocelot)
+				{
+					if (((Ocelot)entity).isTamed())
+					{
+						continue;
+					}
+				}
 				if (animals)
 				{
 					if (entity instanceof Animals || entity instanceof NPC || entity instanceof Snowman || entity instanceof WaterMob)
 					{
-						EntityDeathEvent event = new EntityDeathEvent(entity, Collections.EMPTY_LIST);
+						EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.EMPTY_LIST);
 						ess.getServer().getPluginManager().callEvent(event);
 						entity.remove();
 						numKills++;
@@ -135,7 +130,7 @@ public class Commandkillall extends EssentialsCommand
 				{
 					if (entity instanceof Monster || entity instanceof ComplexLivingEntity || entity instanceof Flying || entity instanceof Slime)
 					{
-						EntityDeathEvent event = new EntityDeathEvent(entity, Collections.EMPTY_LIST);
+						EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.EMPTY_LIST);
 						ess.getServer().getPluginManager().callEvent(event);
 						entity.remove();
 						numKills++;
@@ -143,14 +138,14 @@ public class Commandkillall extends EssentialsCommand
 				}
 				else if (all)
 				{
-					EntityDeathEvent event = new EntityDeathEvent(entity, Collections.EMPTY_LIST);
+					EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.EMPTY_LIST);
 					ess.getServer().getPluginManager().callEvent(event);
 					entity.remove();
 					numKills++;
 				}
 				else if (entityClass != null && entityClass.isAssignableFrom(entity.getClass()))
 				{
-					EntityDeathEvent event = new EntityDeathEvent(entity, Collections.EMPTY_LIST);
+					EntityDeathEvent event = new EntityDeathEvent((LivingEntity)entity, Collections.EMPTY_LIST);
 					ess.getServer().getPluginManager().callEvent(event);
 					entity.remove();
 					numKills++;
@@ -1,9 +1,15 @@
 package com.earth2me.essentials.commands;

-import com.earth2me.essentials.*;
 import static com.earth2me.essentials.I18n._;
-import java.util.*;
+import com.earth2me.essentials.Kit;
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;


 public class Commandkit extends EssentialsCommand
@@ -19,38 +25,68 @@ public class Commandkit extends EssentialsCommand
 		if (args.length < 1)
 		{
 			final String kitList = Kit.listKits(ess, user);
-			if (kitList.length() > 0)
-			{
-				user.sendMessage(_("kits", kitList));
-			}
-			else
-			{
-				user.sendMessage(_("noKits"));
-			}
+			user.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
+			throw new NoChargeException();
+		}
+		else if (args.length > 1 && user.isAuthorized("essentials.kit.others"))
+		{
+			final User userTo = getPlayer(server, args, 1, true);
+			final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)).trim();
+			giveKit(userTo, user, kitName);
+		}
+		else
+		{
+			final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)).trim();
+			giveKit(user, user, kitName);
+		}
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			final String kitList = Kit.listKits(ess, null);
+			sender.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
 			throw new NoChargeException();
 		}
 		else
 		{
+			final User userTo = getPlayer(server, args, 1, true);
 			final String kitName = args[0].toLowerCase(Locale.ENGLISH);
-			final Object kit = ess.getSettings().getKit(kitName);

-			if (!user.isAuthorized("essentials.kit." + kitName))
-			{
-				throw new Exception(_("noKitPermission", "essentials.kit." + kitName));
-			}
-			final Map<String, Object> els = (Map<String, Object>)kit;
-			final List<String> items = Kit.getItems(user, els);
-
-			Kit.checkTime(user, kitName, els);
-
-			final Trade charge = new Trade("kit-" + kitName, ess);
-			charge.isAffordableFor(user);
-
-			Kit.expandItems(ess, user, items);
-			
-			charge.charge(user);
-			user.sendMessage(_("kitGive", kitName));
+			final Map<String, Object> kit = ess.getSettings().getKit(kitName);
+			final List<String> items = Kit.getItems(userTo, kit);
+			Kit.expandItems(ess, userTo, items);

+			sender.sendMessage(_("kitGive", kitName));
 		}
 	}
+
+	private void giveKit(User userTo, User userFrom, String kitName) throws Exception
+	{		
+		if (kitName.isEmpty())
+		{
+			throw new Exception(_("kitError2"));
+		}
+		
+		final Map<String, Object> kit = ess.getSettings().getKit(kitName);
+
+		if (!userFrom.isAuthorized("essentials.kits." + kitName))
+		{
+			throw new Exception(_("noKitPermission", "essentials.kits." + kitName));
+		}
+
+		final List<String> items = Kit.getItems(userTo, kit);
+
+		Kit.checkTime(userFrom, kitName, kit);
+
+		final Trade charge = new Trade("kit-" + kitName, ess);
+		charge.isAffordableFor(userFrom);
+
+		Kit.expandItems(ess, userTo, items);
+
+		charge.charge(userFrom);
+		userTo.sendMessage(_("kitGive", kitName));
+	}
 }
@@ -0,0 +1,44 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.Mob;
+import com.earth2me.essentials.User;
+import java.util.Random;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.entity.Ocelot;
+
+// This command is not documented on the wiki #EasterEgg
+public class Commandkittycannon extends EssentialsCommand
+{
+	private static Random random = new Random();
+
+	public Commandkittycannon()
+	{
+		super("kittycannon");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		final Mob cat = Mob.OCELOT;
+		final Ocelot ocelot = (Ocelot)cat.spawn(user, server, user.getEyeLocation());
+		if (ocelot == null)
+		{
+			return;
+		}
+		final int i = random.nextInt(Ocelot.Type.values().length);
+		ocelot.setCatType(Ocelot.Type.values()[i]);
+		ocelot.setTamed(true);
+		ocelot.setVelocity(user.getEyeLocation().getDirection().multiply(2));
+		ess.scheduleSyncDelayedTask(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				final Location loc = ocelot.getLocation();
+				ocelot.remove();
+				loc.getWorld().createExplosion(loc, 0F);
+			}
+		}, 20);
+	}
+}
@@ -23,11 +23,11 @@ public class Commandlightning extends EssentialsCommand
 		if (sender instanceof Player)
 		{
 			user = ess.getUser(((Player)sender));
-		}
-		if (args.length < 1 & user != null)
-		{
-			user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
-			return;
+			if ((args.length < 1 || user != null && !user.isAuthorized("essentials.lightning.others")))
+			{
+				user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
+				return;
+			}
 		}

 		if (server.matchPlayer(args[0]).isEmpty())
@@ -35,7 +35,7 @@ public class Commandlightning extends EssentialsCommand
 			throw new Exception(_("playerNotFound"));
 		}

-		int power = 1;
+		int power = 5;
 		if (args.length > 1)
 		{
 			try
@@ -50,18 +50,12 @@ public class Commandlightning extends EssentialsCommand
 		for (Player matchPlayer : server.matchPlayer(args[0]))
 		{
 			sender.sendMessage(_("lightningUse", matchPlayer.getDisplayName()));
-			if (power <= 0)
-			{
-				matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
-			}
-			else
-			{
-				LightningStrike strike = matchPlayer.getWorld().strikeLightning(matchPlayer.getLocation());
-				matchPlayer.damage(power - 1, strike);
-			}
+
+			final LightningStrike strike = matchPlayer.getWorld().strikeLightningEffect(matchPlayer.getLocation());
+			
 			if (!ess.getUser(matchPlayer).isGodModeEnabled())
 			{
-				matchPlayer.setHealth(matchPlayer.getHealth() < 5 ? 0 : matchPlayer.getHealth() - 5);
+				matchPlayer.damage(power, strike);
 			}
 			if (ess.getSettings().warnOnSmite())
 			{
@@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;

 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 import java.util.*;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
@@ -43,8 +44,10 @@ public class Commandlist extends EssentialsCommand
 		if (showhidden && playerHidden > 0)
 		{
 			online = _("listAmountHidden", server.getOnlinePlayers().length - playerHidden, playerHidden, server.getMaxPlayers());
-		} else {
-			online = _("listAmount",server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers());
+		}
+		else
+		{
+			online = _("listAmount", server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers());
 		}
 		sender.sendMessage(online);

@@ -72,7 +75,7 @@ public class Commandlist extends EssentialsCommand
 			for (String group : groups)
 			{
 				final StringBuilder groupString = new StringBuilder();
-				groupString.append(group).append(": ");
+				groupString.append(_("listGroupTag", Util.replaceFormat(group)));
 				final List<User> users = sort.get(group);
 				Collections.sort(users);
 				boolean first = true;
@@ -94,6 +97,7 @@ public class Commandlist extends EssentialsCommand
 					{
 						groupString.append(_("listHiddenTag"));
 					}
+					user.setDisplayNick();
 					groupString.append(user.getDisplayName());
 					groupString.append("§f");
 				}
@@ -135,6 +139,7 @@ public class Commandlist extends EssentialsCommand
 				{
 					onlineUsers.append(_("listHiddenTag"));
 				}
+				user.setDisplayNick();
 				onlineUsers.append(user.getDisplayName());
 				onlineUsers.append("§f");
 			}
@@ -4,14 +4,15 @@ import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import java.util.List;
-import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;


 public class Commandmail extends EssentialsCommand
 {
+	private static int mailsPerMinute = 0;
+	private static long timestamp = 0;
+
 	public Commandmail()
 	{
 		super("mail");
@@ -43,24 +44,29 @@ public class Commandmail extends EssentialsCommand
 				throw new Exception(_("noPerm", "essentials.mail.send"));
 			}

-			Player player = server.getPlayer(args[1]);
-			User u;
-			if (player != null)
-			{
-				u = ess.getUser(player);
-			}
-			else
-			{
-				u = ess.getOfflineUser(args[1]);
-			}
+			User u = ess.getUser(args[1]);
 			if (u == null)
 			{
 				throw new Exception(_("playerNeverOnServer", args[1]));
 			}
-			if (!u.isIgnoredPlayer(user.getName()))
+			if (!u.isIgnoredPlayer(user))
 			{
-				final String mail = Util.sanitizeString(Util.stripColor(getFinalArg(args, 2)));
-				u.addMail(user.getName() + ": " + mail);
+				final String mail = user.getName() + ": " + Util.sanitizeString(Util.stripFormat(getFinalArg(args, 2)));
+				if (mail.length() > 1000)
+				{
+					throw new Exception("Mail message too long. Try to keep it below 1000");
+				}
+				if (Math.abs(System.currentTimeMillis() - timestamp) > 60000)
+				{
+					timestamp = System.currentTimeMillis();
+					mailsPerMinute = 0;
+				}
+				mailsPerMinute++;
+				if (mailsPerMinute > ess.getSettings().getMailsPerMinute())
+				{
+					throw new Exception("Too many mails have been send within the last minute. Maximum: " + ess.getSettings().getMailsPerMinute());
+				}
+				u.addMail(mail);
 			}
 			user.sendMessage(_("mailSent"));
 			return;
@@ -71,7 +77,7 @@ public class Commandmail extends EssentialsCommand
 			{
 				throw new Exception(_("noPerm", "essentials.mail.sendall"));
 			}
-			ess.scheduleAsyncDelayedTask(new SendAll(user.getName() + ": " + Util.stripColor(getFinalArg(args, 1))));
+			ess.scheduleAsyncDelayedTask(new SendAll(user.getName() + ": " + Util.stripFormat(getFinalArg(args, 1))));
 			user.sendMessage(_("mailSent"));
 			return;
 		}
@@ -97,16 +103,7 @@ public class Commandmail extends EssentialsCommand
 		}
 		else if (args.length >= 3 && "send".equalsIgnoreCase(args[0]))
 		{
-			Player player = server.getPlayer(args[1]);
-			User u;
-			if (player != null)
-			{
-				u = ess.getUser(player);
-			}
-			else
-			{
-				u = ess.getOfflineUser(args[1]);
-			}
+			User u = ess.getUser(args[1]);
 			if (u == null)
 			{
 				throw new Exception(_("playerNeverOnServer", args[1]));
@@ -122,16 +119,7 @@ public class Commandmail extends EssentialsCommand
 		else if (args.length >= 2)
 		{
 			//allow sending from console without "send" argument, since it's the only thing the console can do
-			Player player = server.getPlayer(args[0]);
-			User u;
-			if (player != null)
-			{
-				u = ess.getUser(player);
-			}
-			else
-			{
-				u = ess.getOfflineUser(args[0]);
-			}
+			User u = ess.getUser(args[0]);
 			if (u == null)
 			{
 				throw new Exception(_("playerNeverOnServer", args[0]));
@@ -27,15 +27,9 @@ public class Commandme extends EssentialsCommand
 		}

 		String message = getFinalArg(args, 0);
-		if (user.isAuthorized("essentials.chat.color"))
-		{
-			message = Util.replaceColor(message);
-		}
-		else {
-			message = Util.stripColor(message);
-		}
-		
+		message = Util.formatMessage(user, "essentials.chat", message);	

+		user.setDisplayNick();
 		ess.broadcastMessage(user, _("action", user.getDisplayName(), message));
 	}
 }
@@ -21,11 +21,11 @@ public class Commandmsg extends EssentialsCommand
 	@Override
 	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		if (args.length < 2 || args[0].trim().isEmpty() || args[1].trim().isEmpty())
+		if (args.length < 2 || args[0].trim().length() < 2  || args[1].trim().isEmpty())
 		{
 			throw new NotEnoughArgumentsException();
 		}
-
+	
 		String message = getFinalArg(args, 1);
 		if (sender instanceof Player)
 		{
@@ -34,18 +34,11 @@ public class Commandmsg extends EssentialsCommand
 			{
 				throw new Exception(_("voiceSilenced"));
 			}
-			if (user.isAuthorized("essentials.msg.color"))
-			{
-				message = Util.replaceColor(message);
-			}
-			else
-			{
-				message = Util.stripColor(message);
-			}
+			message = Util.formatMessage(user, "essentials.msg", message);
 		}
 		else
 		{
-			message = Util.replaceColor(message);
+			message = Util.replaceFormat(message);
 		}

 		final String translatedMe = _("me");
@@ -88,7 +81,7 @@ public class Commandmsg extends EssentialsCommand
 		{
 			sender.sendMessage(_("msgFormat", translatedMe, matchedPlayer.getDisplayName(), message));
 			final User matchedUser = ess.getUser(matchedPlayer);
-			if (sender instanceof Player && (matchedUser.isIgnoredPlayer(((Player)sender).getName()) || matchedUser.isHidden()))
+			if (sender instanceof Player && (matchedUser.isIgnoredPlayer(ess.getUser(sender)) || matchedUser.isHidden()))
 			{
 				continue;
 			}
@@ -28,13 +28,19 @@ public class Commandmute extends EssentialsCommand
 			throw new Exception(_("muteExempt"));
 		}
 		long muteTimestamp = 0;
+
 		if (args.length > 1)
 		{
-			String time = getFinalArg(args, 1);
+			final String time = getFinalArg(args, 1);
 			muteTimestamp = Util.parseDateDiff(time, true);
+			player.setMuted(true);
+		}
+		else
+		{
+			player.setMuted(!player.getMuted());
 		}
 		player.setMuteTimeout(muteTimestamp);
-		final boolean muted = player.toggleMuted();
+		final boolean muted = player.getMuted();
 		sender.sendMessage(
 				muted
 				? (muteTimestamp > 0
@@ -64,11 +64,13 @@ public class Commandnick extends EssentialsCommand

 	private String formatNickname(final User user, final String nick)
 	{
-		if (user == null || user.isAuthorized("essentials.nick.color"))
+		if (user == null)
 		{
-			return nick.replace('&', '\u00a7').replaceAll("\u00a7+k", "");
-		} else {
-			return Util.stripColor(nick);
+			return Util.replaceFormat(nick);
+		}
+		else
+		{
+			return Util.formatString(user, "essentials.nick", nick);
 		}
 	}

@@ -51,7 +51,7 @@ public class Commandnuke extends EssentialsCommand
 			{
 				for (int z = -10; z <= 10; z += 5)
 				{
-					final Location tntloc = new Location(world, loc.getBlockX() + x, 127, loc.getBlockZ() + z);
+					final Location tntloc = new Location(world, loc.getBlockX() + x, world.getHighestBlockYAt(loc) + 64, loc.getBlockZ() + z);
 					final TNTPrimed tnt = world.spawn(tntloc, TNTPrimed.class);
 				}
 			}
@@ -22,14 +22,15 @@ public class Commandpay extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		
-		if (args[0] == "")
+		//TODO: TL this
+		if (args[0].trim().length() < 2)
 		{
 			throw new NotEnoughArgumentsException("You need to specify a player to pay.");
 		}

 		double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", ""));

-		Boolean foundUser = false;
+		boolean foundUser = false;
 		for (Player p : server.matchPlayer(args[0]))
 		{
 			User u = ess.getUser(p);
@@ -42,9 +43,9 @@ public class Commandpay extends EssentialsCommand
 			foundUser = true;
 		}

-		if (foundUser == false)
+		if (!foundUser)
 		{
-			throw new NoSuchFieldException(_("playerNotFound"));
+			throw new NotEnoughArgumentsException(_("playerNotFound"));
 		}
 	}
 }
@@ -5,7 +5,7 @@ import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;

-
+// This command can be used to echo messages to the users screen, mostly useless but also an #EasterEgg
 public class Commandping extends EssentialsCommand
 {
 	public Commandping()
@@ -23,7 +23,7 @@ public class Commandping extends EssentialsCommand
 		}
 		else
 		{
-			sender.sendMessage(Util.replaceColor(getFinalArg(args, 0)));
+			sender.sendMessage(Util.replaceFormat(getFinalArg(args, 0)));
 		}
 	}
 }
@@ -51,26 +51,18 @@ public class Commandpowertool extends EssentialsCommand
 				{
 					user.sendMessage(_("powerToolList", Util.joinList(powertools), itemName));
 				}
-				return;
+				throw new NoChargeException();
 			}
 			if (command.startsWith("r:"))
 			{
-				try
+				command = command.substring(2);
+				if (!powertools.contains(command))
 				{
-					command = command.substring(2);
-					if (!powertools.contains(command))
-					{
-						throw new Exception(_("powerToolNoSuchCommandAssigned", command, itemName));
-					}
+					throw new Exception(_("powerToolNoSuchCommandAssigned", command, itemName));
+				}

-					powertools.remove(command);
-					user.sendMessage(_("powerToolRemove", command, itemName));
-				}
-				catch (Exception e)
-				{
-					user.sendMessage(e.getMessage());
-					return;
-				}
+				powertools.remove(command);
+				user.sendMessage(_("powerToolRemove", command, itemName));
 			}
 			else
 			{
@@ -85,7 +77,6 @@ public class Commandpowertool extends EssentialsCommand
 					{
 						throw new Exception(_("powerToolAlreadySet", command, itemName));
 					}
-
 				}
 				else if (powertools != null && !powertools.isEmpty())
 				{
@@ -110,6 +101,11 @@ public class Commandpowertool extends EssentialsCommand
 			user.sendMessage(_("powerToolRemoveAll", itemName));
 		}

+		if (!user.arePowerToolsEnabled())
+		{
+			user.setPowerToolsEnabled(true);
+			user.sendMessage(_("powerToolsEnabled"));
+		}
 		user.setPowertool(itemStack, powertools);
 	}
 }
@@ -55,7 +55,7 @@ public class Commandptime extends EssentialsCommand
 		Long ticks;
 		// Parse the target time int ticks from args[0]
 		String timeParam = args[0];
-		Boolean relative = true;
+		boolean relative = true;
 		if (timeParam.startsWith("@"))
 		{
 			relative = false;
@@ -79,7 +79,7 @@ public class Commandptime extends EssentialsCommand
 			}
 			catch (NumberFormatException e)
 			{
-				throw new NotEnoughArgumentsException();
+				throw new NotEnoughArgumentsException(e);
 			}
 		}

@@ -32,20 +32,13 @@ public class Commandr extends EssentialsCommand
 		if (sender instanceof Player)
 		{
 			User user = ess.getUser(sender);
-			if (user.isAuthorized("essentials.msg.color"))
-			{
-				message = Util.replaceColor(message);
-			}
-			else
-			{
-				message = Util.stripColor(message);
-			}
+			message = Util.formatMessage(user, "essentials.msg", message);			
 			replyTo = user;
 			senderName = user.getDisplayName();
 		}
 		else
 		{
-			message = Util.replaceColor(message);
+			message = Util.replaceFormat(message);
 			replyTo = Console.getConsoleReplyTo();
 			senderName = Console.NAME;
 		}
@@ -62,7 +55,7 @@ public class Commandr extends EssentialsCommand
 		if (target instanceof Player)
 		{
 			User player = ess.getUser(target);
-			if (player.isIgnoredPlayer(sender instanceof Player ? ((Player)sender).getName() : Console.NAME))
+			if (sender instanceof Player && player.isIgnoredPlayer(ess.getUser(sender)))
 			{
 				return;
 			}
@@ -24,6 +24,7 @@ public class Commandrealname extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		final String whois = args[0].toLowerCase(Locale.ENGLISH);
+		boolean foundUser = false;
 		for (Player onlinePlayer : server.getOnlinePlayers())
 		{
 			final User u = ess.getUser(onlinePlayer);
@@ -31,14 +32,17 @@ public class Commandrealname extends EssentialsCommand
 			{
 				continue;
 			}
-			final String displayName = Util.stripColor(u.getDisplayName()).toLowerCase(Locale.ENGLISH);
-			if (!whois.equals(displayName)
-				&& !displayName.equals(Util.stripColor(ess.getSettings().getNicknamePrefix()) + whois)
-				&& !whois.equalsIgnoreCase(u.getName()))
+			u.setDisplayNick();
+			final String displayName = Util.stripFormat(u.getDisplayName()).toLowerCase(Locale.ENGLISH);
+			if (displayName.contains(whois))
 			{
-				continue;
+				foundUser = true;
+				sender.sendMessage(u.getDisplayName() + " " + _("is") + " " + u.getName());
 			}
-			sender.sendMessage(u.getDisplayName() + " " + _("is") + " " + u.getName());
+		}
+		if (!foundUser)
+		{
+			throw new NoSuchFieldException(_("playerNotFound"));
 		}
 	}
 }