Add a little bit of extra information to /seen, this will show when user is online.

Still bugged in CB: maxAmount of items

.gitignore

@@ -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

BuildAll/nbproject/build-impl.xml

@@ -948,6 +948,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"/>
@@ -1484,6 +1491,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"/>

BuildAll/nbproject/genfiles.properties

@@ -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=2a17f1e9
+nbproject/build-impl.xml.data.CRC32=b4df970c
+nbproject/build-impl.xml.script.CRC32=8905537e
 nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46

BuildAll/nbproject/project.properties

@@ -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

BuildAll/nbproject/project.xml

@@ -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>

Essentials/nbproject/project.properties

@@ -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
@@ -68,7 +68,6 @@ file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
 file.reference.bPermissions.jar=../lib/bPermissions.jar
 file.reference.bpermissions2.jar=../lib/bpermissions2.jar
 file.reference.bukkit.jar=../lib/bukkit.jar
-file.reference.craftbukkit.jar=../lib/craftbukkit.jar
 file.reference.iCo4.jar=../lib/iCo4.jar
 file.reference.iCo5.jar=../lib/iCo5.jar
 file.reference.iCo6.jar=../lib/iCo6.jar
@@ -96,12 +95,11 @@ javac.classpath=\
     ${file.reference.lombok.jar}:\
     ${reference.EssentialsGroupManager.jar}:\
     ${file.reference.bukkit.jar}:\
-    ${file.reference.craftbukkit.jar}:\
     ${file.reference.Vault.jar}:\
     ${file.reference.Privileges.jar}:\
     ${file.reference.bpermissions2.jar}
 # Space-separated list of extra javac options
-javac.compilerargs=
+javac.compilerargs=-Xlint:unchecked
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}

Essentials/src/com/earth2me/essentials/DescParseTickFormat.java

@@ -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);

Essentials/src/com/earth2me/essentials/Enchantments.java

@@ -13,101 +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("sharp", Enchantment.DAMAGE_ALL);
-		
-		ENCHANTMENTS.put("arthropodsdamage", Enchantment.DAMAGE_ARTHROPODS);
+		ALIASENCHANTMENTS.put("dal", Enchantment.DAMAGE_ALL);
+				
 		ENCHANTMENTS.put("ardmg", Enchantment.DAMAGE_ARTHROPODS);
 		ENCHANTMENTS.put("baneofarthropods", Enchantment.DAMAGE_ARTHROPODS);
-		ENCHANTMENTS.put("baneofarthropod", Enchantment.DAMAGE_ARTHROPODS);
-		ENCHANTMENTS.put("arthropod", 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);
-		ENCHANTMENTS.put("minespeed", Enchantment.DIG_SPEED);
-		ENCHANTMENTS.put("cutspeed", 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);
-		ENCHANTMENTS.put("meleefire", Enchantment.FIRE_ASPECT);
-		ENCHANTMENTS.put("meleeflame", 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);
+		ALIASENCHANTMENTS.put("k", Enchantment.KNOCKBACK);
 		
-		ENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
+		ALIASENCHANTMENTS.put("blockslootbonus", Enchantment.LOOT_BONUS_BLOCKS);
 		ENCHANTMENTS.put("fortune", Enchantment.LOOT_BONUS_BLOCKS);
+		ALIASENCHANTMENTS.put("lbb", Enchantment.LOOT_BONUS_BLOCKS);
 		
-		ENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
+		ALIASENCHANTMENTS.put("mobslootbonus", Enchantment.LOOT_BONUS_MOBS);
 		ENCHANTMENTS.put("mobloot", Enchantment.LOOT_BONUS_MOBS);
 		ENCHANTMENTS.put("looting", Enchantment.LOOT_BONUS_MOBS);
+		ALIASENCHANTMENTS.put("lbm", Enchantment.LOOT_BONUS_MOBS);
 		
-		ENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
+		ALIASENCHANTMENTS.put("oxygen", Enchantment.OXYGEN);
 		ENCHANTMENTS.put("respiration", Enchantment.OXYGEN);
-		ENCHANTMENTS.put("breathing", 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);
+		ALIASENCHANTMENTS.put("prot", Enchantment.PROTECTION_ENVIRONMENTAL);
 		ENCHANTMENTS.put("protect", Enchantment.PROTECTION_ENVIRONMENTAL);
+		ALIASENCHANTMENTS.put("p", Enchantment.PROTECTION_ENVIRONMENTAL);
 		
-		ENCHANTMENTS.put("explosionsprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("explosionprotection", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("expprot", Enchantment.PROTECTION_EXPLOSIONS);
-		ENCHANTMENTS.put("blastprotection", Enchantment.PROTECTION_EXPLOSIONS);
+		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);
 		
-		ENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
+		ALIASENCHANTMENTS.put("fallprotection", Enchantment.PROTECTION_FALL);
 		ENCHANTMENTS.put("fallprot", Enchantment.PROTECTION_FALL);
 		ENCHANTMENTS.put("featherfall", Enchantment.PROTECTION_FALL);
 		ENCHANTMENTS.put("featherfalling", Enchantment.PROTECTION_FALL);
+		ALIASENCHANTMENTS.put("pfa", Enchantment.PROTECTION_FALL);
 		
-		ENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
-		ENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("fireprotection", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("flameprotection", Enchantment.PROTECTION_FIRE);
 		ENCHANTMENTS.put("fireprotect", Enchantment.PROTECTION_FIRE);
-		ENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);
+		ALIASENCHANTMENTS.put("flameprotect", Enchantment.PROTECTION_FIRE);
 		ENCHANTMENTS.put("fireprot", Enchantment.PROTECTION_FIRE);
-		ENCHANTMENTS.put("flameprot", 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);
-		ENCHANTMENTS.put("softtouch", 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);
+		ALIASENCHANTMENTS.put("watermine", Enchantment.WATER_WORKER);
+		ALIASENCHANTMENTS.put("ww", Enchantment.WATER_WORKER);
 		
-		ENCHANTMENTS.put("firearrow", Enchantment.ARROW_FIRE);
+		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);
-		ENCHANTMENTS.put("arrowpower", 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);
+		ALIASENCHANTMENTS.put("arrowkb", Enchantment.ARROW_KNOCKBACK);
 		ENCHANTMENTS.put("punch", Enchantment.ARROW_KNOCKBACK);
-		ENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK);
+		ALIASENCHANTMENTS.put("arrowpunch", Enchantment.ARROW_KNOCKBACK);
+		ALIASENCHANTMENTS.put("ak", Enchantment.ARROW_KNOCKBACK);
 		
-		ENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
+		ALIASENCHANTMENTS.put("infinitearrows", Enchantment.ARROW_INFINITE);
 		ENCHANTMENTS.put("infarrows", Enchantment.ARROW_INFINITE);
 		ENCHANTMENTS.put("infinity", Enchantment.ARROW_INFINITE);
-		ENCHANTMENTS.put("infinite", Enchantment.ARROW_INFINITE);
-		ENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE);
-		ENCHANTMENTS.put("unlimitedarrows", 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) {
@@ -121,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;
 	}
 

Essentials/src/com/earth2me/essentials/Essentials.java

@@ -20,7 +20,6 @@ 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;
@@ -36,7 +35,6 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -67,7 +65,7 @@ import org.yaml.snakeyaml.error.YAMLException;
 
 public class Essentials extends JavaPlugin implements IEssentials
 {
-	public static final int BUKKIT_VERSION = 2317;
+	public static final int BUKKIT_VERSION = 2543;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 	private transient ISettings settings;
 	private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
@@ -330,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
@@ -470,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)
 	{
@@ -491,12 +494,13 @@ public class Essentials extends JavaPlugin implements IEssentials
 		{
 			return (User)base;
 		}
-		
-		if (userMap == null) {
+
+		if (userMap == null)
+		{
 			LOGGER.log(Level.WARNING, "Essentials userMap not initialized");
 			return null;
 		}
-		
+
 		User user = userMap.getUser(base.getName());
 
 		if (user == null)
@@ -510,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)
 	{
@@ -644,6 +637,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		return vanishedPlayers;
 	}
 
+
 	private static class EssentialsWorldListener implements Listener, Runnable
 	{
 		private transient final IEssentials ess;

Essentials/src/com/earth2me/essentials/EssentialsConf.java

@@ -5,25 +5,20 @@ import com.google.common.io.Files;
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+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
@@ -96,18 +91,7 @@ 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;
 			}
 		}
 
@@ -360,6 +344,11 @@ public class EssentialsConf extends YamlConfiguration
 		}
 	}
 
+	public void saveWithError() throws IOException
+	{
+		save(configFile);
+	}
+
 	@Override
 	public synchronized void save(final File file) throws IOException
 	{
@@ -372,6 +361,28 @@ public class EssentialsConf extends YamlConfiguration
 
 		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
@@ -398,4 +409,261 @@ public class EssentialsConf extends YamlConfiguration
 	{
 		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);
+	}
 }

Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java

@@ -2,20 +2,21 @@ 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.Ageable;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.*;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
+import org.bukkit.event.entity.*;
 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,6 +24,7 @@ public class EssentialsEntityListener implements Listener
 		this.ess = ess;
 	}
 
+	// This method does something undocumented reguarding certain bucket types #EasterEgg
 	@EventHandler(priority = EventPriority.LOW)
 	public void onEntityDamage(final EntityDamageByEntityEvent event)
 	{
@@ -32,53 +34,88 @@ public class EssentialsEntityListener implements Listener
 		{
 			final User defender = ess.getUser(eDefend);
 			final User attacker = ess.getUser(eAttack);
-
-			if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
-				&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
+			onPlayerVsPlayerDamage(event, defender, attacker);
+			onPlayerVsPlayerPowertool(event, defender, attacker);
+		}
+		else if (eDefend instanceof Player && eAttack instanceof Projectile)
+		{
+			Entity shooter = ((Projectile)event.getDamager()).getShooter();
+			if (shooter instanceof Player)
 			{
-				event.setCancelled(true);
+				final User defender = ess.getUser(eDefend);
+				final User attacker = ess.getUser(shooter);
+				onPlayerVsPlayerDamage(event, defender, attacker);
+				onPlayerVsPlayerPowertool(event, defender, attacker);
 			}
-
-			if (attacker.hasInvulnerabilityAfterTeleport() || defender.hasInvulnerabilityAfterTeleport())
+		}
+		else if (eAttack instanceof Player)
+		{
+			final User player = ess.getUser(eAttack);
+			player.updateActivity(true);
+			if (eDefend instanceof Ageable)
 			{
-				event.setCancelled(true);
-			}
-
-			attacker.updateActivity(true);
-			final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
-			if (commandList != null && !commandList.isEmpty())
-			{
-				for (final String command : commandList)
+				final ItemStack hand = player.getItemInHand();
+				if (hand != null && hand.getType() == Material.MILK_BUCKET)
 				{
-					if (command != null && !command.isEmpty())
-					{
-						ess.scheduleSyncDelayedTask(
-								new Runnable()
-								{
-									@Override
-									public void run()
-									{
-										attacker.getServer().dispatchCommand(attacker.getBase(), command.replaceAll("\\{player\\}", defender.getName()));
-									}
-								});
-
-						event.setCancelled(true);
-						return;
-					}
+					((Ageable)eDefend).setBaby();
+					hand.setType(Material.BUCKET);
+					player.setItemInHand(hand);
+					player.updateInventory();
+					event.setCancelled(true);
 				}
 			}
 		}
-		else if (eDefend instanceof Ageable && eAttack instanceof Player)
+	}
+
+	private void onPlayerVsPlayerDamage(final EntityDamageByEntityEvent event, final User defender, final User attacker)
+	{
+		if (ess.getSettings().getLoginAttackDelay() > 0 && !attacker.isAuthorized("essentials.pvpdelay.exempt")
+			&& (System.currentTimeMillis() < (attacker.getLastLogin() + ess.getSettings().getLoginAttackDelay())))
 		{
-			final Player player = (Player)eAttack;
-			final ItemStack hand = player.getItemInHand();
-			if (hand != null && hand.getType() == Material.MILK_BUCKET)
+			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);
+	}
+
+	private void onPlayerVsPlayerPowertool(final EntityDamageByEntityEvent event, final User defender, final User attacker)
+	{
+		final List<String> commandList = attacker.getPowertool(attacker.getItemInHand());
+		if (commandList != null && !commandList.isEmpty())
+		{
+			for (final String command : commandList)
 			{
-				((Ageable)eDefend).setBaby();
-				hand.setType(Material.BUCKET);
-				player.setItemInHand(hand);
-				player.updateInventory();
-				event.setCancelled(true);
+				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;
+				}
 			}
 		}
 	}
@@ -148,4 +185,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);
+			}
+		}
+	}
 }

Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -12,6 +12,7 @@ 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.entity.HumanEntity;
@@ -22,8 +23,8 @@ import org.bukkit.event.Listener;
 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.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
@@ -87,7 +88,13 @@ public class EssentialsPlayerListener implements Listener
 		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());
@@ -120,7 +127,10 @@ public class EssentialsPlayerListener implements Listener
 		{
 			user.toggleVanished();
 		}
-		user.setLastLocation();
+		if (!user.isJailed())
+		{
+			user.setLastLocation();
+		}
 		user.updateActivity(false);
 		user.dispose();
 	}
@@ -151,17 +161,28 @@ public class EssentialsPlayerListener implements Listener
 		user.setLastLogin(System.currentTimeMillis());
 		user.updateActivity(false);
 
-		for (String p : ess.getVanishedPlayers())
+		if (!ess.getVanishedPlayers().isEmpty() && !user.isAuthorized("essentials.vanish.see"))
 		{
-			if (!user.isAuthorized("essentials.vanish.see"))
+			for (String p : ess.getVanishedPlayers())
 			{
-				user.hidePlayer(ess.getUser(p).getBase());
+				Player toVanish = ess.getUser(p).getBase();
+				if (toVanish.isOnline())
+				{
+					user.hidePlayer(toVanish);
+				}
 			}
 		}
 
 		if (user.isAuthorized("essentials.sleepingignored"))
 		{
-			user.setSleepingIgnored(true);
+			ess.scheduleSyncDelayedTask(new Runnable()
+			{
+				@Override
+				public void run()
+				{
+					user.setSleepingIgnored(true);
+				}
+			});
 		}
 
 		if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
@@ -191,7 +212,11 @@ public class EssentialsPlayerListener implements Listener
 			final List<String> mail = user.getMails();
 			if (mail.isEmpty())
 			{
-				user.sendMessage(_("noNewMail"));
+				final String msg = _("noNewMail");
+				if (!msg.isEmpty())
+				{
+					user.sendMessage(msg);
+				}
 			}
 			else
 			{
@@ -200,6 +225,7 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}
 
+	// 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());
@@ -309,7 +335,7 @@ 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");
+	private final static List<String> COMMANDS = Arrays.asList("msg", "w", "r", "mail", "m", "t", "whisper", "emsg", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm");
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event)
@@ -334,6 +360,18 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}
 
+	@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)
 	{
@@ -366,10 +404,20 @@ public class EssentialsPlayerListener implements Listener
 			}
 			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());
+				user.updateActivity(true);
 				if (user.hasPowerTools() && user.arePowerToolsEnabled() && usePowertools(user, event.getItem().getTypeId()))
 				{
 					event.setCancelled(true);
@@ -381,6 +429,39 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}
 
+	// 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);
@@ -411,6 +492,7 @@ public class EssentialsPlayerListener implements Listener
 							public void run()
 							{
 								user.getServer().dispatchCommand(user.getBase(), command);
+								LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command));
 							}
 						});
 			}
@@ -430,7 +512,7 @@ public class EssentialsPlayerListener implements Listener
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOWEST)
+	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onInventoryClickEvent(final InventoryClickEvent event)
 	{
 		if (event.getView().getTopInventory().getType() == InventoryType.PLAYER)
@@ -448,6 +530,14 @@ public class EssentialsPlayerListener implements Listener
 				}
 			}
 		}
+		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)
@@ -458,5 +548,17 @@ public class EssentialsPlayerListener implements Listener
 			final User user = ess.getUser(event.getPlayer());
 			user.setInvSee(false);
 		}
+		else if (event.getView().getTopInventory().getType() == InventoryType.ENDER_CHEST)
+		{
+			final User user = ess.getUser(event.getPlayer());
+			user.setEnderSee(false);
+		}
+	}
+	
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onPlayerFishEvent(final PlayerFishEvent event)
+	{
+		final User user = ess.getUser(event.getPlayer());
+		user.updateActivity(true);
 	}
 }

Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java

@@ -20,6 +20,9 @@ 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()))
@@ -31,6 +34,9 @@ public class EssentialsPluginListener implements Listener, IConf
 	@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

Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java

@@ -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;

Essentials/src/com/earth2me/essentials/I18n.java

@@ -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);
@@ -133,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();

Essentials/src/com/earth2me/essentials/IConf.java

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

Essentials/src/com/earth2me/essentials/IEssentials.java

@@ -12,10 +12,6 @@ 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);

Essentials/src/com/earth2me/essentials/ISettings.java

@@ -92,10 +92,6 @@ public interface ISettings extends IConf
 
 	boolean isCommandOverridden(String name);
 
-	boolean isCommandRestricted(IEssentialsCommand cmd);
-
-	boolean isCommandRestricted(String label);
-
 	boolean isDebug();
 
 	boolean isEcoDisabled();
@@ -110,8 +106,6 @@ public interface ISettings extends IConf
 
 	boolean showNonEssCommandsInHelp();
 
-	boolean spawnIfNoHome();
-
 	boolean warnOnBuildDisallow();
 
 	boolean warnOnSmite();
@@ -159,7 +153,7 @@ public interface ISettings extends IConf
 	boolean getRepairEnchanted();
 
 	boolean isWorldTeleportPermissions();
-	
+
 	boolean isWorldHomePermissions();
 
 	boolean registerBackInListener();
@@ -177,8 +171,16 @@ public interface ISettings extends IConf
 	long getTeleportInvulnerability();
 
 	boolean isTeleportInvulnerability();
-	
+
 	long getLoginAttackDelay();
-	
+
 	int getSignUsePerSecond();
+
+	double getMaxFlySpeed();
+
+	double getMaxWalkSpeed();
+
+	public int getMailsPerMinute();
+
+	public void setEssentialsChatActive(boolean b);
 }

Essentials/src/com/earth2me/essentials/IUser.java

@@ -5,10 +5,6 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 
-/**
- * @deprecated This will be moved to the api package soon
- */
-@Deprecated
 public interface IUser extends Player
 {
 	long getLastTeleportTimestamp();
@@ -46,4 +42,6 @@ public interface IUser extends Player
 	Teleport getTeleport();
 
 	void setJail(String jail);
+	
+	boolean isIgnoreExempt();
 }

Essentials/src/com/earth2me/essentials/ItemDb.java

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

Essentials/src/com/earth2me/essentials/Kit.java

@@ -23,7 +23,7 @@ public class Kit
 			final StringBuilder list = new StringBuilder();
 			for (String kiteItem : kits.getKeys(false))
 			{
-				if (user == null || user.isAuthorized("essentials.kit." + kiteItem.toLowerCase(Locale.ENGLISH)))
+				if (user == null || user.isAuthorized("essentials.kits." + kiteItem.toLowerCase(Locale.ENGLISH)))
 				{
 					list.append(" ").append(capitalCase(kiteItem));
 				}
@@ -37,12 +37,16 @@ public class Kit
 
 	}
 
-	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws NoChargeException
+	public static void checkTime(final User user, final String kitName, final Map<String, Object> els) throws Exception
 	{
+		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 double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d;
 		final Calendar earliestTime = new GregorianCalendar();
 		earliestTime.add(Calendar.SECOND, -(int)delay);
 		earliestTime.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));
@@ -50,9 +54,9 @@ public class Kit
 		final long earliestLong = earliestTime.getTimeInMillis();
 
 		// When was the last kit used?
-		final Long lastTime = user.getKitTimestamp(kitName);
+		final long lastTime = user.getKitTimestamp(kitName);
 
-		if (lastTime == null || lastTime < earliestLong)
+		if (lastTime < earliestLong || lastTime == 0L)
 		{
 			user.setKitTimestamp(kitName, time.getTimeInMillis());
 		}
@@ -62,6 +66,11 @@ public class Kit
 			// If this happens, let's give the user the benifit of the doubt.
 			user.setKitTimestamp(kitName, time.getTimeInMillis());
 		}
+		else if (earliestLong < 0L)
+		{
+			user.sendMessage(_("kitOnce"));
+			throw new NoChargeException();
+		}
 		else
 		{
 			time.setTimeInMillis(lastTime);
@@ -78,6 +87,7 @@ public class Kit
 		{
 			throw new Exception(_("kitError2"));
 		}
+	
 
 		try
 		{
@@ -97,6 +107,13 @@ public class Kit
 			boolean spew = false;
 			for (String d : items)
 			{
+				if (d.startsWith(ess.getSettings().getCurrencySymbol())) 
+				{
+					Double value = Double.parseDouble(d.substring(ess.getSettings().getCurrencySymbol().length()).trim());
+					Trade t = new Trade(value, ess);
+					t.pay(user);
+					continue;
+				}
 				final String[] parts = d.split(" ");
 				final String[] item = parts[0].split("[:+',;.]", 2);
 				final int id = Material.getMaterial(Integer.parseInt(item[0])).getId();
@@ -141,11 +158,11 @@ public class Kit
 				final Map<Integer, ItemStack> overfilled;
 				if (user.isAuthorized("essentials.oversizedstacks"))
 				{
-					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, ess.getSettings().getOversizedStackSize(), stack);
+					overfilled = InventoryWorkaround.addOversizedItems(user.getInventory(), ess.getSettings().getOversizedStackSize(), stack);
 				}
 				else
 				{
-					overfilled = InventoryWorkaround.addItem(user.getInventory(), true, 0, stack);
+					overfilled = InventoryWorkaround.addItems(user.getInventory(), stack);
 				}
 				for (ItemStack itemStack : overfilled.values())
 				{

Essentials/src/com/earth2me/essentials/Mob.java

@@ -1,20 +1,19 @@
 package com.earth2me.essentials;
 
 import static com.earth2me.essentials.I18n._;
-import java.util.Collections;
-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.World;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
 
+// Suffixes can be appended on the end of a mob name to make it plural
+// Entities without a suffix, will default to 's'
 public enum Mob
 {
 	CHICKEN("Chicken", Enemies.FRIENDLY, EntityType.CHICKEN),
@@ -41,7 +40,10 @@ public enum Mob
 	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);
+	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM),
+	WITHER("Wither", Enemies.ENEMY, EntityType.WITHER),
+	BAT("Bat", Enemies.FRIENDLY, EntityType.BAT),
+	WITCH("Witch", Enemies.ENEMY, EntityType.WITCH);
 	
 	public static final Logger logger = Logger.getLogger("Minecraft");
 
@@ -72,14 +74,19 @@ public enum Mob
 			hashMap.put(mob.name.toLowerCase(Locale.ENGLISH), mob);
 		}
 	}
-	
+
 	public static Set<String> getMobList() {
 		return Collections.unmodifiableSet(hashMap.keySet());
 	}
 
 	public LivingEntity spawn(final Player player, final Server server, final Location loc) throws MobException
 	{
-		final LivingEntity entity = player.getWorld().spawn(loc, (Class<? extends LivingEntity>)this.bukkitType.getEntityClass());
+		return spawn(player.getWorld(), server, loc);
+	}
+	
+	public LivingEntity spawn(final World world, final Server server, final Location loc) throws MobException
+	{
+		final LivingEntity entity = world.spawn(loc, (Class<? extends LivingEntity>)this.bukkitType.getEntityClass());
 		if (entity == null)
 		{
 			logger.log(Level.WARNING, _("unableToSpawnMob"));

Essentials/src/com/earth2me/essentials/OfflinePlayer.java

@@ -11,11 +11,8 @@ 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.*;
 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;
@@ -841,6 +838,12 @@ public class OfflinePlayer implements Player
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
+	@Override
+	public void setBedSpawnLocation(Location lctn, boolean force)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+	
 	@Override
 	public void playEffect(EntityEffect ee)
 	{
@@ -1068,5 +1071,83 @@ public class OfflinePlayer implements Player
 	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.");
+	}
+
+	@Override
+	public void giveExpLevels(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean getRemoveWhenFarAway()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setRemoveWhenFarAway(boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public EntityEquipment getEquipment()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setCanPickupItems(boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean getCanPickupItems()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public Location getLocation(Location lctn)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }

Essentials/src/com/earth2me/essentials/Settings.java

@@ -12,6 +12,7 @@ import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.ChatColor;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.event.EventPriority;
@@ -54,19 +55,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;
@@ -144,26 +147,6 @@ public class Settings implements ISettings
 		return disCommands;
 	}
 
-	@Override
-	public boolean isCommandRestricted(IEssentialsCommand cmd)
-	{
-		return isCommandRestricted(cmd.getName());
-	}
-
-	@Override
-	public boolean isCommandRestricted(String label)
-	{
-		for (String c : config.getStringList("restricted-commands"))
-		{
-			if (!c.equalsIgnoreCase(label))
-			{
-				continue;
-			}
-			return true;
-		}
-		return config.getBoolean("restrict-" + label.toLowerCase(Locale.ENGLISH), false);
-	}
-
 	@Override
 	public boolean isPlayerCommand(String label)
 	{
@@ -191,6 +174,7 @@ public class Settings implements ISettings
 		}
 		return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false);
 	}
+	private ConfigurationSection commandCosts;
 
 	@Override
 	public double getCommandCost(IEssentialsCommand cmd)
@@ -198,15 +182,60 @@ 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))
+			{
+				PluginCommand cmd = ess.getServer().getPluginCommand(command);
+				if (command.charAt(0) == '/')
+				{
+					ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'.");
+				}
+				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));
+				}
+				else if (section.isString(command))
+				{
+					String costString = section.getString(command);
+					try
+					{
+						double cost = Double.parseDouble(costString.trim().replace(getCurrencySymbol(), "").replaceAll("\\W", ""));
+						newSection.set(command.toLowerCase(Locale.ENGLISH), cost);
+					}
+					catch (NumberFormatException ex)
+					{
+						ess.getLogger().warning("Invalid command cost for: " + command + " (" + costString + ")");
+					}
+
+				}
+				else
+				{
+					ess.getLogger().warning("Invalid command cost for: " + 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 = "~";
 
@@ -262,7 +291,7 @@ public class Settings implements ISettings
 	public Map<String, Object> getKit(String name)
 	{
 		name = name.replace('.', '_').replace('/', '_');
-		if (config.isConfigurationSection("kits"))
+		if (getKits() != null)
 		{
 			final ConfigurationSection kits = getKits();
 			if (kits.isConfigurationSection(name))
@@ -286,7 +315,7 @@ public class Settings implements ISettings
 
 		if (colorName == null)
 		{
-			return ChatColor.RED;
+			return ChatColor.DARK_RED;
 		}
 		if ("none".equalsIgnoreCase(colorName) || colorName.isEmpty())
 		{
@@ -362,6 +391,7 @@ public class Settings implements ISettings
 			format = format.replace("{WORLDNAME}", "{1}");
 			format = format.replace("{SHORTWORLDNAME}", "{2}");
 			format = format.replaceAll("\\{(\\D*?)\\}", "\\[$1\\]");
+			format = "§r".concat(format);
 			mFormat = new MessageFormat(format);
 			chatFormats.put(group, mFormat);
 		}
@@ -431,6 +461,9 @@ public class Settings implements ISettings
 		disablePrefix = _disablePrefix();
 		disableSuffix = _disableSuffix();
 		chatRadius = _getChatRadius();
+		commandCosts = _getCommandCosts();
+		warnOnBuildDisallow = _warnOnBuildDisallow();
+		mailsPerMinute = _getMailsPerMinute();
 	}
 	private List<Integer> itemSpawnBl = new ArrayList<Integer>();
 
@@ -505,17 +538,17 @@ public class Settings implements ISettings
 		}
 		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;
@@ -549,10 +582,12 @@ public class Settings implements ISettings
 		return config.getString("locale", "");
 	}
 
+	//This method should always only return one character due to the implementation of the calling methods
+	//If you need to use a string currency, for example "coins", use the translation key 'currency'.
 	@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
@@ -687,6 +722,7 @@ public class Settings implements ISettings
 	}
 	private boolean prefixsuffixconfigured = false;
 	private boolean addprefixsuffix = false;
+	private boolean essentialsChatActive = false;
 
 	private boolean _addPrefixSuffix()
 	{
@@ -698,10 +734,16 @@ public class Settings implements ISettings
 		return config.hasProperty("add-prefix-suffix");
 	}
 
+	@Override
+	public void setEssentialsChatActive(boolean essentialsChatActive)
+	{
+		this.essentialsChatActive = essentialsChatActive;
+	}
+
 	@Override
 	public boolean addPrefixSuffix()
 	{
-		return prefixsuffixconfigured ? addprefixsuffix : ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat");
+		return prefixsuffixconfigured ? addprefixsuffix : essentialsChatActive;
 	}
 	private boolean disablePrefix = false;
 
@@ -912,4 +954,32 @@ public class Settings implements ISettings
 	{
 		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;
+	}
 }

Essentials/src/com/earth2me/essentials/SpawnMob.java

@@ -0,0 +1,287 @@
+package com.earth2me.essentials;
+
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Mob.MobException;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Random;
+import java.util.Set;
+import org.bukkit.DyeColor;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.*;
+import org.bukkit.entity.Skeleton.SkeletonType;
+import org.bukkit.material.Colorable;
+
+
+public class SpawnMob
+{
+	public static String mobList(final User user)
+	{
+		final Set<String> mobList = Mob.getMobList();
+		final Set<String> availableList = new HashSet<String>();
+		for (String mob : mobList)
+		{
+			if (user.isAuthorized("essentials.spawnmob." + mob.toLowerCase()))
+			{
+				availableList.add(mob);
+			}
+		}
+		if (availableList.isEmpty())
+		{
+			availableList.add(_("none"));
+		}
+		return Util.joinList(availableList);
+	}
+
+	public static String[] mobData(final String mobString)
+	{
+		String[] returnString = new String[4];
+
+		final String[] parts = mobString.split(",");
+		String[] mobParts = parts[0].split(":");
+
+		returnString[0] = mobParts[0];
+		if (mobParts.length == 2)
+		{
+			returnString[1] = mobParts[1];
+		}
+
+		if (parts.length > 1)
+		{
+			String[] mountParts = parts[1].split(":");
+			returnString[2] = mountParts[0];
+			if (mountParts.length == 2)
+			{
+				returnString[3] = mountParts[1];
+			}
+		}
+
+		return returnString;
+	}
+
+	// This method spawns a mob where the user is looking, owned by user
+	public static void spawnmob(final IEssentials ess, final Server server, final User user, final String[] Data, int mobCount) throws Exception
+	{
+		final Block block = Util.getTarget(user).getBlock();
+		if (block == null)
+		{
+			throw new Exception(_("unableToSpawnMob"));
+		}
+		spawnmob(ess, server, user, user, block.getLocation(), Data, mobCount);
+	}
+
+	// This method spawns a mob at loc, owned by noone
+	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final Location loc, final String[] Data, int mobCount) throws Exception
+	{
+		spawnmob(ess, server, sender, null, loc, Data, mobCount);
+	}
+
+	// This method spawns a mob at target, owned by target
+	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final String[] Data, int mobCount) throws Exception
+	{
+		spawnmob(ess, server, sender, target, target.getLocation(), Data, mobCount);
+	}
+
+	// This method spawns a mob at loc, owned by target
+	public static void spawnmob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final Location loc, final String[] Data, int mobCount) throws Exception
+	{
+		final Location sloc = Util.getSafeDestination(loc);
+		final String mobType = Data[0];
+		final String mobData = Data[1];
+		final String mountType = Data[2];
+		final String mountData = Data[3];
+
+		Mob mob = Mob.fromName(mobType);
+		Mob mobMount = null;
+
+		checkSpawnable(ess, sender, mob);
+
+		if (mountType != null)
+		{
+			mobMount = Mob.fromName(mountType);
+			checkSpawnable(ess, sender, mobMount);
+		}
+
+		int serverLimit = ess.getSettings().getSpawnMobLimit();
+		if (mobCount > serverLimit)
+		{
+			mobCount = serverLimit;
+			sender.sendMessage(_("mobSpawnLimit"));
+		}
+
+		try
+		{
+			for (int i = 0; i < mobCount; i++)
+			{
+				spawnMob(ess, server, sender, target, sloc, mob, mobData, mobMount, mountData);
+			}
+			sender.sendMessage(mobCount + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + _("spawned"));
+		}
+		catch (MobException e1)
+		{
+			throw new Exception(_("unableToSpawnMob"), e1);
+		}
+		catch (NumberFormatException e2)
+		{
+			throw new Exception(_("numberRequired"), e2);
+		}
+		catch (NullPointerException np)
+		{
+			throw new Exception(_("soloMob"), np);
+		}
+	}
+
+	private static void spawnMob(final IEssentials ess, final Server server, final CommandSender sender, final User target, final Location sloc, Mob mob, String mobData, Mob mobMount, String mountData) throws Exception
+	{
+		Entity spawnedMob = mob.spawn(sloc.getWorld(), server, sloc);
+		Entity spawnedMount = null;
+
+		if (mobMount != null)
+		{
+			spawnedMount = mobMount.spawn(sloc.getWorld(), server, sloc);
+			spawnedMob.setPassenger(spawnedMount);
+		}
+		if (mobData != null)
+		{
+			changeMobData(mob.getType(), spawnedMob, mobData, target);
+		}
+		if (spawnedMount != null && mountData != null)
+		{
+			changeMobData(mobMount.getType(), spawnedMount, mountData, target);
+		}
+	}
+
+	private static void checkSpawnable(IEssentials ess, CommandSender sender, Mob mob) throws Exception
+	{
+		if (mob == null)
+		{
+			throw new Exception(_("invalidMob"));
+		}
+
+		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH)))
+		{
+			throw new Exception(_("disabledToSpawnMob"));
+		}
+
+		if (sender instanceof User && !((User)sender).isAuthorized("essentials.spawnmob." + mob.name.toLowerCase()))
+		{
+			throw new Exception(_("noPermToSpawnMob"));
+		}
+	}
+
+	private static void changeMobData(final EntityType type, final Entity spawned, String data, final User target) throws Exception
+	{
+		data = data.toLowerCase(Locale.ENGLISH);
+
+		if (spawned instanceof Slime)
+		{
+			try
+			{
+				((Slime)spawned).setSize(Integer.parseInt(data));
+			}
+			catch (Exception e)
+			{
+				throw new Exception(_("slimeMalformedSize"), e);
+			}
+		}
+
+		if ((spawned instanceof Ageable) && data.contains("baby"))
+		{
+			((Ageable)spawned).setBaby();
+			data = data.replace("baby", "");
+		}
+
+		if (spawned instanceof Colorable)
+		{
+			final String color = data.toUpperCase(Locale.ENGLISH);
+			try
+			{
+				if (color.equals("RANDOM"))
+				{
+					final Random rand = new Random();
+					((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
+				}
+				else if (color.length() > 1)
+				{
+					((Colorable)spawned).setColor(DyeColor.valueOf(color));
+				}
+			}
+			catch (Exception e)
+			{
+				throw new Exception(_("sheepMalformedColor"), e);
+			}
+		}
+
+		if (spawned instanceof Tameable && data.contains("tamed") && target != null)
+		{
+			final Tameable tameable = ((Tameable)spawned);
+			tameable.setTamed(true);
+			tameable.setOwner(target.getBase());
+			data = data.replace("tamed", "");
+		}
+
+		if (type == EntityType.WOLF)
+		{
+			if (data.contains("angry"))
+			{
+				((Wolf)spawned).setAngry(true);
+			}
+		}
+
+		if (type == EntityType.CREEPER && data.contains("powered"))
+		{
+			((Creeper)spawned).setPowered(true);
+		}
+
+		if (type == EntityType.OCELOT)
+		{
+			if (data.contains("siamese"))
+			{
+				((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
+			}
+			else if (data.contains("red"))
+			{
+				((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT);
+			}
+			else if (data.contains("black"))
+			{
+				((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT);
+			}
+		}
+
+		if (type == EntityType.VILLAGER)
+		{
+			for (Villager.Profession prof : Villager.Profession.values())
+			{
+				if (data.contains(prof.toString().toLowerCase(Locale.ENGLISH)))
+				{
+					((Villager)spawned).setProfession(prof);
+				}
+			}
+		}
+
+		if (spawned instanceof Zombie)
+		{
+			if (data.contains("villager"))
+			{
+				((Zombie)spawned).setVillager(true);
+			}
+			if (data.contains("baby"))
+			{
+				((Zombie)spawned).setBaby(true);
+			}
+		}
+
+		if (type == EntityType.SKELETON)
+		{
+			if (data.contains("wither"))
+			{
+				((Skeleton)spawned).setSkeletonType(SkeletonType.WITHER);
+			}
+		}
+
+	}
+}

Essentials/src/com/earth2me/essentials/TNTExplodeListener.java

@@ -24,13 +24,13 @@ public class TNTExplodeListener implements Listener, Runnable
 		if (!enabled)
 		{
 			enabled = true;
-			timer = ess.scheduleSyncDelayedTask(this, 1000);
+			timer = ess.scheduleSyncDelayedTask(this, 200);
 			return;
 		}
 		if (timer != -1)
 		{
 			ess.getScheduler().cancelTask(timer);
-			timer = ess.scheduleSyncDelayedTask(this, 1000);
+			timer = ess.scheduleSyncDelayedTask(this, 200);
 		}
 	}
 

Essentials/src/com/earth2me/essentials/Teleport.java

@@ -1,12 +1,13 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.api.ITeleport;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.ITeleport;
+import com.earth2me.essentials.commands.NoChargeException;
 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.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -17,36 +18,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)
@@ -55,22 +58,30 @@ public class Teleport implements Runnable, ITeleport
 	private long initY;
 	private long initZ;
 	private Target teleportTarget;
+	private boolean respawn;
 	private Trade chargeFor;
 	private final IEssentials ess;
 	private static final Logger logger = Logger.getLogger("Minecraft");
 	private TeleportCause cause;
 
 	private void initTimer(long delay, Target target, Trade chargeFor, TeleportCause cause)
+	{
+		initTimer(delay, user, target, chargeFor, cause, false);
+	}
+
+	private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause, boolean respawn)
 	{
 		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;
+		this.respawn = respawn;
 	}
 
 	@Override
@@ -79,31 +90,42 @@ 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);
+					if (respawn) {
+						teleportUser.getTeleport().respawn(cause);
+					}
+					else {
+						teleportUser.getTeleport().now(teleportTarget, cause);
+					}
+					cancel(false);
 					if (chargeFor != null)
 					{
 						chargeFor.charge(user);
@@ -117,6 +139,10 @@ public class Teleport implements Runnable, ITeleport
 			catch (Exception ex)
 			{
 				user.sendMessage(_("cooldownWithMessage", ex.getMessage()));
+				if (user != teleportUser)
+				{
+					teleportUser.sendMessage(_("cooldownWithMessage", ex.getMessage()));
+				}
 			}
 		}
 	}
@@ -127,22 +153,6 @@ 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
 	{
 		final Calendar time = new GregorianCalendar();
@@ -181,6 +191,7 @@ public class Teleport implements Runnable, ITeleport
 		}
 	}
 
+	//If we need to cancel a pending teleport call this method
 	public void cancel(boolean notifyUser)
 	{
 		if (teleTimer == -1)
@@ -193,6 +204,10 @@ public class Teleport implements Runnable, ITeleport
 			if (notifyUser)
 			{
 				user.sendMessage(_("pendingTeleportCancelled"));
+				if (teleportUser != user)
+				{
+					teleportUser.sendMessage(_("pendingTeleportCancelled"));
+				}
 			}
 		}
 		finally
@@ -201,14 +216,38 @@ 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);
+		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(new Target(loc), chargeFor, TeleportCause.PLUGIN);
+		teleport(loc, chargeFor, TeleportCause.PLUGIN);
 	}
 
 	public void teleport(Location loc, Trade chargeFor, TeleportCause cause) throws Exception
@@ -216,7 +255,7 @@ public class Teleport implements Runnable, ITeleport
 		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);
 	}
@@ -241,58 +280,111 @@ 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);
+		double delay = ess.getSettings().getTeleportDelay();
 
-	public void now(Location loc, boolean cooldown, TeleportCause cause) throws Exception
-	{
-		if (cooldown)
+		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, false);
+		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)
+		double delay = ess.getSettings().getTeleportDelay();
+		if (chargeFor != null)
+		{
+			chargeFor.isAffordableFor(user);
+		}
+		cooldown(true);
+		if (delay <= 0 || user.isAuthorized("essentials.teleport.timer.bypass"))
 		{
 			cooldown(false);
+			respawn(cause);
+			if (chargeFor != null)
+			{
+				chargeFor.charge(user);
+			}
+			return;
+		}
+
+		cancel(false);
+		initTimer((long)(delay * 1000.0), user, null, chargeFor, cause, true);
+		teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
+	}
+		
+	public void respawn(TeleportCause cause) throws Exception
+	{
+		final Player player = user.getBase();
+		Location bed = player.getBedSpawnLocation();
+		if (bed != null && bed.getBlock().getType() != Material.BED_BLOCK)
+		{
+			now(new Target(bed), cause);
+		}
+		else
+		{
+			final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
+			ess.getServer().getPluginManager().callEvent(pre);
+			now(new Target(pre.getRespawnLocation()), cause);
 		}
-		now(new Target(entity), 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);
 	}
 
+	//This function handles teleporting to /home
 	public void home(Location loc, Trade chargeFor) throws Exception
 	{
 		teleport(new Target(loc), chargeFor, TeleportCause.COMMAND);

Essentials/src/com/earth2me/essentials/Trade.java

@@ -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,7 +20,7 @@ import org.bukkit.inventory.ItemStack;
 public class Trade
 {
 	private final transient String command;
-	private final transient String fallbackCommand;
+	private final transient Trade fallbackTrade;
 	private final transient Double money;
 	private final transient ItemStack itemStack;
 	private final transient Integer exp;
@@ -31,7 +31,7 @@ public class Trade
 		this(command, null, null, null, null, ess);
 	}
 
-	public Trade(final String command, final String fallback, final IEssentials ess)
+	public Trade(final String command, final Trade fallback, final IEssentials ess)
 	{
 		this(command, fallback, null, null, null, ess);
 	}
@@ -51,10 +51,10 @@ public class Trade
 		this(null, null, null, null, exp, ess);
 	}
 
-	private Trade(final String command, final String fallback, 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.fallbackCommand = fallback;
+		this.fallbackTrade = fallback;
 		this.money = money;
 		this.itemStack = item;
 		this.exp = exp;
@@ -63,6 +63,12 @@ public class Trade
 
 	public void isAffordableFor(final IUser user) throws ChargeException
 	{
+
+		if (ess.getSettings().isDebug())
+		{
+			ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge.");
+		}
+
 		if (getMoney() != null
 			&& getMoney() > 0
 			&& !user.canAfford(getMoney()))
@@ -71,7 +77,7 @@ public class Trade
 		}
 
 		if (getItemStack() != null
-			&& !InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
+			&& !user.getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
 		{
 			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 		}
@@ -107,7 +113,7 @@ public class Trade
 		{
 			if (dropItems)
 			{
-				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
+				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItems(user.getInventory(), getItemStack());
 				final Location loc = user.getLocation();
 				for (ItemStack itemStack : leftOver.values())
 				{
@@ -131,7 +137,7 @@ public class Trade
 			}
 			else
 			{
-				success = InventoryWorkaround.addAllItems(user.getInventory(), true, getItemStack());
+				success = InventoryWorkaround.addAllItems(user.getInventory(), getItemStack());
 			}
 			user.updateInventory();
 		}
@@ -144,9 +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)
 		{
-			if (!user.canAfford(getMoney()) && getMoney() > 0)
+			if (!user.canAfford(getMoney()) && getMoney() > 0.0d)
 			{
 				throw new ChargeException(_("notEnoughMoney"));
 			}
@@ -154,17 +165,17 @@ public class Trade
 		}
 		if (getItemStack() != null)
 		{
-			if (!InventoryWorkaround.containsItem(user.getInventory(), true, true, itemStack))
+			if (!user.getInventory().containsAtLeast(itemStack, itemStack.getAmount()))
 			{
 				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 			}
-			InventoryWorkaround.removeItem(user.getInventory(), true, true, getItemStack());
+			user.getInventory().removeItem(getItemStack());
 			user.updateInventory();
 		}
 		if (command != null)
 		{
 			final double cost = getCommandCost(user);
-			if (!user.canAfford(cost) && cost > 0)
+			if (!user.canAfford(cost) && cost > 0.0d)
 			{
 				throw new ChargeException(_("notEnoughMoney"));
 			}
@@ -198,16 +209,24 @@ public class Trade
 
 	public Double getCommandCost(final IUser user)
 	{
-		double cost = 0d;
-		if (command != null && !command.isEmpty()
-			&& !user.isAuthorized("essentials.nocommandcost.all")
-			&& !user.isAuthorized("essentials.nocommandcost." + command))
+		double cost = 0.0d;
+		if (command != null && !command.isEmpty())
 		{
 			cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
-			if (cost == 0.0 && fallbackCommand != null && !fallbackCommand.isEmpty())
+			if (cost == 0.0d && fallbackTrade != null)
 			{
-				cost = ess.getSettings().getCommandCost(fallbackCommand.charAt(0) == '/' ? fallbackCommand.substring(1) : fallbackCommand);
+				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;
 	}
@@ -215,6 +234,9 @@ public class Trade
 
 	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
 	{
+		//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()))
 		{

Essentials/src/com/earth2me/essentials/User.java

@@ -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
@@ -25,8 +26,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	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)
@@ -60,20 +63,22 @@ 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);
+			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;
@@ -85,7 +90,15 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		catch (Exception ex)
 		{
-			ess.getLogger().log(Level.SEVERE, "Permission System Error: " + ess.getPermissionsHandler().getName() + " returned: " + ex.getMessage());
+			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;
 		}
 	}
@@ -116,7 +129,7 @@ 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;
 		}
@@ -130,7 +143,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 
 	public void payUser(final User reciever, final double value) throws Exception
 	{
-		if (value == 0)
+		if (value == 0.0d)
 		{
 			return;
 		}
@@ -155,7 +168,7 @@ 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;
 		}
@@ -175,6 +188,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 
 	public boolean canAfford(final double cost, final boolean permcheck)
 	{
+		if (cost <= 0.0d)
+		{
+			return true;
+		}
 		final double mon = getMoney();
 		if (!permcheck || isAuthorized("essentials.eco.loan"))
 		{
@@ -233,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()
 	{
@@ -289,7 +296,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 				if (opPrefix != null && opPrefix.toString().length() > 0)
 				{
 					prefix.insert(0, opPrefix.toString());
-					suffix = "§f";
+					suffix = "§r";
 				}
 			}
 			catch (Exception e)
@@ -299,17 +306,18 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 
 		if (ess.getSettings().addPrefixSuffix())
 		{
+			//These two extra toggles are not documented, because they are mostly redundant #EasterEgg
 			if (!ess.getSettings().disablePrefix())
 			{
 				final String ptext = ess.getPermissionsHandler().getPrefix(base).replace('&', '§');
 				prefix.insert(0, ptext);
-				suffix = "§f";
+				suffix = "§r";
 			}
 			if (!ess.getSettings().disableSuffix())
 			{
 				final String stext = ess.getPermissionsHandler().getSuffix(base).replace('&', '§');
-				suffix = stext + "§f";
-				suffix = suffix.replace("§f§f", "§f");
+				suffix = stext + "§r";
+				suffix = suffix.replace("§f§f", "§f").replace("§f§r", "§r").replace("§r§r", "§r");
 			}
 		}
 		final String strPrefix = prefix.toString();
@@ -484,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;
 		}
@@ -523,7 +538,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			if (broadcast && !isHidden())
 			{
 				setDisplayNick();
-				ess.broadcastMessage(this, _("userIsNotAway", getDisplayName()));
+				final String msg = _("userIsNotAway", getDisplayName());
+				if (!msg.isEmpty())
+				{					
+					ess.broadcastMessage(this, msg);
+				}
 			}
 		}
 		lastActivity = System.currentTimeMillis();
@@ -550,13 +569,17 @@ 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()));
+				final String msg = _("userIsAway", getDisplayName());
+				if (!msg.isEmpty())
+				{					
+					ess.broadcastMessage(this, msg);
+				}
 			}
 		}
 	}
@@ -612,6 +635,16 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	{
 		invSee = set;
 	}
+
+	public boolean isEnderSee()
+	{
+		return enderSee;
+	}
+
+	public void setEnderSee(final boolean set)
+	{
+		enderSee = set;
+	}
 	private transient long teleportInvulnerabilityTimestamp = 0;
 
 	public void enableInvulnerabilityAfterTeleport()
@@ -694,4 +727,20 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	{
 		lastThrottledAction = System.currentTimeMillis();;
 	}
+
+	public boolean isFlyClickJump()
+	{
+		return rightClickJump;
+	}
+
+	public void setRightClickJump(boolean rightClickJump)
+	{
+		this.rightClickJump = rightClickJump;
+	}
+
+	@Override
+	public boolean isIgnoreExempt()
+	{
+		return this.isAuthorized("essentials.chat.ignoreexempt");		
+	}
 }

Essentials/src/com/earth2me/essentials/UserData.java

@@ -4,6 +4,8 @@ import static com.earth2me.essentials.I18n._;
 import java.io.File;
 import java.util.*;
 import org.bukkit.Location;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -11,13 +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 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();
@@ -26,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()
 	{
@@ -39,23 +49,23 @@ public abstract class UserData extends PlayerExtension implements IConf
 		lastHealTimestamp = _getLastHealTimestamp();
 		jail = _getJail();
 		mails = _getMails();
-		teleportEnabled = getTeleportEnabled();
-		ignoredPlayers = getIgnoredPlayers();
+		teleportEnabled = _getTeleportEnabled();
 		godmode = _getGodModeEnabled();
-		muted = getMuted();
+		muted = _getMuted();
 		muteTimeout = _getMuteTimeout();
-		jailed = getJailed();
+		jailed = _getJailed();
 		jailTimeout = _getJailTimeout();
 		lastLogin = _getLastLogin();
 		lastLogout = _getLastLogout();
 		lastLoginAddress = _getLastLoginAddress();
-		afk = getAfk();
+		afk = _getAfk();
 		geolocation = _getGeoLocation();
 		isSocialSpyEnabled = _isSocialSpyEnabled();
 		isNPC = _isNPC();
 		arePowerToolsEnabled = _arePowerToolsEnabled();
 		kitTimestamps = _getKitTimestamps();
 		nickname = _getNickname();
+		setIgnoredPlayers(_getIgnoredPlayers());
 	}
 	private double money;
 
@@ -99,26 +109,25 @@ public abstract class UserData extends PlayerExtension implements IConf
 		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)
@@ -152,7 +161,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	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();
@@ -160,20 +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
 		{
-			throw new Exception(_("invalidHome", name));
+			throw new Exception(_("invalidHome", search));
 		}
 	}
 
@@ -406,7 +415,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean teleportEnabled;
 
-	private boolean getTeleportEnabled()
+	private boolean _getTeleportEnabled()
 	{
 		return config.getBoolean("teleportenabled", true);
 	}
@@ -438,7 +447,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private List<String> ignoredPlayers;
 
-	public List<String> getIgnoredPlayers()
+	public List<String> _getIgnoredPlayers()
 	{
 		return Collections.synchronizedList(config.getStringList("ignore"));
 	}
@@ -471,7 +480,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public boolean isIgnoredPlayer(IUser user)
 	{
-		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isAuthorized("essentials.chat.ignoreexempt"));
+		return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isIgnoreExempt());
 	}
 
 	public void setIgnoredPlayer(IUser user, boolean set)
@@ -506,10 +515,15 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean muted;
 
-	public boolean getMuted()
+	public boolean _getMuted()
 	{
 		return config.getBoolean("muted", false);
 	}
+	
+	public boolean getMuted()
+	{
+		return muted;
+	}
 
 	public boolean isMuted()
 	{
@@ -542,7 +556,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean jailed;
 
-	private boolean getJailed()
+	private boolean _getJailed()
 	{
 		return config.getBoolean("jailed", false);
 	}
@@ -626,7 +640,10 @@ public abstract class UserData extends PlayerExtension implements IConf
 	public void setLastLogin(long time)
 	{
 		_setLastLogin(time);
-		_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
+		if (base.getAddress() != null && base.getAddress().getAddress() != null)
+		{
+			_setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
+		}
 		config.save();
 	}
 	private long lastLogout;
@@ -666,7 +683,7 @@ public abstract class UserData extends PlayerExtension implements IConf
 	}
 	private boolean afk;
 
-	private boolean getAfk()
+	private boolean _getAfk()
 	{
 		return config.getBoolean("afk", false);
 	}
@@ -777,27 +794,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()
 	{
 
 		if (config.isConfigurationSection("timestamps.kits"))
 		{
-			return config.getConfigurationSection("timestamps.kits").getValues(false);
+			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 HashMap<String, Object>();
+		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();
 	}

Essentials/src/com/earth2me/essentials/Util.java

@@ -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("");
@@ -288,6 +295,7 @@ public class Util
 	public final static int RADIUS = 3;
 	public final static Vector3D[] VOLUME;
 
+
 	public static class Vector3D
 	{
 		public Vector3D(int x, int y, int z)
@@ -397,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)
@@ -419,7 +436,7 @@ public class Util
 		{
 			return true;
 		}
-		return isBlockAboveAir(world, x, y, z);
+		return false;
 	}
 
 	public static ItemStack convertBlockToItem(final Block block)
@@ -588,6 +605,7 @@ public class Util
 	}
 	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 LOGCOLOR_PATTERN = Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]");
 	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]");
@@ -605,6 +623,15 @@ public class Util
 		return VANILLA_PATTERN.matcher(input).replaceAll("");
 	}
 
+	public static String stripLogColorFormat(final String input)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		return LOGCOLOR_PATTERN.matcher(input).replaceAll("");
+	}
+
 	public static String replaceFormat(final String input)
 	{
 		if (input == null)

Essentials/src/com/earth2me/essentials/Warps.java

@@ -3,6 +3,7 @@ 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;
@@ -70,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

Essentials/src/com/earth2me/essentials/api/Economy.java

@@ -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);
 	}
 
 	/**

Essentials/src/com/earth2me/essentials/api/IAlternativeCommandsHandler.java

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

Essentials/src/com/earth2me/essentials/api/IEssentials.java

@@ -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);
-}

Essentials/src/com/earth2me/essentials/api/IEssentialsEconomy.java

@@ -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;
-}

Essentials/src/com/earth2me/essentials/api/ISettings.java

@@ -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>
-{
-	
-}

Essentials/src/com/earth2me/essentials/api/IUser.java

@@ -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);
-}

Essentials/src/com/earth2me/essentials/api/IUserMap.java

@@ -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);
-}

Essentials/src/com/earth2me/essentials/api/IWarps.java

@@ -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;
-}

Essentials/src/com/earth2me/essentials/api/IWorth.java

@@ -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);
-}

Essentials/src/com/earth2me/essentials/commands/Commandafk.java

@@ -32,12 +32,13 @@ public class Commandafk extends EssentialsCommand
 	private void toggleAfk(User user)
 	{
 		user.setDisplayNick();
+		String msg = "";
 		if (!user.toggleAfk())
 		{
 			//user.sendMessage(_("markedAsNotAway"));
 			if (!user.isHidden())
 			{
-				ess.broadcastMessage(user, _("userIsNotAway", user.getDisplayName()));
+				msg = _("userIsNotAway", user.getDisplayName());
 			}
 			user.updateActivity(false);
 		}
@@ -46,8 +47,12 @@ public class Commandafk extends EssentialsCommand
 			//user.sendMessage(_("markedAsAway"));
 			if (!user.isHidden())
 			{
-				ess.broadcastMessage(user, _("userIsAway", user.getDisplayName()));
+				msg = _("userIsAway", user.getDisplayName());
 			}
 		}
+		if (!msg.isEmpty())
+		{
+			ess.broadcastMessage(user, msg);
+		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandantioch.java

@@ -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()

Essentials/src/com/earth2me/essentials/commands/Commandback.java

@@ -17,9 +17,9 @@ public class Commandback extends EssentialsCommand
 	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.world." + user.getLastLocation().getWorld().getName()))
+			&& !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName()))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + 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);

Essentials/src/com/earth2me/essentials/commands/Commandbalance.java

@@ -27,6 +27,7 @@ public class Commandbalance extends EssentialsCommand
 	@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"))

Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java

@@ -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;

Essentials/src/com/earth2me/essentials/commands/Commandban.java

@@ -2,7 +2,9 @@ package com.earth2me.essentials.commands;
 
 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;
@@ -18,11 +20,21 @@ 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);
+		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
@@ -34,13 +46,13 @@ 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)
@@ -51,15 +63,21 @@ public class Commandban extends EssentialsCommand
 		{
 			banReason = _("banFormat", _("defaultBanReason"), senderName);
 		}
-		
+
 		user.setBanReason(banReason);
 		user.setBanned(true);
 		user.kickPlayer(banReason);
+		
+		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));
 			}

Essentials/src/com/earth2me/essentials/commands/Commandbreak.java

@@ -2,13 +2,10 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import java.util.ArrayList;
-import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandbreak extends EssentialsCommand

Essentials/src/com/earth2me/essentials/commands/Commandburn.java

@@ -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]))
 		{

Essentials/src/com/earth2me/essentials/commands/Commandenchant.java

@@ -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;

Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java

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

Essentials/src/com/earth2me/essentials/commands/Commandessentials.java

@@ -1,13 +1,11 @@
 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 java.util.logging.Level;
-import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Server;
@@ -16,7 +14,7 @@ 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()
@@ -44,6 +42,10 @@ public class Commandessentials extends EssentialsCommand
 		{
 			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);
@@ -53,6 +55,7 @@ public class Commandessentials extends EssentialsCommand
 		}
 	}
 	
+	//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());
@@ -72,6 +75,17 @@ public class Commandessentials extends EssentialsCommand
 		}
 	}
 	
+	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
 	{
 		ess.getSettings().setDebug(!ess.getSettings().isDebug());

Essentials/src/com/earth2me/essentials/commands/Commandexp.java

@@ -125,13 +125,13 @@ public class Commandexp extends EssentialsCommand
 		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)
+	private void setExp(final CommandSender sender, final User target, String strAmount, final boolean give) throws NotEnoughArgumentsException 
 	{
 		Long amount;
 		strAmount = strAmount.toLowerCase(Locale.ENGLISH);
-		if (strAmount.startsWith("l"))
+		if (strAmount.startsWith("l") || strAmount.endsWith("l"))
 		{
-			strAmount = strAmount.substring(1);			
+			strAmount = strAmount.replaceAll("l","");			
 			int neededLevel = Integer.parseInt(strAmount);
 			if (give)
 			{
@@ -142,6 +142,10 @@ public class Commandexp extends EssentialsCommand
 		}
 		else {
 			amount = Long.parseLong(strAmount);
+			if (amount < 0 || amount > Integer.MAX_VALUE)
+			{
+				throw new NotEnoughArgumentsException();	
+			}
 		}
 
 		if (give)

Essentials/src/com/earth2me/essentials/commands/Commandfly.java

@@ -28,15 +28,34 @@ public class Commandfly extends EssentialsCommand
 	@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"))
+		if (args.length == 1)
+		{
+			if (args[0].equalsIgnoreCase("on") || args[0].startsWith("ena") || args[0].equalsIgnoreCase("1"))
+			{
+				user.setAllowFlight(true);
+			}
+			else if (args[0].equalsIgnoreCase("off") || args[0].startsWith("dis") || args[0].equalsIgnoreCase("0"))
+			{
+				user.setAllowFlight(false);
+			}
+			else if (user.isAuthorized("essentials.fly.others"))
+			{
+				flyOtherPlayers(server, user, args);
+				return;
+			}
+		}
+		else if (args.length == 2 && user.isAuthorized("essentials.fly.others"))
 		{
 			flyOtherPlayers(server, user, args);
 			return;
 		}
-		user.setAllowFlight(!user.getAllowFlight());
-		if (!user.getAllowFlight())
+		else
 		{
-			user.setFlying(false);
+			user.setAllowFlight(!user.getAllowFlight());
+			if (!user.getAllowFlight())
+			{
+				user.setFlying(false);
+			}
 		}
 		user.sendMessage(_("flyMode", _(user.getAllowFlight() ? "enabled" : "disabled"), user.getDisplayName()));
 	}

Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java

@@ -19,57 +19,116 @@ 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 < 2)
+		GameMode gameMode;
+		if (args.length == 0)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		gamemodeOtherPlayers(server, sender, args);
+		else if (args.length == 1)
+		{
+			gameMode = matchGameMode(commandLabel);
+			gamemodeOtherPlayers(server, sender, gameMode, args[0]);
+		}
+		else if (args.length == 2)
+		{
+			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 < 1)
+		GameMode gameMode;
+		if (args.length == 0)
 		{
-			throw new NotEnoughArgumentsException();
+			gameMode = matchGameMode(commandLabel);
 		}
-
-		if (args.length > 1 && args[1].trim().length() > 2 && user.isAuthorized("essentials.gamemode.others"))
+		else if (args.length > 1 && args[1].trim().length() > 2 && user.isAuthorized("essentials.gamemode.others"))
 		{
-			gamemodeOtherPlayers(server, user, args);
+			gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
+			gamemodeOtherPlayers(server, user, gameMode, args[1]);
 			return;
 		}
-		performSetMode(args[0].toLowerCase(Locale.ENGLISH), user);
+		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[] args)
+	private void gamemodeOtherPlayers(final Server server, final CommandSender sender, final GameMode gameMode, final String player) throws NotEnoughArgumentsException
 	{
-		for (Player matchPlayer : server.matchPlayer(args[1]))
+		//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;
 			}
-			performSetMode(args[0].toLowerCase(Locale.ENGLISH), player);
-			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 void performSetMode(String mode, Player player)
+	private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException
 	{
-		if (mode.contains("survi") || mode.equalsIgnoreCase("0") || mode.equalsIgnoreCase("s"))
+		GameMode mode = null;
+		if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc")
+			|| modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c"))
 		{
-			player.setGameMode(GameMode.SURVIVAL);
+			mode = GameMode.CREATIVE;
 		}
-		else if (mode.contains("creat") || mode.equalsIgnoreCase("1") || mode.equalsIgnoreCase("c"))
+		else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms")
+				 || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s"))
 		{
-			player.setGameMode(GameMode.CREATIVE);
+			mode = GameMode.SURVIVAL;
 		}
-		else if (mode.contains("advent") || mode.equalsIgnoreCase("2") || mode.equalsIgnoreCase("a"))
+		else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma")
+				 || modeString.contains("advent") || modeString.equalsIgnoreCase("2") || modeString.equalsIgnoreCase("a"))
 		{
-			player.setGameMode(GameMode.ADVENTURE);
+			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;
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandgc.java

@@ -1,6 +1,8 @@
 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;
@@ -31,10 +33,12 @@ public class Commandgc extends EssentialsCommand
 		{
 			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())
 		{
@@ -49,10 +53,8 @@ public class Commandgc extends EssentialsCommand
 				break;
 			}
 
-			sender.sendMessage(
-					worldType + " \"" + w.getName() + "\": "
-					+ w.getLoadedChunks().length + _("gcchunks")
-					+ w.getEntities().size() + _("gcentities"));
+			sender.sendMessage(_("gcWorld", worldType, w.getName(), w.getLoadedChunks().length, w.getEntities().size()));
 		}
+		
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java

@@ -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;
@@ -40,18 +41,17 @@ public class Commandgetpos extends EssentialsCommand
 		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)));
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandgive.java

@@ -1,11 +1,10 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 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;
@@ -46,7 +45,7 @@ public class Commandgive extends EssentialsCommand
 		final User giveTo = getPlayer(server, args, 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]));
 		}
@@ -91,16 +90,15 @@ public class Commandgive extends EssentialsCommand
 			throw new Exception(_("cantSpawnItem", "Air"));
 		}
 
-		//TODO: TL this.
 		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);
+			InventoryWorkaround.addOversizedItems(giveTo.getInventory(), ess.getSettings().getOversizedStackSize(), stack);
 		}
 		else
 		{
-			InventoryWorkaround.addItem(giveTo.getInventory(), true, stack);
+			InventoryWorkaround.addItems(giveTo.getInventory(), stack);
 		}
 		giveTo.updateInventory();
 	}

Essentials/src/com/earth2me/essentials/commands/Commandhat.java

@@ -31,7 +31,7 @@ public class Commandhat extends EssentialsCommand
 			{
 				final ItemStack air = new ItemStack(Material.AIR);
 				inv.setHelmet(air);
-				InventoryWorkaround.addItem(user.getInventory(), true, head);
+				InventoryWorkaround.addItems(user.getInventory(), head);
 				user.sendMessage(_("hatRemoved"));
 			}
 		}

Essentials/src/com/earth2me/essentials/commands/Commandheal.java

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

Essentials/src/com/earth2me/essentials/commands/Commandhome.java

@@ -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)
@@ -66,13 +65,7 @@ public class Commandhome extends EssentialsCommand
 			final List<String> homes = player.getHomes();
 			if (homes.isEmpty() && player.equals(user))
 			{
-				if (bed != null)
-				{
-					user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
-					throw new NoChargeException();
-				}
 				user.getTeleport().respawn(charge, TeleportCause.COMMAND);
-
 			}
 			else if (homes.isEmpty())
 			{
@@ -84,7 +77,7 @@ public class Commandhome extends EssentialsCommand
 			}
 			else
 			{
-				if (bed != null)
+				if (bed != null  && user.isAuthorized("essentials.home.bed"))
 				{
 					homes.add("bed");
 				}
@@ -102,9 +95,9 @@ public class Commandhome extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		if (user.getWorld() != loc.getWorld() && ess.getSettings().isWorldHomePermissions()
-			&& !user.isAuthorized("essentials.world." + loc.getWorld().getName()))
+			&& !user.isAuthorized("essentials.worlds." + loc.getWorld().getName()))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + loc.getWorld().getName()));
+			throw new Exception(_("noPerm", "essentials.worlds." + loc.getWorld().getName()));
 		}
 		user.getTeleport().home(loc, charge);
 	}

Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java

@@ -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
@@ -21,8 +18,8 @@ public class Commandinvsee extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final User invUser = getPlayer(server, args, 0);	
+		final User invUser = getPlayer(server, args, 0);
 		user.setInvSee(true);
-		user.openInventory(invUser.getInventory());		
+		user.openInventory(invUser.getInventory());
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commanditem.java

@@ -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;
@@ -87,11 +87,11 @@ public class Commanditem extends EssentialsCommand
 		user.sendMessage(_("itemSpawn", stack.getAmount(), displayName));
 		if (user.isAuthorized("essentials.oversizedstacks"))
 		{
-			InventoryWorkaround.addItem(user.getInventory(), true, ess.getSettings().getOversizedStackSize(), stack);
+			InventoryWorkaround.addOversizedItems(user.getInventory(), ess.getSettings().getOversizedStackSize(), stack);
 		}
 		else
 		{
-			InventoryWorkaround.addItem(user.getInventory(), true, stack);
+			InventoryWorkaround.addItems(user.getInventory(), stack);
 		}
 		user.updateInventory();
 	}

Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java

@@ -19,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)
@@ -34,9 +36,9 @@ public class Commanditemdb extends EssentialsCommand
 		{
 			itemStack = ess.getItemDb().get(args[0]);
 		}
-		sender.sendMessage(itemStack.getType().toString() + "- " + itemStack.getTypeId() + ":" + Integer.toString(itemStack.getDurability()));
-				
-		if (itemStack.getType() != Material.AIR)
+		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());
@@ -44,6 +46,11 @@ public class Commanditemdb extends EssentialsCommand
 			{
 				sender.sendMessage(_("durability", Integer.toString(durability)));
 			}
-		}		
+		}
+		final String itemNameList = ess.getItemDb().names(itemStack);
+		if (itemNameList != null)
+		{
+			sender.sendMessage(_("itemNames", ess.getItemDb().names(itemStack)));
+		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandjump.java

@@ -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();
 

Essentials/src/com/earth2me/essentials/commands/Commandkick.java

@@ -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 (sender instanceof Player && 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));
 			}
 		}
 	}

Essentials/src/com/earth2me/essentials/commands/Commandkill.java

@@ -22,16 +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, 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(Short.MAX_VALUE);
+					
+			if (matchPlayer.getHealth() > 0)
+			{
+				matchPlayer.setHealth(0);
+			}
+
 			sender.sendMessage(_("kill", matchPlayer.getDisplayName()));
 		}
 	}

Essentials/src/com/earth2me/essentials/commands/Commandkillall.java

@@ -1,27 +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.Ocelot;
-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;
 
 

Essentials/src/com/earth2me/essentials/commands/Commandkit.java

@@ -1,8 +1,13 @@
 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;
 
@@ -26,12 +31,12 @@ public class Commandkit extends EssentialsCommand
 		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));
+			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));
+			final String kitName = Util.sanitizeString(args[0].toLowerCase(Locale.ENGLISH)).trim();
 			giveKit(user, user, kitName);
 		}
 	}
@@ -59,12 +64,17 @@ public class Commandkit extends EssentialsCommand
 	}
 
 	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.kit." + kitName))
+		if (!userFrom.isAuthorized("essentials.kits." + kitName))
 		{
-			throw new Exception(_("noKitPermission", "essentials.kit." + kitName));
+			throw new Exception(_("noKitPermission", "essentials.kits." + kitName));
 		}
 
 		final List<String> items = Kit.getItems(userTo, kit);

Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java

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

Essentials/src/com/earth2me/essentials/commands/Commandmail.java

@@ -6,11 +6,13 @@ import com.earth2me.essentials.Util;
 import java.util.List;
 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");
@@ -42,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))
 			{
-				final String mail = Util.sanitizeString(Util.stripFormat(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;
@@ -96,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]));
@@ -121,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]));

Essentials/src/com/earth2me/essentials/commands/Commandmore.java

@@ -25,7 +25,7 @@ public class Commandmore extends EssentialsCommand
 		if (stack.getAmount() >= ((user.isAuthorized("essentials.oversizedstacks")) 
 								  ? ess.getSettings().getOversizedStackSize() : stack.getMaxStackSize()))
 		{
-			throw new NoChargeException();
+			throw new Exception(_("fullStack"));
 		}
 		final String itemname = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
 		if (ess.getSettings().permissionBasedItemSpawn()

Essentials/src/com/earth2me/essentials/commands/Commandmsg.java

@@ -21,7 +21,7 @@ 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().length() < 3  || args[1].trim().isEmpty())
+		if (args.length < 2 || args[0].trim().length() < 2  || args[1].trim().isEmpty())
 		{
 			throw new NotEnoughArgumentsException();
 		}

Essentials/src/com/earth2me/essentials/commands/Commandpay.java

@@ -22,7 +22,8 @@ public class Commandpay extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		
-		if (args[0].trim().length() < 3)
+		//TODO: TL this
+		if (args[0].trim().length() < 2)
 		{
 			throw new NotEnoughArgumentsException("You need to specify a player to pay.");
 		}

Essentials/src/com/earth2me/essentials/commands/Commandping.java

@@ -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()

Essentials/src/com/earth2me/essentials/commands/Commandrealname.java

@@ -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);
@@ -33,13 +34,15 @@ public class Commandrealname extends EssentialsCommand
 			}
 			u.setDisplayNick();
 			final String displayName = Util.stripFormat(u.getDisplayName()).toLowerCase(Locale.ENGLISH);
-			if (!whois.equals(displayName)
-				&& !displayName.equals(Util.stripFormat(ess.getSettings().getNicknamePrefix()) + whois)
-				&& !whois.equalsIgnoreCase(u.getName()))
+			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"));
 		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandrepair.java

@@ -28,7 +28,7 @@ public class Commandrepair extends EssentialsCommand
 		if (args[0].equalsIgnoreCase("hand"))
 		{
 			final ItemStack item = user.getItemInHand();
-			if (item == null)
+			if (item == null || item.getType().isBlock() || item.getDurability() == 0)
 			{
 				throw new Exception(_("repairInvalidType"));
 			}
@@ -41,7 +41,7 @@ public class Commandrepair extends EssentialsCommand
 			}
 
 			final String itemName = item.getType().toString().toLowerCase(Locale.ENGLISH);
-			final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), ess);
+			final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), new Trade("repair-" + item.getTypeId(), new Trade("repair-item", ess), ess), ess);
 
 			charge.isAffordableFor(user);
 
@@ -100,12 +100,12 @@ public class Commandrepair extends EssentialsCommand
 	{
 		for (ItemStack item : items)
 		{
-			if (item == null)
+			if (item == null || item.getType().isBlock() || item.getDurability() == 0)
 			{
 				continue;
 			}
 			final String itemName = item.getType().toString().toLowerCase(Locale.ENGLISH);
-			final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), "repair-item", ess);
+			final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), new Trade("repair-" + item.getTypeId(), new Trade("repair-item", ess), ess), ess);
 			try
 			{
 				charge.isAffordableFor(user);

Essentials/src/com/earth2me/essentials/commands/Commandseen.java

@@ -35,12 +35,23 @@ public class Commandseen extends EssentialsCommand
 		}
 		try
 		{
-			User player = getPlayer(server, args, 0);
-			player.setDisplayNick();
-			sender.sendMessage(_("seenOnline", player.getDisplayName(), Util.formatDateDiff(player.getLastLogin())));
+			User user = getPlayer(server, args, 0);
+			user.setDisplayNick();
+			sender.sendMessage(_("seenOnline", user.getDisplayName(), Util.formatDateDiff(user.getLastLogin())));
+			sender.sendMessage(_("whoisAFK", (user.isAfk() ? _("true") : _("false"))));
+			sender.sendMessage(_("whoisJail", (user.isJailed()
+											   ? user.getJailTimeout() > 0
+												 ? Util.formatDateDiff(user.getJailTimeout())
+												 : _("true")
+											   : _("false"))));
+			sender.sendMessage(_("whoisMuted", (user.isMuted()
+											   ? user.getMuteTimeout() > 0
+												 ? Util.formatDateDiff(user.getMuteTimeout())
+												 : _("true")
+											   : _("false"))));
 			if (extra)
 			{
-				sender.sendMessage(_("whoisIPAddress", player.getAddress().getAddress().toString()));
+				sender.sendMessage(_("whoisIPAddress", user.getAddress().getAddress().toString()));
 			}
 		}
 		catch (NoSuchFieldException e)

Essentials/src/com/earth2me/essentials/commands/Commandsell.java

@@ -1,10 +1,10 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import java.util.Locale;
 import java.util.logging.Level;
 import org.bukkit.Material;
@@ -22,6 +22,8 @@ public class Commandsell extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
+		double totalWorth = 0.0;
+		String type = "";
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
@@ -41,12 +43,16 @@ public class Commandsell extends EssentialsCommand
 				}
 				try
 				{
-					sellItem(user, stack, args, true);
+					totalWorth += sellItem(user, stack, args, true);				
 				}
 				catch (Exception e)
 				{
 				}
 			}
+			if (totalWorth > 0)
+			{
+				user.sendMessage(_("totalWorthAll", type, Util.displayCurrency(totalWorth, ess)));
+			}
 			return;
 		}
 		else if (args[0].equalsIgnoreCase("blocks"))
@@ -59,12 +65,16 @@ public class Commandsell extends EssentialsCommand
 				}
 				try
 				{
-					sellItem(user, stack, args, true);
+					totalWorth += sellItem(user, stack, args, true);
 				}
 				catch (Exception e)
 				{
 				}
 			}
+			if (totalWorth > 0)
+			{
+				user.sendMessage(_("totalWorthBlocks", type, Util.displayCurrency(totalWorth, ess)));
+			}
 			return;
 		}
 		if (is == null)
@@ -74,7 +84,7 @@ public class Commandsell extends EssentialsCommand
 		sellItem(user, is, args, false);
 	}
 
-	private void sellItem(User user, ItemStack is, String[] args, boolean isBulkSell) throws Exception
+	private double sellItem(User user, ItemStack is, String[] args, boolean isBulkSell) throws Exception
 	{
 		if (is == null || is.getType() == Material.AIR)
 		{
@@ -149,19 +159,19 @@ public class Commandsell extends EssentialsCommand
 			}
 			else
 			{
-				return;
+				return worth * amount;
 			}
 		}
 
 		//TODO: Prices for Enchantments
 		final ItemStack ris = is.clone();
 		ris.setAmount(amount);
-		InventoryWorkaround.removeItem(user.getInventory(), true, true, ris);
+		user.getInventory().removeItem(ris);
 		user.updateInventory();
 		Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(worth * amount, ess), user.getLocation(), ess);
 		user.giveMoney(worth * amount);
 		user.sendMessage(_("itemSold", Util.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth, ess)));
 		logger.log(Level.INFO, _("itemSoldConsole", user.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth * amount, ess), amount, Util.displayCurrency(worth, ess)));
-
+		return worth * amount;
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandsethome.java

@@ -2,7 +2,9 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 import java.util.Locale;
+import org.bukkit.Location;
 import org.bukkit.Server;
 
 
@@ -16,6 +18,10 @@ public class Commandsethome extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, String[] args) throws Exception
 	{
+		User usersHome = user;
+		String name = "home";
+		final Location location = user.getLocation();
+
 		if (args.length > 0)
 		{
 			//Allowing both formats /sethome khobbits house | /sethome khobbits:house
@@ -27,59 +33,52 @@ public class Commandsethome extends EssentialsCommand
 
 			if (args.length < 2)
 			{
-				if (user.isAuthorized("essentials.sethome.multiple"))
-				{
-					if ("bed".equals(args[0].toLowerCase(Locale.ENGLISH)))
-					{
-						throw new NotEnoughArgumentsException();
-					}
-					if ((user.isAuthorized("essentials.sethome.multiple.unlimited")) || (user.getHomes().size() < ess.getSettings().getHomeLimit(user))
-						|| (user.getHomes().contains(args[0].toLowerCase(Locale.ENGLISH))))
-					{
-						user.setHome(args[0].toLowerCase(Locale.ENGLISH));
-					}
-					else
-					{
-						throw new Exception(_("maxHomes", ess.getSettings().getHomeLimit(user)));
-					}
-
-				}
-				else
-				{
-					throw new Exception(_("maxHomes", 1));
-				}
+				name = args[0].toLowerCase(Locale.ENGLISH);
 			}
 			else
 			{
 				if (user.isAuthorized("essentials.sethome.others"))
 				{
-					User usersHome = ess.getUser(ess.getServer().getPlayer(args[0]));
+					usersHome = ess.getUser(args[0]);
 					if (usersHome == null)
 					{
-						usersHome = ess.getOfflineUser(args[0]);
+						throw new NoSuchFieldException(_("playerNotFound"));
 					}
-					if (usersHome == null)
-					{
-						throw new Exception(_("playerNotFound"));
-					}
-					String name = args[1].toLowerCase(Locale.ENGLISH);
-					if (!user.isAuthorized("essentials.sethome.multiple"))
-					{
-						name = "home";
-					}
-					if ("bed".equals(name.toLowerCase(Locale.ENGLISH)))
-					{
-						throw new NotEnoughArgumentsException();
-					}
-					usersHome.setHome(name, user.getLocation());
+					name = args[1].toLowerCase(Locale.ENGLISH);
 				}
 			}
 		}
-		else
+		if (checkHomeLimit(user, usersHome, name))
 		{
-			user.setHome();
+			name = "home";
 		}
+		if ("bed".equals(name) || Util.isInt(name))
+		{
+			throw new NoSuchFieldException(_("invalidHomeName"));
+		}
+		usersHome.setHome(name, location);
 		user.sendMessage(_("homeSet", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
 
 	}
+
+	private boolean checkHomeLimit(final User user, final User usersHome, String name) throws Exception
+	{
+		if (!user.isAuthorized("essentials.sethome.multiple.unlimited"))
+		{
+			int limit = ess.getSettings().getHomeLimit(user);
+			if (usersHome.getHomes().size() == limit && usersHome.getHomes().contains(name))
+			{
+				return false;
+			}
+			if (usersHome.getHomes().size() >= limit)
+			{
+				throw new Exception(_("maxHomes", ess.getSettings().getHomeLimit(user)));
+			}
+			if (limit == 1)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java

@@ -22,9 +22,10 @@ public class Commandsetwarp extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		
-		if (args[0].matches("[0-9]+")) {
-			throw new NotEnoughArgumentsException();
+
+		if (Util.isInt(args[0]))
+		{
+			throw new NoSuchFieldException(_("invalidWarpName"));
 		}
 
 		final Location loc = user.getLocation();
@@ -39,7 +40,7 @@ public class Commandsetwarp extends EssentialsCommand
 		{
 		}
 
-		if (warpLoc == null || user.isAuthorized("essentials.warp.overwrite." + Util.sanitizeFileName(args[0])))
+		if (warpLoc == null || user.isAuthorized("essentials.warp.overwrite." + Util.safeString(args[0])))
 		{
 			warps.setWarp(args[0], loc);
 		}

Essentials/src/com/earth2me/essentials/commands/Commandspawner.java

@@ -1,13 +1,15 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.*;
 import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.Mob;
+import com.earth2me.essentials.Trade;
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
 import java.util.Locale;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.CreatureSpawner;
-import org.bukkit.entity.EntityType;
 
 
 public class Commandspawner extends EssentialsCommand

Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java

@@ -2,17 +2,11 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Mob;
-import com.earth2me.essentials.Mob.MobException;
+import com.earth2me.essentials.SpawnMob;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
-import java.util.*;
-import org.bukkit.DyeColor;
-import org.bukkit.Location;
 import org.bukkit.Server;
-import org.bukkit.block.Block;
-import org.bukkit.entity.*;
-import org.bukkit.entity.Villager.Profession;
-import org.bukkit.material.Colorable;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandspawnmob extends EssentialsCommand
@@ -27,256 +21,41 @@ public class Commandspawnmob extends EssentialsCommand
 	{
 		if (args.length < 1)
 		{
-			final Set<String> mobList = Mob.getMobList();
-			final Set<String> availableList = new HashSet<String>();
-			for (String mob : mobList)
-			{
-				if (user.isAuthorized("essentials.spawnmob." + mob.toLowerCase()))
-				{
-					availableList.add(mob);
-				}
-			}
-			if (availableList.isEmpty())
-			{
-				availableList.add(_("none"));
-			}
-			throw new NotEnoughArgumentsException(_("mobsAvailable", Util.joinList(availableList)));
+			final String mobList = SpawnMob.mobList(user);
+			throw new NotEnoughArgumentsException(_("mobsAvailable", mobList));
 		}
 
+		String[] mobData = SpawnMob.mobData(args[0]);
 
-		final String[] mountparts = args[0].split(",");
-		String[] parts = mountparts[0].split(":");
-		String mobType = parts[0];
-		String mobData = null;
-		if (parts.length == 2)
-		{
-			mobData = parts[1];
-		}
-		String mountType = null;
-		String mountData = null;
-		if (mountparts.length > 1)
-		{
-			parts = mountparts[1].split(":");
-			mountType = parts[0];
-			if (parts.length == 2)
-			{
-				mountData = parts[1];
-			}
-		}
-
-
-		Entity spawnedMob = null;
-		Mob mob = null;
-		Entity spawnedMount = null;
-		Mob mobMount = null;
-
-		mob = Mob.fromName(mobType);
-		if (mob == null)
-		{
-			throw new Exception(_("invalidMob"));
-		}
-
-		if (ess.getSettings().getProtectPreventSpawn(mob.getType().toString().toLowerCase(Locale.ENGLISH)))
-		{
-			throw new Exception(_("disabledToSpawnMob"));
-		}
-		if (!user.isAuthorized("essentials.spawnmob." + mob.name.toLowerCase()))
-		{
-			throw new Exception(_("noPermToSpawnMob"));
-		}
-
-		final Block block = Util.getTarget(user).getBlock();
-		if (block == null)
-		{
-			throw new Exception(_("unableToSpawnMob"));
-		}
-		User otherUser = null;
-		if (args.length >= 3)
-		{
-			otherUser = getPlayer(ess.getServer(), args, 2);
-		}
-		final Location loc = (otherUser == null) ? block.getLocation() : otherUser.getLocation();
-		final Location sloc = Util.getSafeDestination(loc);
-		try
-		{
-			spawnedMob = mob.spawn(user, server, sloc);
-		}
-		catch (MobException e)
-		{
-			throw new Exception(_("unableToSpawnMob"), e);
-		}
-
-		if (mountType != null)
-		{
-			mobMount = Mob.fromName(mountType);
-			if (mobMount == null)
-			{
-				user.sendMessage(_("invalidMob"));
-				return;
-			}
-
-			if (ess.getSettings().getProtectPreventSpawn(mobMount.getType().toString().toLowerCase(Locale.ENGLISH)))
-			{
-				throw new Exception(_("disabledToSpawnMob"));
-			}
-			if (!user.isAuthorized("essentials.spawnmob." + mobMount.name.toLowerCase()))
-			{
-				throw new Exception(_("noPermToSpawnMob"));
-			}
-			try
-			{
-				spawnedMount = mobMount.spawn(user, server, loc);
-			}
-			catch (MobException e)
-			{
-				throw new Exception(_("unableToSpawnMob"), e);
-			}
-			spawnedMob.setPassenger(spawnedMount);
-		}
-		if (mobData != null)
-		{
-			changeMobData(mob.getType(), spawnedMob, mobData, user);
-		}
-		if (spawnedMount != null && mountData != null)
-		{
-			changeMobData(mobMount.getType(), spawnedMount, mountData, user);
-		}
+		int mobCount = 1;
 		if (args.length >= 2)
 		{
-			int mobCount = Integer.parseInt(args[1]);
-			int serverLimit = ess.getSettings().getSpawnMobLimit();
-			if (mobCount > serverLimit)
-			{
-				mobCount = serverLimit;
-				user.sendMessage(_("mobSpawnLimit"));
-			}
-
-			try
-			{
-				for (int i = 1; i < mobCount; i++)
-				{
-					spawnedMob = mob.spawn(user, server, loc);
-					if (mobMount != null)
-					{
-						try
-						{
-							spawnedMount = mobMount.spawn(user, server, loc);
-						}
-						catch (MobException e)
-						{
-							throw new Exception(_("unableToSpawnMob"), e);
-						}
-						spawnedMob.setPassenger(spawnedMount);
-					}
-					if (mobData != null)
-					{
-						changeMobData(mob.getType(), spawnedMob, mobData, user);
-					}
-					if (spawnedMount != null && mountData != null)
-					{
-						changeMobData(mobMount.getType(), spawnedMount, mountData, user);
-					}
-				}
-				user.sendMessage(mobCount + " " + mob.name.toLowerCase(Locale.ENGLISH) + mob.suffix + " " + _("spawned"));
-			}
-			catch (MobException e1)
-			{
-				throw new Exception(_("unableToSpawnMob"), e1);
-			}
-			catch (NumberFormatException e2)
-			{
-				throw new Exception(_("numberRequired"), e2);
-			}
-			catch (NullPointerException np)
-			{
-				throw new Exception(_("soloMob"), np);
-			}
+			mobCount = Integer.parseInt(args[1]);
 		}
-		else
-		{
-			user.sendMessage(mob.name + " " + _("spawned"));
-		}
-	}
 
-	private void changeMobData(final EntityType type, final Entity spawned, String data, final User user) throws Exception
-	{
-		data = data.toLowerCase(Locale.ENGLISH);
-
-		if (spawned instanceof Slime)
+		if (args.length >= 3)
 		{
-			try
-			{
-				((Slime)spawned).setSize(Integer.parseInt(data));
-			}
-			catch (Exception e)
-			{
-				throw new Exception(_("slimeMalformedSize"), e);
-			}
-		}
-		if (spawned instanceof Ageable && data.contains("baby"))
-		{
-			((Ageable)spawned).setBaby();
+			final User target = getPlayer(ess.getServer(), args, 2);
+			SpawnMob.spawnmob(ess, server, user, target, mobData, mobCount);
 			return;
 		}
-		if (spawned instanceof Colorable)
+
+		SpawnMob.spawnmob(ess, server, user, mobData, mobCount);
+	}
+
+	@Override
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 3)
 		{
-			final String color = data.toUpperCase(Locale.ENGLISH).replace("BABY", "");
-			try
-			{
-				if (color.equals("RANDOM"))
-				{
-					final Random rand = new Random();
-					((Colorable)spawned).setColor(DyeColor.values()[rand.nextInt(DyeColor.values().length)]);
-				}
-				else
-				{
-					((Colorable)spawned).setColor(DyeColor.valueOf(color));
-				}
-			}
-			catch (Exception e)
-			{
-				throw new Exception(_("sheepMalformedColor"), e);
-			}
-		}
-		if (spawned instanceof Tameable && data.contains("tamed"))
-		{
-			final Tameable tameable = ((Tameable)spawned);
-			tameable.setTamed(true);
-			tameable.setOwner(user.getBase());
-		}
-		if (type == EntityType.WOLF
-			&& data.contains("angry"))
-		{
-			((Wolf)spawned).setAngry(true);
-		}
-		if (type == EntityType.CREEPER && data.contains("powered"))
-		{
-			((Creeper)spawned).setPowered(true);
-		}
-		if (type == EntityType.OCELOT)
-		{
-			if (data.contains("siamese"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
-			}
-			else if (data.contains("red"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT);
-			}
-			else if (data.contains("black"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT);
-			}
-		}
-		if (type == EntityType.VILLAGER)
-		{
-			for (Profession prof : Villager.Profession.values())
-			{
-				if (data.contains(prof.toString().toLowerCase(Locale.ENGLISH)))
-				{
-					((Villager)spawned).setProfession(prof);
-				}
-			}
+			final String mobList = Util.joinList(Mob.getMobList());
+			throw new NotEnoughArgumentsException(_("mobsAvailable", mobList));
 		}
+
+		String[] mobData = SpawnMob.mobData(args[0]);
+		int mobCount = Integer.parseInt(args[1]);
+
+		final User target = getPlayer(ess.getServer(), args, 2);
+		SpawnMob.spawnmob(ess, server, sender, target, mobData, mobCount);
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandspeed.java

@@ -0,0 +1,153 @@
+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 Commandspeed extends EssentialsCommand
+{
+	public Commandspeed()
+	{
+		super("speed");
+	}
+
+	@Override
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		final boolean isFly = isFlyMode(args[0]);
+		final float speed = getMoveSpeed(args[1]);
+		speedOtherPlayers(server, sender, isFly, true, speed, args[2]);
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+
+		boolean isFly;
+		float speed;
+		boolean isBypass = user.isAuthorized("essentials.speed.bypass");
+		if (args.length == 1)
+		{
+			//isFly = user.isFlying();
+			isFly = true;
+			speed = getMoveSpeed(args[0]);
+		}
+		else
+		{
+			//isFly = isFlyMode(args[0]);
+			//speed = getMoveSpeed(args[1]);
+			//if (args.length > 2 && user.isAuthorized("essentials.speed.others"))
+			//{
+			//	speedOtherPlayers(server, user, isFly, isBypass, speed, args[2]);
+			//	return;
+			//}
+			isFly = true;
+			speed = getMoveSpeed(args[0]);
+			if (user.isAuthorized("essentials.speed.others"))
+			{
+				speedOtherPlayers(server, user, isFly, isBypass, speed, args[1]);
+				return;
+			}
+		}
+
+		//if (isFly)
+		//{
+			user.setFlySpeed(getRealMoveSpeed(speed, isFly, isBypass));
+			user.sendMessage(_("moveSpeed", _("flying"), speed, user.getDisplayName()));
+		//}
+		//else
+		//{
+		//	user.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass));
+		//	user.sendMessage(_("moveSpeed", _("walking"), speed, user.getDisplayName()));
+		//}
+	}
+
+	private void speedOtherPlayers(final Server server, final CommandSender sender, final boolean isFly, final boolean isBypass, final float speed, final String target)
+	{
+		for (Player matchPlayer : server.matchPlayer(target))
+		{
+			if (isFly)
+			{
+				matchPlayer.setFlySpeed(getRealMoveSpeed(speed, isFly, isBypass));
+				sender.sendMessage(_("moveSpeed", _("flying"), speed, matchPlayer.getDisplayName()));
+			}
+			else
+			{
+				matchPlayer.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass));
+				sender.sendMessage(_("moveSpeed", _("walking"), speed, matchPlayer.getDisplayName()));
+			}
+		}
+	}
+
+	private boolean isFlyMode(final String modeString) throws NotEnoughArgumentsException
+	{
+		boolean isFlyMode;
+		if (modeString.contains("fly") || modeString.equalsIgnoreCase("f"))
+		{
+			isFlyMode = true;
+		}
+		else if (modeString.contains("walk") || modeString.contains("run")
+				 || modeString.equalsIgnoreCase("w") || modeString.equalsIgnoreCase("r"))
+		{
+			isFlyMode = false;
+		}
+		else
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		return isFlyMode;
+	}
+
+	private float getMoveSpeed(final String moveSpeed) throws NotEnoughArgumentsException
+	{
+		float userSpeed;
+		try
+		{
+			userSpeed = Float.parseFloat(moveSpeed);
+			if (userSpeed > 10f)
+			{
+				userSpeed = 10f;
+			}
+			else if (userSpeed < 0f)
+			{
+				userSpeed = 0f;
+			}
+		}
+		catch (NumberFormatException e)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		return userSpeed;
+	}
+
+	private float getRealMoveSpeed(final float userSpeed, final boolean isFly, final boolean isBypass)
+	{
+		final float defaultSpeed = isFly ? 0.1f : 0.2f;
+		float maxSpeed = 1f;
+		if (!isBypass)
+		{
+			maxSpeed = (float)(isFly ? ess.getSettings().getMaxFlySpeed() : ess.getSettings().getMaxWalkSpeed());
+		}
+
+		if (userSpeed < 1f)
+		{
+			return defaultSpeed * userSpeed;
+		}
+		else
+		{
+			float ratio = ((userSpeed - 1) / 9) * (maxSpeed - defaultSpeed);
+			return ratio + defaultSpeed;
+		}
+	}
+}

Essentials/src/com/earth2me/essentials/commands/Commandsudo.java

@@ -2,10 +2,12 @@ package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Player;
 
 
 public class Commandsudo extends EssentialsCommand
@@ -14,6 +16,7 @@ public class Commandsudo extends EssentialsCommand
 	{
 		super("sudo");
 	}
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
 
 	@Override
 	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
@@ -24,6 +27,15 @@ public class Commandsudo extends EssentialsCommand
 		}
 
 		final User user = getPlayer(server, args, 0, false);
+		if(args[1].toLowerCase().startsWith("c:"))
+		{
+			if (user.isAuthorized("essentials.sudo.exempt") && sender instanceof Player)
+			{
+				throw new Exception(_("sudoExempt"));
+			}
+			user.chat(getFinalArg(args, 1).substring(2));
+			return;
+		}
 		final String command = args[1];
 		final String[] arguments = new String[args.length - 2];
 		if (arguments.length > 0)
@@ -31,7 +43,7 @@ public class Commandsudo extends EssentialsCommand
 			System.arraycopy(args, 2, arguments, 0, args.length - 2);
 		}
 
-		if (user.isAuthorized("essentials.sudo.exempt"))
+		if (user.isAuthorized("essentials.sudo.exempt") && sender instanceof Player)
 		{
 			throw new Exception(_("sudoExempt"));
 		}
@@ -41,8 +53,19 @@ public class Commandsudo extends EssentialsCommand
 		final PluginCommand execCommand = ess.getServer().getPluginCommand(command);
 		if (execCommand != null)
 		{
-			execCommand.execute(user.getBase(), command, arguments);
+			ess.scheduleSyncDelayedTask(
+					new Runnable()
+					{
+						@Override
+						public void run()
+						{
+							LOGGER.log(Level.INFO, String.format("[Sudo] %s issued server command: /%s %s", user.getName(), command, getFinalArg(arguments, 0)));
+							execCommand.execute(user.getBase(), command, arguments);							
+						}
+					});
+		}
+		else {
+			sender.sendMessage(_("errorCallingCommand", command));
 		}
-
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandtp.java

@@ -4,6 +4,7 @@ import com.earth2me.essentials.Console;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -31,22 +32,43 @@ public class Commandtp extends EssentialsCommand
 				throw new Exception(_("teleportDisabled", player.getDisplayName()));
 			}
 			if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-				&& !user.isAuthorized("essentials.world." + player.getWorld().getName()))
+				&& !user.isAuthorized("essentials.worlds." + player.getWorld().getName()))
 			{
-				throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName()));
+				throw new Exception(_("noPerm", "essentials.worlds." + player.getWorld().getName()));
 			}
 			user.sendMessage(_("teleporting"));
 			final Trade charge = new Trade(this.getName(), ess);
 			charge.isAffordableFor(user);
 			user.getTeleport().teleport(player, charge, TeleportCause.COMMAND);
 			throw new NoChargeException();
-
+		case 4:
+			if (!user.isAuthorized("essentials.tp.others"))
+			{
+				throw new Exception(_("noPerm", "essentials.tp.others"));
+			}
+			final User target2 = getPlayer(server, args, 0);
+			final double x = args[1].startsWith("~") ? target2.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
+			final double y = args[2].startsWith("~") ? target2.getLocation().getY() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
+			final double z = args[3].startsWith("~") ? target2.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]);
+			if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
+			{
+				throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
+			}
+			final Location location = new Location(target2.getWorld(), x, y, z);
+			if (!target2.isTeleportEnabled())
+			{
+				throw new Exception(_("teleportDisabled", target2.getDisplayName()));
+			}
+			target2.getTeleport().now(location, false, TeleportCause.COMMAND);
+			user.sendMessage(_("teleporting"));
+			target2.sendMessage(_("teleporting"));
+			break;
+		case 2:
 		default:
 			if (!user.isAuthorized("essentials.tp.others"))
 			{
 				throw new Exception(_("noPerm", "essentials.tp.others"));
 			}
-			user.sendMessage(_("teleporting"));
 			final User target = getPlayer(server, args, 0);
 			final User toPlayer = getPlayer(server, args, 1);
 			if (!target.isTeleportEnabled())
@@ -58,11 +80,12 @@ public class Commandtp extends EssentialsCommand
 				throw new Exception(_("teleportDisabled", toPlayer.getDisplayName()));
 			}
 			if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-				&& !user.isAuthorized("essentials.world." + toPlayer.getWorld().getName()))
+				&& !user.isAuthorized("essentials.worlds." + toPlayer.getWorld().getName()))
 			{
-				throw new Exception(_("noPerm", "essentials.world." + toPlayer.getWorld().getName()));
+				throw new Exception(_("noPerm", "essentials.worlds." + toPlayer.getWorld().getName()));
 			}
 			target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
+			user.sendMessage(_("teleporting"));
 			target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName()));
 			break;
 		}
@@ -76,10 +99,28 @@ public class Commandtp extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		sender.sendMessage(_("teleporting"));
 		final User target = getPlayer(server, args, 0);
-		final User toPlayer = getPlayer(server, args, 1);
-		target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
-		target.sendMessage(_("teleportAtoB", Console.NAME, toPlayer.getDisplayName()));
+		if (args.length == 2)
+		{
+			final User toPlayer = getPlayer(server, args, 1);
+			target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
+			target.sendMessage(_("teleportAtoB", Console.NAME, toPlayer.getDisplayName()));
+		}
+		else if (args.length > 3)
+		{
+			final double x = args[1].startsWith("~") ? target.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
+			final double y = args[2].startsWith("~") ? target.getLocation().getY() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
+			final double z = args[3].startsWith("~") ? target.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]);
+			if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
+			{
+				throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
+			}
+			final Location location = new Location(target.getWorld(), x, y, z);
+			target.getTeleport().now(location, false, TeleportCause.COMMAND);
+			target.sendMessage(_("teleporting"));
+		} else {
+			throw new NotEnoughArgumentsException();
+		}
+		sender.sendMessage(_("teleporting"));
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandtpa.java

@@ -26,9 +26,9 @@ public class Commandtpa extends EssentialsCommand
 			throw new Exception(_("teleportDisabled", player.getDisplayName()));
 		}
 		if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-			&& !user.isAuthorized("essentials.world." + player.getWorld().getName()))
+			&& !user.isAuthorized("essentials.worlds." + player.getWorld().getName()))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName()));
+			throw new Exception(_("noPerm", "essentials.worlds." + player.getWorld().getName()));
 		}
 		if (!player.isIgnoredPlayer(user))
 		{

Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java

@@ -46,7 +46,7 @@ public class Commandtpaall extends EssentialsCommand
 				continue;
 			}
 			if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-				&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
+				&& !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))
 			{
 				continue;
 			}

Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java

@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.ChargeException;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
@@ -27,14 +28,14 @@ public class Commandtpaccept extends EssentialsCommand
 
 		if (user.isTpRequestHere() && ((!target.isAuthorized("essentials.tpahere") && !target.isAuthorized("essentials.tpaall"))
 									   || (user.getWorld() != target.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-										   && !user.isAuthorized("essentials.world." + user.getWorld().getName()))))
+										   && !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))))
 		{
 			throw new Exception(_("noPendingRequest"));
 		}
 
 		if (!user.isTpRequestHere() && (!target.isAuthorized("essentials.tpa")
 										|| (user.getWorld() != target.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-											&& !user.isAuthorized("essentials.world." + target.getWorld().getName()))))
+											&& !user.isAuthorized("essentials.worlds." + target.getWorld().getName()))))
 		{
 			throw new Exception(_("noPendingRequest"));
 		}
@@ -52,25 +53,26 @@ public class Commandtpaccept extends EssentialsCommand
 		}
 
 		final Trade charge = new Trade(this.getName(), ess);
-		if (user.isTpRequestHere())
-		{
-			charge.isAffordableFor(user);
-		}
-		else
-		{
-			charge.isAffordableFor(target);
-		}
 		user.sendMessage(_("requestAccepted"));
 		target.sendMessage(_("requestAcceptedFrom", user.getDisplayName()));
 
-		if (user.isTpRequestHere())
+		try
 		{
-			user.getTeleport().teleport(target, charge, TeleportCause.COMMAND);
+			if (user.isTpRequestHere())
+			{
+				target.getTeleport().teleportToMe(user, charge, TeleportCause.COMMAND);
+			}
+			else
+			{
+				target.getTeleport().teleport(user, charge, TeleportCause.COMMAND);
+			}
 		}
-		else
+		catch (ChargeException ex)
 		{
-			target.getTeleport().teleport(user, charge, TeleportCause.COMMAND);
+			user.sendMessage(_("pendingTeleportCancelled"));
+			ess.showError(target, ex, commandLabel);
 		}
 		user.requestTeleport(null, false);
+		throw new NoChargeException();
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java

@@ -26,9 +26,9 @@ public class Commandtpahere extends EssentialsCommand
 			throw new Exception(_("teleportDisabled", player.getDisplayName()));
 		}
 		if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-			&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
+			&& !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
+			throw new Exception(_("noPerm", "essentials.worlds." + user.getWorld().getName()));
 		}
 		player.requestTeleport(user, true);
 		player.sendMessage(_("teleportHereRequest", user.getDisplayName()));

Essentials/src/com/earth2me/essentials/commands/Commandtpall.java

@@ -43,7 +43,7 @@ public class Commandtpall extends EssentialsCommand
 				continue;
 			}
 			if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-				&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
+				&& !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))
 			{
 				continue;
 			}

Essentials/src/com/earth2me/essentials/commands/Commandtphere.java

@@ -23,11 +23,11 @@ public class Commandtphere extends EssentialsCommand
 			throw new Exception(_("teleportDisabled", player.getDisplayName()));
 		}
 		if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-			&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
+			&& !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
+			throw new Exception(_("noPerm", "essentials.worlds." + user.getWorld().getName()));
 		}
-		player.getTeleport().teleport(user, new Trade(this.getName(), ess), TeleportCause.COMMAND);
+		user.getTeleport().teleportToMe(player, new Trade(this.getName(), ess), TeleportCause.COMMAND);
 		user.sendMessage(_("teleporting"));
 		player.sendMessage(_("teleporting"));
 		throw new NoChargeException();

Essentials/src/com/earth2me/essentials/commands/Commandtpo.java

@@ -28,9 +28,9 @@ public class Commandtpo extends EssentialsCommand
 				throw new NoSuchFieldException(_("playerNotFound"));
 			}
 			if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-				&& !user.isAuthorized("essentials.world." + player.getWorld().getName()))
+				&& !user.isAuthorized("essentials.worlds." + player.getWorld().getName()))
 			{
-				throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName()));
+				throw new Exception(_("noPerm", "essentials.worlds." + player.getWorld().getName()));
 			}
 			user.sendMessage(_("teleporting"));
 			user.getTeleport().now(player, false, TeleportCause.COMMAND);
@@ -52,9 +52,9 @@ public class Commandtpo extends EssentialsCommand
 			}
 
 			if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-				&& !user.isAuthorized("essentials.world." + toPlayer.getWorld().getName()))
+				&& !user.isAuthorized("essentials.worlds." + toPlayer.getWorld().getName()))
 			{
-				throw new Exception(_("noPerm", "essentials.world." + toPlayer.getWorld().getName()));
+				throw new Exception(_("noPerm", "essentials.worlds." + toPlayer.getWorld().getName()));
 			}
 
 			target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);

Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java

@@ -31,9 +31,9 @@ public class Commandtpohere extends EssentialsCommand
 		}
 
 		if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
-			&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
+			&& !user.isAuthorized("essentials.worlds." + user.getWorld().getName()))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
+			throw new Exception(_("noPerm", "essentials.worlds." + user.getWorld().getName()));
 		}
 
 		// Verify permission

Essentials/src/com/earth2me/essentials/commands/Commandtppos.java

@@ -24,9 +24,9 @@ public class Commandtppos extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final int x = Integer.parseInt(args[0]);
-		final int y = Integer.parseInt(args[1]);
-		final int z = Integer.parseInt(args[2]);
+		final double x = args[0].startsWith("~") ? user.getLocation().getX() + Integer.parseInt(args[0].substring(1)) : Integer.parseInt(args[0]);
+		final double y = args[1].startsWith("~") ? user.getLocation().getY() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
+		final double z = args[2].startsWith("~") ? user.getLocation().getZ() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
 		final Location location = new Location(user.getWorld(), x, y, z);
 		if (args.length > 3)
 		{
@@ -36,6 +36,10 @@ public class Commandtppos extends EssentialsCommand
 		{
 			location.setPitch(Float.parseFloat(args[4]));
 		}
+		if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
+		{
+			throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
+		}
 		final Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
 		user.sendMessage(_("teleporting"));
@@ -52,9 +56,9 @@ public class Commandtppos extends EssentialsCommand
 		}
 
 		User user = ess.getUser(server.getPlayer(args[0]));
-		final int x = Integer.parseInt(args[1]);
-		final int y = Integer.parseInt(args[2]);
-		final int z = Integer.parseInt(args[3]);
+		final double x = args[1].startsWith("~") ? user.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
+		final double y = args[2].startsWith("~") ? user.getLocation().getY() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
+		final double z = args[3].startsWith("~") ? user.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]);
 		final Location location = new Location(user.getWorld(), x, y, z);
 		if (args.length > 4)
 		{
@@ -64,8 +68,13 @@ public class Commandtppos extends EssentialsCommand
 		{
 			location.setPitch(Float.parseFloat(args[5]));
 		}
+		if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
+		{
+			throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //todo: I18n
+		}
 		sender.sendMessage(_("teleporting"));
 		user.sendMessage(_("teleporting"));
 		user.getTeleport().teleport(location, null, TeleportCause.COMMAND);
+
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java

@@ -3,6 +3,8 @@ 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 Commandtptoggle extends EssentialsCommand
@@ -12,11 +14,60 @@ public class Commandtptoggle extends EssentialsCommand
 		super("tptoggle");
 	}
 
+	@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();
+		}
+
+		toggleOtherPlayers(server, sender, args);
+	}
+
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		user.sendMessage(user.toggleTeleportEnabled()
-						 ? _("teleportationEnabled")
-						 : _("teleportationDisabled"));
+		if (args.length > 0 && args[0].trim().length() > 2 && user.isAuthorized("essentials.tptoggle.others"))
+		{
+			toggleOtherPlayers(server, user, args);
+			return;
+		}
+
+		user.sendMessage(user.toggleTeleportEnabled() ? _("teleportationEnabled") : _("teleportationDisabled"));
+	}
+
+	private void toggleOtherPlayers(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.setTeleportEnabled(true);
+				}
+				else
+				{
+					player.setTeleportEnabled(false);
+				}
+			}
+			else
+			{
+				player.toggleTeleportEnabled();
+			}
+
+			final boolean enabled = player.isTeleportEnabled();
+
+
+			player.sendMessage(enabled ? _("teleportationEnabled") : _("teleportationDisabled"));
+			sender.sendMessage(enabled ? _("teleportationEnabledFor", matchPlayer.getDisplayName()) : _("teleportationDisabledFor", matchPlayer.getDisplayName()));
+		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java

@@ -1,8 +1,8 @@
 package com.earth2me.essentials.commands;
 
 import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import java.util.List;
 import java.util.Locale;
 import org.bukkit.Material;
@@ -103,7 +103,7 @@ public class Commandunlimited extends EssentialsCommand
 		{
 			message = "enableUnlimited";
 			enableUnlimited = true;
-			if (!InventoryWorkaround.containsItem(target.getInventory(), true, true, stack))
+			if (!target.getInventory().containsAtLeast(stack, stack.getAmount()))
 			{
 				target.getInventory().addItem(stack);
 			}

Essentials/src/com/earth2me/essentials/commands/Commandwarp.java

@@ -37,8 +37,9 @@ public class Commandwarp extends EssentialsCommand
 		}
 		if (args.length > 0)
 		{
+			//TODO: Remove 'otherplayers' permission.
 			User otherUser = null;
-			if (args.length == 2 && user.isAuthorized("essentials.warp.otherplayers"))
+			if (args.length == 2 && (user.isAuthorized("essentials.warp.otherplayers") || user.isAuthorized("essentials.warp.others")))
 			{
 				otherUser = ess.getUser(server.getPlayer(args[1]));
 				if (otherUser == null)
@@ -56,7 +57,7 @@ public class Commandwarp extends EssentialsCommand
 	@Override
 	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length < 2 || args[0].matches("[0-9]+"))
+		if (args.length < 2 || Util.isInt(args[0]))
 		{
 			warpList(sender, args);
 			throw new NoChargeException();
@@ -87,14 +88,14 @@ public class Commandwarp extends EssentialsCommand
 			while (iterator.hasNext())
 			{
 				final String warpName = iterator.next();
-				if (ess.getSettings().getPerWarpPermission() && !((User)sender).isAuthorized("essentials.warp." + warpName))
+				if (ess.getSettings().getPerWarpPermission() && !((User)sender).isAuthorized("essentials.warps." + warpName))
 				{
 					iterator.remove();
 				}
 			}
 		}
 		int page = 1;
-		if (args.length > 0)
+		if (args.length > 0 && Util.isInt(args[0]))
 		{
 			page = Integer.parseInt(args[0]);
 		}
@@ -105,7 +106,7 @@ public class Commandwarp extends EssentialsCommand
 		if (warpNameList.size() > WARPS_PER_PAGE)
 		{
 			sender.sendMessage(_("warpsCount", warpNameList.size(), page, (int)Math.ceil(warpNameList.size() / (double)WARPS_PER_PAGE)));
-			sender.sendMessage(warpList);
+			sender.sendMessage(_("warpList", warpList));
 		}
 		else
 		{
@@ -120,7 +121,7 @@ public class Commandwarp extends EssentialsCommand
 		final double fullCharge = chargeWarp.getCommandCost(user) + chargeCmd.getCommandCost(user);
 		final Trade charge = new Trade(fullCharge, ess);
 		charge.isAffordableFor(owner);
-		if (ess.getSettings().getPerWarpPermission() && !owner.isAuthorized("essentials.warp." + name))
+		if (ess.getSettings().getPerWarpPermission() && !owner.isAuthorized("essentials.warps." + name))
 		{
 			throw new Exception(_("warpUsePermission"));
 		}

Essentials/src/com/earth2me/essentials/commands/Commandworld.java

@@ -54,9 +54,9 @@ public class Commandworld extends EssentialsCommand
 			}
 		}
 
-		if (ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.world." + world.getName()))
+		if (ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + world.getName()))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + world.getName()));
+			throw new Exception(_("noPerm", "essentials.worlds." + world.getName()));
 		}
 
 		double factor;

Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java

@@ -56,14 +56,14 @@ public abstract class EssentialsCommand implements IEssentialsCommand
 		}
 		if (args[pos].isEmpty())
 		{
-			throw new NoSuchFieldException(_("playerNotFound"));
+			throw new PlayerNotFoundException();
 		}
 		final User user = ess.getUser(args[pos]);
 		if (user != null)
 		{
 			if (!getOffline && (!user.isOnline() || user.isHidden()))
 			{
-				throw new NoSuchFieldException(_("playerNotFound"));
+				throw new PlayerNotFoundException();
 			}
 			return user;
 		}
@@ -85,7 +85,7 @@ public abstract class EssentialsCommand implements IEssentialsCommand
 				return userMatch;
 			}
 		}
-		throw new NoSuchFieldException(_("playerNotFound"));
+		throw new PlayerNotFoundException();
 	}
 
 	@Override