Merge branch 'refs/heads/master' into release

Conflicts:
	EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java

.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/bukkit-0.0.1-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/craftbukkit-0.0.1-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/Permissions3.jar"/>
+</classpath>

.gitignore

@@ -28,4 +28,13 @@
 /EssentialsPermissionsCommands/dist/
 /Essentials/nbproject/private/
 /Essentials/dist/
-/Essentials/build/
+/Essentials/build/
+/YamlAnnotations/
+/EssentialsUpdate/nbproject/private/
+/EssentialsRelease/
+/EssentialsUpdate/dist/
+/EssentialsUpdate/build/
+/WebPush/apikey.php
+
+/WebPush/apikey.php
+/WebPush/apikey.php

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Essentials</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

BuildAll/nbproject/build-impl.xml

@@ -636,13 +636,6 @@ 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.EssentialsPermissionsCommands}" name="call.subproject"/>
-            <param location="${project.EssentialsPermissionsCommands}/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"/>
@@ -1136,13 +1129,6 @@ 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.EssentialsPermissionsCommands}" name="call.subproject"/>
-            <param location="${project.EssentialsPermissionsCommands}/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=2bd2dd75
+build.xml.data.CRC32=51b33957
 build.xml.script.CRC32=7a797370
-build.xml.stylesheet.CRC32=28e38971@1.43.1.45
+build.xml.stylesheet.CRC32=28e38971@1.44.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=2bd2dd75
-nbproject/build-impl.xml.script.CRC32=89fb91fc
+nbproject/build-impl.xml.data.CRC32=51b33957
+nbproject/build-impl.xml.script.CRC32=66b89647
 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45

BuildAll/nbproject/project.properties

@@ -67,7 +67,6 @@ javac.classpath=\
     ${reference.Essentials.jar}:\
     ${reference.EssentialsChat.jar}:\
     ${reference.EssentialsProtect.jar}:\
-    ${reference.EssentialsPermissionsCommands.jar}:\
     ${reference.EssentialsSpawn.jar}:\
     ${reference.EssentialsGeoIP.jar}:\
     ${reference.EssentialsGroupBridge.jar}:\
@@ -106,7 +105,6 @@ project.EssentialsChat=../EssentialsChat
 project.EssentialsGeoIP=../EssentialsGeoIP
 project.EssentialsGroupBridge=../EssentialsGroupBridge
 project.EssentialsGroupManager=../EssentialsGroupManager
-project.EssentialsPermissionsCommands=../EssentialsPermissionsCommands
 project.EssentialsProtect=../EssentialsProtect
 project.EssentialsSpawn=../EssentialsSpawn
 project.EssentialsXMPP=../EssentialsXMPP
@@ -115,7 +113,6 @@ 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.EssentialsPermissionsCommands.jar=${project.EssentialsPermissionsCommands}/dist/EssentialsPermissionsCommands.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,14 +55,6 @@
                 <clean-target>clean</clean-target>
                 <id>jar</id>
             </reference>
-            <reference>
-                <foreign-project>EssentialsPermissionsCommands</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/pmd.settings

@@ -1 +1,2 @@
 DoNotUseThreads
+SignatureDeclareThrowsException

Essentials/nbproject/project.properties

@@ -1,6 +1,7 @@
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=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
 application.title=Essentials
 application.vendor=
@@ -62,13 +63,16 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.BOSEconomy7.jar=../lib/BOSEconomy7.jar
+file.reference.bPermissions.jar=../lib/bPermissions.jar
 file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
 file.reference.iCo4.jar=../lib/iCo4.jar
 file.reference.iCo5.jar=../lib/iCo5.jar
 file.reference.iCo6.jar=../lib/iCo6.jar
 file.reference.junit-4.5.jar=..\\lib\\junit_4\\junit-4.5.jar
+file.reference.lombok-0.10.1.jar=../lib/lombok-0.10.1.jar
 file.reference.MultiCurrency.jar=../lib/MultiCurrency.jar
 file.reference.Permissions3.jar=../lib/Permissions3.jar
+file.reference.PermissionsBukkit-1.2.jar=../lib/PermissionsBukkit-1.2.jar
 file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -82,7 +86,10 @@ javac.classpath=\
     ${file.reference.iCo6.jar}:\
     ${file.reference.MultiCurrency.jar}:\
     ${file.reference.BOSEconomy7.jar}:\
-    ${file.reference.PermissionsEx.jar}
+    ${file.reference.PermissionsEx.jar}:\
+    ${file.reference.bPermissions.jar}:\
+    ${file.reference.PermissionsBukkit-1.2.jar}:\
+    ${file.reference.lombok-0.10.1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

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

@@ -1,35 +1,46 @@
 package com.earth2me.essentials;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.craftbukkit.CraftServer;
 
-public class Backup implements Runnable {
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private final CraftServer server;
-	private final IEssentials ess;
-	private boolean running = false;
-	private int taskId = -1;
-	private boolean active = false;
 
-	public Backup(IEssentials ess) {
+public class Backup implements Runnable
+{
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private transient final Server server;
+	private transient final IEssentials ess;
+	private transient boolean running = false;
+	private transient int taskId = -1;
+	private transient boolean active = false;
+
+	public Backup(final IEssentials ess)
+	{
 		this.ess = ess;
-		server = (CraftServer)ess.getServer();
-		if (server.getOnlinePlayers().length > 0) {
+		server = ess.getServer();
+		if (server.getOnlinePlayers().length > 0)
+		{
 			startTask();
 		}
-	}	
+	}
 
-	void onPlayerJoin() {
+	void onPlayerJoin()
+	{
 		startTask();
 	}
-	
-	private void startTask() {
-		if (!running) {
-			long interval = ess.getSettings().getBackupInterval()*1200; // minutes -> ticks
-			if (interval < 1200) {
+
+	private void startTask()
+	{
+		if (!running)
+		{
+			final long interval = ess.getSettings().getBackupInterval() * 1200; // minutes -> ticks
+			if (interval < 1200)
+			{
 				return;
 			}
 			taskId = ess.scheduleSyncRepeatingTask(this, interval, interval);
@@ -37,48 +48,84 @@ public class Backup implements Runnable {
 		}
 	}
 
-	public void run() {
-		if (active) return;
-		active = true;
-		final String command = ess.getSettings().getBackupCommand();
-		if (command == null || "".equals(command)) {
+	public void run()
+	{
+		if (active)
+		{
 			return;
 		}
-		logger.log(Level.INFO, Util.i18n("backupStarted"));
-		final CommandSender cs = server.getServer().console;
+		active = true;
+		final String command = ess.getSettings().getBackupCommand();
+		if (command == null || "".equals(command))
+		{
+			return;
+		}
+		LOGGER.log(Level.INFO, Util.i18n("backupStarted"));
+		final CommandSender cs = server.getConsoleSender();
 		server.dispatchCommand(cs, "save-all");
 		server.dispatchCommand(cs, "save-off");
-		
+
 		ess.scheduleAsyncDelayedTask(
-			new Runnable() {
-
-			public void run() {
-				try {
-					Process child = Runtime.getRuntime().exec(command);
-					child.waitFor();
-				} catch (InterruptedException ex) {
-					logger.log(Level.SEVERE, null, ex);
-				} catch (IOException ex) {
-					logger.log(Level.SEVERE, null, ex);
-				} finally {
-					ess.scheduleSyncDelayedTask(
-						new Runnable() {
-
-						public void run() {
-							server.dispatchCommand(cs, "save-on");
-							if (server.getOnlinePlayers().length == 0) {
-								running = false;
-								if (taskId != -1) {
-									server.getScheduler().cancelTask(taskId);
+				new Runnable()
+				{
+					public void run()
+					{
+						try
+						{
+							final ProcessBuilder childBuilder = new ProcessBuilder(command);
+							childBuilder.redirectErrorStream(true);
+							childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
+							final Process child = childBuilder.start();
+							final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
+							try
+							{
+								child.waitFor();
+								String line;
+								do
+								{
+									line = reader.readLine();
+									if (line != null)
+									{
+										LOGGER.log(Level.INFO, line);
+									}
 								}
+								while (line != null);
+							}
+							finally
+							{
+								reader.close();
 							}
-							active = false;
-							logger.log(Level.INFO, Util.i18n("backupFinished"));
 						}
-					});
-				}
-			}
-		});
+						catch (InterruptedException ex)
+						{
+							LOGGER.log(Level.SEVERE, null, ex);
+						}
+						catch (IOException ex)
+						{
+							LOGGER.log(Level.SEVERE, null, ex);
+						}
+						finally
+						{
+							ess.scheduleSyncDelayedTask(
+									new Runnable()
+									{
+										public void run()
+										{
+											server.dispatchCommand(cs, "save-on");
+											if (server.getOnlinePlayers().length == 0)
+											{
+												running = false;
+												if (taskId != -1)
+												{
+													server.getScheduler().cancelTask(taskId);
+												}
+											}
+											active = false;
+											LOGGER.log(Level.INFO, Util.i18n("backupFinished"));
+										}
+									});
+						}
+					}
+				});
 	}
-
 }

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

@@ -1,157 +0,0 @@
-package com.earth2me.essentials;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.minecraft.server.ServerConfigurationManager;
-import org.bukkit.craftbukkit.CraftServer;
-
-
-public class BanWorkaround implements IConf
-{
-	private transient final IEssentials ess;
-	private transient final ServerConfigurationManager scm;
-	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private transient final Set<String> bans = new HashSet<String>();
-	private transient final Set<String> bannedIps = new HashSet<String>();
-
-	public BanWorkaround(final IEssentials ess)
-	{
-		this.ess = ess;
-		this.scm = ((CraftServer)ess.getServer()).getHandle();
-	}
-	
-	public void banByName(final String name)
-	{
-		scm.a(name);
-		reloadConfig();
-	}
-	
-	public void unbanByName(String name)
-	{
-		scm.b(name);
-		reloadConfig();
-	}
-	
-	public void banByIp(final String ip)
-	{
-		scm.c(ip);
-		reloadConfig();
-	}
-	
-	public void unbanByIp(final String ip)
-	{
-		scm.d(ip);
-		reloadConfig();
-	}
-	
-	public boolean isNameBanned(final String name)
-	{
-		return bans.contains(name.toLowerCase());
-	}
-	
-	public boolean isIpBanned(final String ip)
-	{
-		return bannedIps.contains(ip.toLowerCase());
-	}
-	
-	public void reloadConfig()
-	{
-		//I don't like this but it needs to be done until CB fixors
-		final File file = new File(ess.getDataFolder().getParentFile().getParentFile(), "banned-players.txt");
-		try
-		{
-			if (!file.exists())
-			{
-				throw new FileNotFoundException(Util.i18n("bannedPlayersFileNotFound"));
-			}
-
-			final BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
-			try
-			{
-				bans.clear();
-				while (bufferedReader.ready())
-				{
-
-					final String line = bufferedReader.readLine().trim().toLowerCase();
-					if (line.length() > 0 && line.charAt(0) == '#')
-					{
-						continue;
-					}
-					bans.add(line);
-
-				}
-			}
-			catch (IOException io)
-			{
-				LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), io);
-			}
-			finally
-			{
-				try
-				{
-					bufferedReader.close();
-				}
-				catch (IOException ex)
-				{
-					LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), ex);
-				}
-			}
-		}
-		catch (FileNotFoundException ex)
-		{
-			LOGGER.log(Level.SEVERE, Util.i18n("bannedPlayersFileError"), ex);
-		}
-
-		final File ipFile = new File(ess.getDataFolder().getParentFile().getParentFile(), "banned-ips.txt");
-		try
-		{
-			if (!ipFile.exists())
-			{
-				throw new FileNotFoundException(Util.i18n("bannedIpsFileNotFound"));
-			}
-
-			final BufferedReader bufferedReader = new BufferedReader(new FileReader(ipFile));
-			try
-			{
-				bannedIps.clear();
-				while (bufferedReader.ready())
-				{
-
-					final String line = bufferedReader.readLine().trim().toLowerCase();
-					if (line.length() > 0 && line.charAt(0) == '#')
-					{
-						continue;
-					}
-					bannedIps.add(line);
-
-				}
-			}
-			catch (IOException io)
-			{
-				LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), io);
-			}
-			finally
-			{
-				try
-				{
-					bufferedReader.close();
-				}
-				catch (IOException ex)
-				{
-					LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), ex);
-				}
-			}
-		}
-		catch (FileNotFoundException ex)
-		{
-			LOGGER.log(Level.SEVERE, Util.i18n("bannedIpsFileError"), ex);
-		}
-	}
-}

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

@@ -1,51 +0,0 @@
-package com.earth2me.essentials;
-
-import org.bukkit.entity.Player;
-
-
-public class BukkitPermissionsHandler implements IPermissionsHandler
-{
-	public String getGroup(Player base)
-	{
-		return "default";
-	}
-
-	public boolean canBuild(Player base, String group)
-	{
-		return true;
-	}
-
-	public boolean inGroup(Player base, String group)
-	{
-		return false;
-	}
-
-	public boolean hasPermission(Player base, String node)
-	{
-		if (base.hasPermission("-" + node))
-		{
-			return false;
-		}
-		final String[] parts = node.split("\\.");
-		final StringBuilder sb = new StringBuilder();
-		for (String part : parts)
-		{
-			if (base.hasPermission(sb.toString() + "*"))
-			{
-				return true;
-			}
-			sb.append(part).append(".");
-		}
-		return base.hasPermission(node);
-	}
-
-	public String getPrefix(Player base)
-	{
-		return "";
-	}
-
-	public String getSuffix(Player base)
-	{
-		return "";
-	}
-}

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

@@ -2,33 +2,35 @@ package com.earth2me.essentials;
 
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.CraftServer;
 
-public final class Console implements IReplyTo {
+
+public final class Console implements IReplyTo
+{
 	private static Console instance = new Console();
 	private CommandSender replyTo;
 	public final static String NAME = "Console";
-	
-	private Console() {
-		
-	}
-	
-	public static CommandSender getCommandSender(Server server) throws Exception {
-		if (! (server instanceof CraftServer)) {
-			throw new Exception(Util.i18n("invalidServer"));
-		}
-		return ((CraftServer)server).getServer().console;
+
+	private Console()
+	{
 	}
 
-	public void setReplyTo(CommandSender user) {
+	public static CommandSender getCommandSender(Server server) throws Exception
+	{
+		return server.getConsoleSender();
+	}
+
+	public void setReplyTo(CommandSender user)
+	{
 		replyTo = user;
 	}
 
-	public CommandSender getReplyTo() {
+	public CommandSender getReplyTo()
+	{
 		return replyTo;
 	}
-	
-	public static Console getConsoleReplyTo() {
+
+	public static Console getConsoleReplyTo()
+	{
 		return instance;
 	}
 }

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

@@ -155,10 +155,6 @@ public final class DescParseTickFormat
 
 		int hours = 0;
 		int minutes = 0;
-		if (desc.endsWith("pm"))
-		{
-			hours += 12;
-		}
 
 		desc = desc.toLowerCase().replaceAll("[^0-9]", "");
 
@@ -189,6 +185,16 @@ public final class DescParseTickFormat
 		{
 			throw new NumberFormatException();
 		}
+		
+		if (desc.endsWith("pm") && hours != 12)
+		{
+			hours += 12;
+		}
+		
+		if (desc.endsWith("am") && hours == 12)
+		{
+			hours -= 12;
+		}
 
 		return hoursMinutesToTicks(hours, minutes);
 	}

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

@@ -26,7 +26,9 @@ import org.bukkit.*;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import com.earth2me.essentials.commands.IEssentialsCommand;
+import com.earth2me.essentials.commands.NoChargeException;
 import com.earth2me.essentials.commands.NotEnoughArgumentsException;
+import com.earth2me.essentials.perm.PermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
 import com.earth2me.essentials.signs.SignBlockListener;
 import com.earth2me.essentials.signs.SignEntityListener;
@@ -38,7 +40,6 @@ import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event.Priority;
 import org.bukkit.event.Event.Type;
-import org.bukkit.event.server.ServerListener;
 import org.bukkit.plugin.*;
 import org.bukkit.plugin.java.*;
 import org.bukkit.scheduler.BukkitScheduler;
@@ -56,13 +57,12 @@ public class Essentials extends JavaPlugin implements IEssentials
 	private transient Worth worth;
 	private transient List<IConf> confList;
 	private transient Backup backup;
-	private transient BanWorkaround bans;
 	private transient ItemDb itemDb;
 	private transient EssentialsUpdateTimer updateTimer;
 	private transient final Methods paymentMethod = new Methods();
 	private transient final static boolean enableErrorLogging = false;
 	private transient final EssentialsErrorHandler errorHandler = new EssentialsErrorHandler();
-	private transient IPermissionsHandler permissionsHandler;
+	private transient PermissionsHandler permissionsHandler;
 	private transient UserMap userMap;
 
 	@Override
@@ -87,7 +87,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		this.initialize(null, server, new PluginDescriptionFile(new FileReader(new File("src" + File.separator + "plugin.yml"))), dataFolder, null, null);
 		settings = new Settings(this);
 		userMap = new UserMap(this);
-		permissionsHandler = new ConfigPermissionsHandler(this);
+		permissionsHandler = new PermissionsHandler(this, false);
 		Economy.setEss(this);
 	}
 
@@ -118,8 +118,6 @@ public class Essentials extends JavaPlugin implements IEssentials
 		confList.add(warps);
 		worth = new Worth(this.getDataFolder());
 		confList.add(worth);
-		bans = new BanWorkaround(this);
-		confList.add(bans);
 		itemDb = new ItemDb(this);
 		confList.add(itemDb);
 		reload();
@@ -148,9 +146,11 @@ public class Essentials extends JavaPlugin implements IEssentials
 			LOGGER.log(Level.INFO, Util.i18n("bukkitFormatChanged"));
 		}
 
-		final ServerListener serverListener = new EssentialsPluginListener(this);
+		permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
+		final EssentialsPluginListener serverListener = new EssentialsPluginListener(this);
 		pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Low, this);
 		pm.registerEvent(Type.PLUGIN_DISABLE, serverListener, Priority.Low, this);
+		confList.add(serverListener);
 
 		final EssentialsPlayerListener playerListener = new EssentialsPlayerListener(this);
 		pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
@@ -182,11 +182,13 @@ public class Essentials extends JavaPlugin implements IEssentials
 
 		final SignEntityListener signEntityListener = new SignEntityListener(this);
 		pm.registerEvent(Type.ENTITY_EXPLODE, signEntityListener, Priority.Low, this);
+		pm.registerEvent(Type.ENDERMAN_PICKUP, signEntityListener, Priority.Low, this);
 
 		final EssentialsEntityListener entityListener = new EssentialsEntityListener(this);
 		pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this);
 		pm.registerEvent(Type.ENTITY_COMBUST, entityListener, Priority.Lowest, this);
 		pm.registerEvent(Type.ENTITY_DEATH, entityListener, Priority.Lowest, this);
+		pm.registerEvent(Type.FOOD_LEVEL_CHANGE, entityListener, Priority.Lowest, this);
 
 		jail = new Jail(this);
 		final JailPlayerListener jailPlayerListener = new JailPlayerListener(this);
@@ -199,20 +201,15 @@ public class Essentials extends JavaPlugin implements IEssentials
 		pm.registerEvent(Type.PLAYER_TELEPORT, jailPlayerListener, Priority.High, this);
 		pm.registerEvent(Type.PLAYER_JOIN, jailPlayerListener, Priority.High, this);
 
-		if (settings.isNetherEnabled() && getServer().getWorlds().size() < 2)
-		{
-			getServer().createWorld(settings.getNetherName(), World.Environment.NETHER);
-		}
-
 		pm.registerEvent(Type.ENTITY_EXPLODE, tntListener, Priority.High, this);
 
 		final EssentialsTimer timer = new EssentialsTimer(this);
-		getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 50);
+		getScheduler().scheduleSyncRepeatingTask(this, timer, 1, 100);
 		Economy.setEss(this);
-		if (enableErrorLogging)
+		if (getSettings().isUpdateEnabled())
 		{
 			updateTimer = new EssentialsUpdateTimer(this);
-			getScheduler().scheduleAsyncRepeatingTask(this, updateTimer, 50, 50 * 60 * (this.getDescription().getVersion().startsWith("Dev") ? 60 : 360));
+			getScheduler().scheduleAsyncRepeatingTask(this, updateTimer, 20 * 60 * 10, 20 * 3600 * 6);
 		}
 		LOGGER.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), Util.joinList(this.getDescription().getAuthors())));
 	}
@@ -448,6 +445,10 @@ public class Essentials extends JavaPlugin implements IEssentials
 				}
 				return true;
 			}
+			catch (NoChargeException ex)
+			{
+				return true;
+			}
 			catch (NotEnoughArgumentsException ex)
 			{
 				sender.sendMessage(command.getDescription());
@@ -561,7 +562,7 @@ public class Essentials extends JavaPlugin implements IEssentials
 		}
 		catch (NullPointerException ex)
 		{
-			return null;
+			return new User(base, this);
 		}
 	}
 
@@ -605,14 +606,20 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}
 
 	@Override
-	public int broadcastMessage(final String name, final String message)
+	public int broadcastMessage(final IUser sender, final String message)
 	{
+		if (sender == null) {
+			return getServer().broadcastMessage(message);
+		}
+		if (sender.isHidden()) {
+			return 0;
+		}
 		final Player[] players = getServer().getOnlinePlayers();
 
 		for (Player player : players)
 		{
 			final User user = getUser(player);
-			if (!user.isIgnoredPlayer(name))
+			if (!user.isIgnoredPlayer(sender.getName()))
 			{
 				player.sendMessage(message);
 			}
@@ -657,23 +664,11 @@ public class Essentials extends JavaPlugin implements IEssentials
 	}
 
 	@Override
-	public IPermissionsHandler getPermissionsHandler()
+	public PermissionsHandler getPermissionsHandler()
 	{
 		return permissionsHandler;
 	}
 
-	@Override
-	public void setPermissionsHandler(final IPermissionsHandler handler)
-	{
-		this.permissionsHandler = handler;
-	}
-
-	@Override
-	public BanWorkaround getBans()
-	{
-		return bans;
-	}
-
 	@Override
 	public ItemDb getItemDb()
 	{

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

@@ -1,6 +1,7 @@
 package com.earth2me.essentials;
 
 import java.util.logging.Logger;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.event.block.BlockListener;
 import org.bukkit.event.block.BlockPlaceEvent;
@@ -93,7 +94,7 @@ public class EssentialsBlockListener extends BlockListener
 			return;
 		}
 		boolean unlimitedForUser = user.hasUnlimited(is);
-		if (unlimitedForUser)
+		if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
 		{
 			ess.scheduleSyncDelayedTask(
 					new Runnable()

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

@@ -1,6 +1,8 @@
 package com.earth2me.essentials;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,12 +21,12 @@ import org.bukkit.util.config.Configuration;
 
 public class EssentialsConf extends Configuration
 {
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	private File configFile;
-	private String templateName = null;
-	private Class<?> resourceClass = EssentialsConf.class;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private transient File configFile;
+	private transient String templateName = null;
+	private transient Class<?> resourceClass = EssentialsConf.class;
 
-	public EssentialsConf(File configFile)
+	public EssentialsConf(final File configFile)
 	{
 		super(configFile);
 		this.configFile = configFile;
@@ -42,33 +44,79 @@ public class EssentialsConf extends Configuration
 		{
 			if (!configFile.getParentFile().mkdirs())
 			{
-				logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
+				LOGGER.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
 			}
 		}
+		// This will delete files where the first character is 0. In most cases they are broken.
+		if (configFile.exists() && configFile.length() != 0)
+		{
+			try
+			{
+				final InputStream input = new FileInputStream(configFile);
+				try
+				{
+					if (input.read() == 0)
+					{
+						input.close();
+						configFile.delete();
+					}
+				}
+				catch (IOException ex)
+				{
+					LOGGER.log(Level.SEVERE, null, ex);
+				}
+				finally
+				{
+					try
+					{
+						input.close();
+					}
+					catch (IOException ex)
+					{
+						LOGGER.log(Level.SEVERE, null, ex);
+					}
+				}
+			}
+			catch (FileNotFoundException ex)
+			{
+				LOGGER.log(Level.SEVERE, null, ex);
+			}
+		}
+
 		if (!configFile.exists())
 		{
 			if (templateName != null)
 			{
-				logger.log(Level.INFO, Util.format("creatingConfigFromTemplate", configFile.toString()));
+				LOGGER.log(Level.INFO, Util.format("creatingConfigFromTemplate", configFile.toString()));
 				createFromTemplate();
 			}
 			else
 			{
 				try
 				{
-					logger.log(Level.INFO, Util.format("creatingEmptyConfig", configFile.toString()));
+					LOGGER.log(Level.INFO, Util.format("creatingEmptyConfig", configFile.toString()));
 					if (!configFile.createNewFile())
 					{
-						logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
+						LOGGER.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()));
 					}
 				}
 				catch (IOException ex)
 				{
-					logger.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()), ex);
+					LOGGER.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString()), ex);
 				}
 			}
 		}
-		super.load();
+
+		try
+		{
+			super.load();
+		}
+		catch (RuntimeException e)
+		{
+			LOGGER.log(Level.INFO, "File: " + configFile.toString());
+			throw e;
+		}
+
 		if (this.root == null)
 		{
 			this.root = new HashMap<String, Object>();
@@ -84,7 +132,7 @@ public class EssentialsConf extends Configuration
 			istr = resourceClass.getResourceAsStream(templateName);
 			if (istr == null)
 			{
-				logger.log(Level.SEVERE, Util.format("couldNotFindTemplate", templateName));
+				LOGGER.log(Level.SEVERE, Util.format("couldNotFindTemplate", templateName));
 				return;
 			}
 			ostr = new FileOutputStream(configFile);
@@ -99,7 +147,7 @@ public class EssentialsConf extends Configuration
 		}
 		catch (IOException ex)
 		{
-			logger.log(Level.SEVERE, Util.format("failedToWriteConfig", configFile.toString()), ex);
+			LOGGER.log(Level.SEVERE, Util.format("failedToWriteConfig", configFile.toString()), ex);
 			return;
 		}
 		finally
@@ -124,12 +172,12 @@ public class EssentialsConf extends Configuration
 			}
 			catch (IOException ex)
 			{
-				logger.log(Level.SEVERE, Util.format("failedToCloseConfig", configFile.toString()), ex);
+				LOGGER.log(Level.SEVERE, Util.format("failedToCloseConfig", configFile.toString()), ex);
 			}
 		}
 	}
 
-	public void setTemplateName(String templateName)
+	public void setTemplateName(final String templateName)
 	{
 		this.templateName = templateName;
 	}
@@ -139,48 +187,48 @@ public class EssentialsConf extends Configuration
 		return configFile;
 	}
 
-	public void setTemplateName(String templateName, Class<?> resClass)
+	public void setTemplateName(final String templateName, final Class<?> resClass)
 	{
 		this.templateName = templateName;
 		this.resourceClass = resClass;
 	}
 
-	public boolean hasProperty(String path)
+	public boolean hasProperty(final String path)
 	{
 		return getProperty(path) != null;
 	}
 
-	public Location getLocation(String path, Server server)
+	public Location getLocation(final String path, final Server server) throws Exception
 	{
-		String worldName = getString((path != null ? path + "." : "") + "world");
+		final String worldName = getString((path == null ? "" : path + ".") + "world");
 		if (worldName == null || worldName.isEmpty())
 		{
 			return null;
 		}
-		World world = server.getWorld(worldName);
+		final World world = server.getWorld(worldName);
 		if (world == null)
 		{
-			return null;
+			throw new Exception(Util.i18n("invalidWorld"));
 		}
 		return new Location(world,
-							getDouble((path != null ? path + "." : "") + "x", 0),
-							getDouble((path != null ? path + "." : "") + "y", 0),
-							getDouble((path != null ? path + "." : "") + "z", 0),
-							(float)getDouble((path != null ? path + "." : "") + "yaw", 0),
-							(float)getDouble((path != null ? path + "." : "") + "pitch", 0));
+							getDouble((path == null ? "" : path + ".") + "x", 0),
+							getDouble((path == null ? "" : path + ".") + "y", 0),
+							getDouble((path == null ? "" : path + ".") + "z", 0),
+							(float)getDouble((path == null ? "" : path + ".") + "yaw", 0),
+							(float)getDouble((path == null ? "" : path + ".") + "pitch", 0));
 	}
 
-	public void setProperty(String path, Location loc)
+	public void setProperty(final String path, final Location loc)
 	{
-		setProperty((path != null ? path + "." : "") + "world", loc.getWorld().getName());
-		setProperty((path != null ? path + "." : "") + "x", loc.getX());
-		setProperty((path != null ? path + "." : "") + "y", loc.getY());
-		setProperty((path != null ? path + "." : "") + "z", loc.getZ());
-		setProperty((path != null ? path + "." : "") + "yaw", loc.getYaw());
-		setProperty((path != null ? path + "." : "") + "pitch", loc.getPitch());
+		setProperty((path == null ? "" : path + ".") + "world", loc.getWorld().getName());
+		setProperty((path == null ? "" : path + ".") + "x", loc.getX());
+		setProperty((path == null ? "" : path + ".") + "y", loc.getY());
+		setProperty((path == null ? "" : path + ".") + "z", loc.getZ());
+		setProperty((path == null ? "" : path + ".") + "yaw", loc.getYaw());
+		setProperty((path == null ? "" : path + ".") + "pitch", loc.getPitch());
 	}
 
-	public ItemStack getItemStack(String path)
+	public ItemStack getItemStack(final String path)
 	{
 		return new ItemStack(
 				Material.valueOf(getString(path + ".type", "AIR")),
@@ -189,9 +237,9 @@ public class EssentialsConf extends Configuration
 				(byte)getInt(path + ".data", 0)*/);
 	}
 
-	public void setProperty(String path, ItemStack stack)
+	public void setProperty(final String path, final ItemStack stack)
 	{
-		Map<String, Object> map = new HashMap<String, Object>();
+		final Map<String, Object> map = new HashMap<String, Object>();
 		map.put("type", stack.getType().toString());
 		map.put("amount", stack.getAmount());
 		map.put("damage", stack.getDurability());
@@ -200,40 +248,30 @@ public class EssentialsConf extends Configuration
 		setProperty(path, map);
 	}
 
-	public long getLong(String path, long def)
+	public long getLong(final String path, final long def)
 	{
-		Number num;
 		try
 		{
-			num = (Number)getProperty(path);
+			final Number num = (Number)getProperty(path);
+			return num == null ? def : num.longValue();
 		}
-		catch(ClassCastException ex)
+		catch (ClassCastException ex)
 		{
 			return def;
 		}
-		if (num == null)
-		{
-			return def;
-		}
-		return num.longValue();
 	}
 
 	@Override
-	public double getDouble(String path, double def)
+	public double getDouble(final String path, final double def)
 	{
-		Number num;
 		try
 		{
-			num = (Number)getProperty(path);
+			Number num = (Number)getProperty(path);
+			return num == null ? def : num.doubleValue();
 		}
-		catch(ClassCastException ex)
+		catch (ClassCastException ex)
 		{
 			return def;
 		}
-		if (num == null)
-		{
-			return def;
-		}
-		return num.doubleValue();
 	}
 }

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

@@ -1,15 +1,15 @@
 package com.earth2me.essentials;
 
-import org.bukkit.craftbukkit.entity.CraftPlayer;
+import java.util.List;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityCombustEvent;
-import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageByProjectileEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityListener;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.inventory.ItemStack;
 
 
@@ -35,25 +35,28 @@ public class EssentialsEntityListener extends EntityListener
 				User defender = ess.getUser(eDefend);
 				User attacker = ess.getUser(eAttack);
 				ItemStack is = attacker.getItemInHand();
-				String command = attacker.getPowertool(is);
-				if (command != null && !command.isEmpty())
+				List<String> commandList = attacker.getPowertool(is);
+				if (commandList != null && !commandList.isEmpty())
 				{
-					attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
-					event.setCancelled(true);
-					return;
+					for (String command : commandList)
+					{
+
+						if (command != null && !command.isEmpty())
+						{
+							attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
+							event.setCancelled(true);
+							return;
+						}
+					}
 				}
 			}
 		}
-		if (event instanceof EntityDamageEvent || event instanceof EntityDamageByBlockEvent || event instanceof EntityDamageByProjectileEvent)
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
 		{
-
-			if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
-			{
-				CraftPlayer player = (CraftPlayer)event.getEntity();
-				player.getHandle().fireTicks = 0;
-				player.setRemainingAir(player.getMaximumAir());
-				event.setCancelled(true);
-			}
+			final Player player = (Player)event.getEntity();
+			player.setFireTicks(0);
+			player.setRemainingAir(player.getMaximumAir());
+			event.setCancelled(true);
 		}
 	}
 
@@ -67,16 +70,32 @@ public class EssentialsEntityListener extends EntityListener
 	}
 
 	@Override
-	public void onEntityDeath(EntityDeathEvent event)
+	public void onEntityDeath(final EntityDeathEvent event)
 	{
-		if (event.getEntity() instanceof Player)
+		if (event instanceof PlayerDeathEvent)
 		{
-			User user = ess.getUser(event.getEntity());
+			final PlayerDeathEvent pdevent = (PlayerDeathEvent)event;
+			final User user = ess.getUser(pdevent.getEntity());
 			if (user.isAuthorized("essentials.back.ondeath") && !ess.getSettings().isCommandDisabled("back"))
 			{
 				user.setLastLocation();
 				user.sendMessage(Util.i18n("backAfterDeath"));
 			}
+			if (!ess.getSettings().areDeathMessagesEnabled())
+			{
+				pdevent.setDeathMessage("");
+			}
+		}
+	}
+
+	@Override
+	public void onFoodLevelChange(FoodLevelChangeEvent event)
+	{
+		if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
+		{
+			//TODO: Remove the following line, when we're happy to remove backwards compatability with 1185.
+			event.setFoodLevel(20);
+			event.setCancelled(true);
 		}
 	}
 }

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

@@ -14,6 +14,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerAnimationEvent;
 import org.bukkit.event.player.PlayerAnimationType;
+import org.bukkit.event.player.PlayerBedEnterEvent;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
@@ -46,11 +47,11 @@ public class EssentialsPlayerListener extends PlayerListener
 	public void onPlayerRespawn(final PlayerRespawnEvent event)
 	{
 		final User user = ess.getUser(event.getPlayer());
-		user.setDisplayName(user.getNick());
+		user.setDisplayNick(user.getNick());
 		updateCompass(user);
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayName(user.getNick());
+			user.setDisplayNick(user.getNick());
 		}
 	}
 
@@ -73,14 +74,10 @@ public class EssentialsPlayerListener extends PlayerListener
 				it.remove();
 			}
 		}
-		if (user.isAfk())
-		{
-			user.setAfk(false);
-			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
-		}
+		user.updateActivity(true);
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayName(user.getNick());
+			user.setDisplayNick(user.getNick());
 		}
 	}
 
@@ -93,114 +90,29 @@ public class EssentialsPlayerListener extends PlayerListener
 		}
 		final User user = ess.getUser(event.getPlayer());
 
-		if (user.isAfk())
+		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
 		{
-			user.setAfk(false);
-			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
-		}
-
-		if (!ess.getSettings().getNetherPortalsEnabled())
-		{
-			return;
-		}
-
-		final Block block = event.getPlayer().getWorld().getBlockAt(event.getTo().getBlockX(), event.getTo().getBlockY(), event.getTo().getBlockZ());
-		final List<World> worlds = server.getWorlds();
-
-		if (block.getType() == Material.PORTAL && worlds.size() > 1 && user.isAuthorized("essentials.portal"))
-		{
-			if (user.getJustPortaled())
-			{
-				return;
-			}
-
-			World nether = server.getWorld(ess.getSettings().getNetherName());
-			if (nether == null)
-			{
-				for (World world : worlds)
-				{
-					if (world.getEnvironment() == World.Environment.NETHER)
-					{
-						nether = world;
-						break;
-					}
-				}
-				if (nether == null)
-				{
-					return;
-				}
-			}
-			final World world = user.getWorld() == nether ? worlds.get(0) : nether;
-
-			double factor;
-			if (user.getWorld().getEnvironment() == World.Environment.NETHER && world.getEnvironment() == World.Environment.NORMAL)
-			{
-				factor = ess.getSettings().getNetherRatio();
-			}
-			else if (user.getWorld().getEnvironment() == World.Environment.NORMAL && world.getEnvironment() == World.Environment.NETHER)
-			{
-				factor = 1.0 / ess.getSettings().getNetherRatio();
-			}
-			else
-			{
-				factor = 1.0;
-			}
-
-			Location loc = event.getTo();
-			int x = loc.getBlockX();
-			int y = loc.getBlockY();
-			int z = loc.getBlockZ();
-
-			if (user.getWorld().getBlockAt(x, y, z - 1).getType() == Material.PORTAL)
-			{
-				z--;
-			}
-			if (user.getWorld().getBlockAt(x - 1, y, z).getType() == Material.PORTAL)
-			{
-				x--;
-			}
-
-			x = (int)(x * factor);
-			z = (int)(z * factor);
-			loc = new Location(world, x + .5, y, z + .5);
-
-			Block dest = world.getBlockAt(x, y, z);
-			NetherPortal portal = NetherPortal.findPortal(dest);
-			if (portal == null)
-			{
-				if (world.getEnvironment() == World.Environment.NETHER || ess.getSettings().getGenerateExitPortals())
-				{
-					portal = NetherPortal.createPortal(dest);
-					LOGGER.info(Util.format("userCreatedPortal", event.getPlayer().getName()));
-					user.sendMessage(Util.i18n("generatingPortal"));
-					loc = portal.getSpawn();
-				}
-			}
-			else
-			{
-				LOGGER.info(Util.format("userUsedPortal", event.getPlayer().getName()));
-				user.sendMessage(Util.i18n("usingPortal"));
-				loc = portal.getSpawn();
-			}
-
-			event.setFrom(loc);
-			event.setTo(loc);
+			final Location from = event.getFrom();
+			final Location to = event.getTo().clone();
+			to.setX(from.getX());
+			to.setY(from.getY());
+			to.setZ(from.getZ());
 			try
 			{
-				user.getTeleport().now(loc, new Trade("portal", ess));
+				event.setTo(Util.getSafeDestination(to));
 			}
 			catch (Exception ex)
 			{
-				user.sendMessage(ex.getMessage());
+				event.setTo(to);
 			}
-			user.setJustPortaled(true);
-			user.sendMessage(Util.i18n("teleportingPortal"));
-
-			event.setCancelled(true);
 			return;
 		}
 
-		user.setJustPortaled(false);
+		final Location afk = user.getAfkPosition();
+		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
+		{
+			user.updateActivity(true);
+		}
 	}
 
 	@Override
@@ -216,6 +128,7 @@ public class EssentialsPlayerListener extends PlayerListener
 			user.getInventory().setContents(user.getSavedInventory());
 			user.setSavedInventory(null);
 		}
+		user.updateActivity(false);
 		user.dispose();
 		if (!ess.getSettings().getReclaimSetting())
 		{
@@ -252,19 +165,11 @@ public class EssentialsPlayerListener extends PlayerListener
 		ess.getBackup().onPlayerJoin();
 		final User user = ess.getUser(event.getPlayer());
 
-		//we do not know the ip address on playerlogin so we need to do this here.
-		if (user.isIpBanned())
-		{
-			final String banReason = user.getBanReason();
-			user.kickPlayer(banReason != null && !banReason.isEmpty() ? banReason : Util.i18n("defaultBanReason"));
-			return;
-		}
-
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayName(user.getNick());
+			user.setDisplayNick(user.getNick());
 		}
-		user.setAfk(false);
+		user.updateActivity(false);
 		if (user.isAuthorized("essentials.sleepingignored"))
 		{
 			user.setSleepingIgnored(true);
@@ -299,25 +204,23 @@ public class EssentialsPlayerListener extends PlayerListener
 	@Override
 	public void onPlayerLogin(final PlayerLoginEvent event)
 	{
-		if (event.getResult() != Result.ALLOWED && event.getResult() != Result.KICK_FULL)
+		if (event.getResult() != Result.ALLOWED && event.getResult() != Result.KICK_FULL && event.getResult() != Result.KICK_BANNED)
 		{
+			LOGGER.log(Level.INFO, "Disconnecting user " + event.getPlayer().toString() + " due to " + event.getResult().toString());
 			return;
 		}
 		User user = ess.getUser(event.getPlayer());
-		if (user == null) {
-			user = new User(event.getPlayer(), ess);
-		}
 		user.setNPC(false);
 
 		final long currentTime = System.currentTimeMillis();
-		user.checkBanTimeout(currentTime);
+		boolean banExpired = user.checkBanTimeout(currentTime);
 		user.checkMuteTimeout(currentTime);
 		user.checkJailTimeout(currentTime);
 
-		if (user.isBanned())
+		if (banExpired == false && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
 		{
 			final String banReason = user.getBanReason();
-			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() ? banReason : Util.i18n("defaultBanReason"));
+			event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : Util.i18n("defaultBanReason"));
 			return;
 		}
 
@@ -326,6 +229,7 @@ public class EssentialsPlayerListener extends PlayerListener
 			event.disallow(Result.KICK_FULL, Util.i18n("serverFull"));
 			return;
 		}
+		event.allow();
 
 		user.setLastLogin(System.currentTimeMillis());
 		updateCompass(user);
@@ -352,7 +256,7 @@ public class EssentialsPlayerListener extends PlayerListener
 		final User user = ess.getUser(event.getPlayer());
 		if (ess.getSettings().changeDisplayName())
 		{
-			user.setDisplayName(user.getNick());
+			user.setDisplayNick(user.getNick());
 		}
 		updateCompass(user);
 	}
@@ -426,30 +330,35 @@ public class EssentialsPlayerListener extends PlayerListener
 		}
 		final User user = ess.getUser(event.getPlayer());
 		final ItemStack is = user.getItemInHand();
-		if (is == null || is.getType() == Material.AIR)
+		if (is == null || is.getType() == Material.AIR || !user.arePowerToolsEnabled())
 		{
 			return;
 		}
-		final String command = user.getPowertool(is);
-		if (command == null || command.isEmpty())
+		final List<String> commandList = user.getPowertool(is);
+		if (commandList == null || commandList.isEmpty())
 		{
 			return;
 		}
-		if (command.matches(".*\\{player\\}.*"))
+
+		// We need to loop through each command and execute
+		for (String command : commandList)
 		{
-			//user.sendMessage("Click a player to use this command");
-			return;
-		}
-		if (command.startsWith("c:"))
-		{
-			for (Player p : server.getOnlinePlayers())
+			if (command.matches(".*\\{player\\}.*"))
 			{
-				p.sendMessage(user.getDisplayName() + ":" + command.substring(2));
+				//user.sendMessage("Click a player to use this command");
+				continue;
+			}
+			else if (command.startsWith("c:"))
+			{
+				for (Player p : server.getOnlinePlayers())
+				{
+					p.sendMessage(user.getDisplayName() + ":" + command.substring(2));
+				}
+			}
+			else
+			{
+				user.getServer().dispatchCommand(event.getPlayer(), command);
 			}
-		}
-		else
-		{
-			user.getServer().dispatchCommand(user, command);
 		}
 	}
 
@@ -467,16 +376,16 @@ public class EssentialsPlayerListener extends PlayerListener
 		{
 			for (Player player : ess.getServer().getOnlinePlayers())
 			{
-				if (ess.getUser(player).isSocialSpyEnabled())
+				User spyer = ess.getUser(player);
+				if (spyer.isSocialSpyEnabled() && !user.equals(spyer))
 				{
 					player.sendMessage(user.getDisplayName() + " : " + event.getMessage());
 				}
 			}
 		}
-		if (user.isAfk())
+		if (!cmd.equalsIgnoreCase("afk"))
 		{
-			user.setAfk(false);
-			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
+			user.updateActivity(true);
 		}
 	}
 }

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

@@ -1,16 +1,13 @@
 package com.earth2me.essentials;
 
-import com.earth2me.essentials.register.payment.Methods;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.event.server.ServerListener;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
 
 
-public class EssentialsPluginListener extends ServerListener
+public class EssentialsPluginListener extends ServerListener implements IConf
 {
 	private final transient IEssentials ess;
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
@@ -23,59 +20,29 @@ public class EssentialsPluginListener extends ServerListener
 	@Override
 	public void onPluginEnable(final PluginEnableEvent event)
 	{
-		checkPermissions();
-		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(event.getPlugin()))
+		ess.getPermissionsHandler().checkPermissions();
+		if (!ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().setMethod(ess.getServer().getPluginManager()))
 		{
 			LOGGER.log(Level.INFO, "[Essentials] Payment method found (" + ess.getPaymentMethod().getMethod().getName() + " version: " + ess.getPaymentMethod().getMethod().getVersion() + ")");
-
 		}
 	}
 
 	@Override
-	public void onPluginDisable(PluginDisableEvent event)
+	public void onPluginDisable(final PluginDisableEvent event)
 	{
-		checkPermissions();
+		ess.getPermissionsHandler().checkPermissions();
 		// Check to see if the plugin thats being disabled is the one we are using
 		if (ess.getPaymentMethod() != null && ess.getPaymentMethod().hasMethod() && ess.getPaymentMethod().checkDisabled(event.getPlugin()))
 		{
+			ess.getPaymentMethod().reset();
 			LOGGER.log(Level.INFO, "[Essentials] Payment method was disabled. No longer accepting payments.");
 		}
 	}
-	
-	private void checkPermissions()
-	{
-		final PluginManager pm = ess.getServer().getPluginManager();
-		final Plugin permissionsExPlugin = pm.getPlugin("PermissionsEx");
 
-		if (permissionsExPlugin == null || !permissionsExPlugin.isEnabled())
-		{
-			final Plugin permissionsPlugin = pm.getPlugin("Permissions");
-			if (permissionsPlugin == null || !permissionsPlugin.isEnabled())
-			{
-				if (ess.getSettings().useBukkitPermissions())
-				{
-					ess.setPermissionsHandler(new BukkitPermissionsHandler());
-				}
-				else
-				{
-					ess.setPermissionsHandler(new ConfigPermissionsHandler(ess));
-				}
-			}
-			else
-			{
-				if (permissionsPlugin.getDescription().getVersion().charAt(0) == '3')
-				{
-					ess.setPermissionsHandler(new Permissions3Handler(permissionsPlugin));
-				}
-				else
-				{
-					ess.setPermissionsHandler(new Permissions2Handler(permissionsPlugin));
-				}
-			}
-		}
-		else
-		{
-			ess.setPermissionsHandler(new PermissionsExHandler());
-		}
+	@Override
+	public void reloadConfig()
+	{
+		ess.getPermissionsHandler().setUseSuperperms(ess.getSettings().useBukkitPermissions());
+		ess.getPermissionsHandler().checkPermissions();
 	}
 }

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

@@ -24,16 +24,17 @@ public class EssentialsTimer implements Runnable
 		{
 			final User user = ess.getUser(player);
 			onlineUsers.add(user);
-			user.setLastActivity(currentTime);
+			user.setLastOnlineActivity(currentTime);
+			user.checkActivity();
 		}
 
 		final Iterator<User> iterator = onlineUsers.iterator();
 		while (iterator.hasNext())
 		{
 			final User user = iterator.next();
-			if (user.getLastActivity() < currentTime && user.getLastActivity() > user.getLastLogout())
+			if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
 			{
-				user.setLastLogout(user.getLastActivity());
+				user.setLastLogout(user.getLastOnlineActivity());
 				iterator.remove();
 				continue;
 			}

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

@@ -4,65 +4,81 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.bukkit.entity.Player;
 
 
 class EssentialsUpdateTimer implements Runnable
 {
-	private URL url;
-	private final Essentials ess;
-	private static final Logger logger = Logger.getLogger("Minecraft");
-	
-	public EssentialsUpdateTimer(Essentials ess)
+	private transient URL url;
+	private final transient IEssentials ess;
+	private static final Logger LOGGER = Logger.getLogger("Minecraft");
+	private final transient Pattern pattern = Pattern.compile("git-Bukkit-([0-9]+).([0-9]+).([0-9]+)-[0-9]+-[0-9a-z]+-b([0-9]+)jnks.*");
+
+	public EssentialsUpdateTimer(final IEssentials ess)
 	{
 		this.ess = ess;
 		try
 		{
-			url = new URL("http://127.0.0.1:8080/check");
+			url = new URL("http://essentialsupdate.appspot.com/check");
 		}
 		catch (MalformedURLException ex)
 		{
-			logger.log(Level.SEVERE, "Invalid url!", ex);
+			LOGGER.log(Level.SEVERE, "Invalid url!", ex);
 		}
 	}
 
+	@Override
 	public void run()
 	{
 		try
 		{
-			StringBuilder sb = new StringBuilder();
-			sb.append("v=").append(URLEncoder.encode(ess.getDescription().getVersion(),"UTF-8"));
-			sb.append("&b=").append(URLEncoder.encode(ess.getServer().getVersion(),"UTF-8"));
-			sb.append("&jv=").append(URLEncoder.encode(System.getProperty("java.version"),"UTF-8"));
-			sb.append("&l=").append(URLEncoder.encode(Util.getCurrentLocale().toString(),"UTF-8"));
-			sb.append("&on=").append(URLEncoder.encode(System.getProperty("os.name"),"UTF-8"));
-			sb.append("&ov=").append(URLEncoder.encode(System.getProperty("os.version"),"UTF-8"));
-			for (BigInteger bigInteger : ess.getErrors().keySet())
+			final StringBuilder builder = new StringBuilder();
+			String bukkitVersion = ess.getServer().getVersion();
+			final Matcher versionMatch = pattern.matcher(bukkitVersion);
+			if (versionMatch.matches())
 			{
-				sb.append("&e[]=").append(bigInteger.toString(36));
+				bukkitVersion = versionMatch.group(4);
 			}
-			URLConnection conn = url.openConnection();
+			builder.append("v=").append(URLEncoder.encode(ess.getDescription().getVersion(), "UTF-8"));
+			builder.append("&b=").append(URLEncoder.encode(bukkitVersion, "UTF-8"));
+			final URLConnection conn = url.openConnection();
 			conn.setConnectTimeout(10000);
 			conn.setDoOutput(true);
 			conn.connect();
-			OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-			wr.write(sb.toString());
-			wr.flush();
-			BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-			String ret = br.readLine();
-			wr.close();
-			br.close();
-			logger.log(Level.INFO, ret);
+			final OutputStreamWriter writer = new OutputStreamWriter(conn.getOutputStream());
+			writer.write(builder.toString());
+			writer.flush();
+			final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+			final String ret = reader.readLine();
+			writer.close();
+			reader.close();
+			if (!ret.isEmpty() && !ret.equalsIgnoreCase("OK"))
+			{
+				LOGGER.log(Level.INFO, "Essentials Update-Check: " + ret);
+				if (ret.startsWith("New Version"))
+				{
+					for (Player player : ess.getServer().getOnlinePlayers())
+					{
+						final User user = ess.getUser(player);
+						if (user.isAuthorized("essentials.admin.notices.update"))
+						{
+							user.sendMessage(ret);
+						}
+					}
+				}
+			}
 		}
 		catch (IOException ex)
 		{
-			logger.log(Level.SEVERE, "Failed to open connection", ex);
+			LOGGER.log(Level.SEVERE, "Failed to open connection", ex);
 		}
-	}	
+	}
 }

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

@@ -1,13 +1,24 @@
 package com.earth2me.essentials;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -197,6 +208,133 @@ public class EssentialsUpgrade
 		doneFile.save();
 	}
 
+	private void updateUsersPowerToolsFormat()
+	{
+		if (doneFile.getBoolean("updateUsersPowerToolsFormat", false))
+		{
+			return;
+		}
+		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		final File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			final EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+				config.load();
+				if (config.hasProperty("powertools"))
+				{
+					@SuppressWarnings("unchecked")
+					final Map<Integer, Object> powertools = (Map<Integer, Object>)config.getProperty("powertools");
+					if (powertools == null)
+					{
+						continue;
+					}
+					for (Map.Entry<Integer, Object> entry : powertools.entrySet())
+					{
+						if (entry.getValue() instanceof String)
+						{
+							List<String> temp = new ArrayList<String>();
+							temp.add((String)entry.getValue());
+							((Map<Integer, Object>)powertools).put(entry.getKey(), temp);
+						}
+					}
+					config.save();
+				}
+			}
+			catch (RuntimeException ex)
+			{
+				LOGGER.log(Level.INFO, "File: " + file.toString());
+				throw ex;
+			}
+		}
+		doneFile.setProperty("updateUsersPowerToolsFormat", true);
+		doneFile.save();
+	}
+
+	private void updateUsersHomesFormat()
+	{
+		if (doneFile.getBoolean("updateUsersHomesFormat", false))
+		{
+			return;
+		}
+		final File userdataFolder = new File(ess.getDataFolder(), "userdata");
+		if (!userdataFolder.exists() || !userdataFolder.isDirectory())
+		{
+			return;
+		}
+		final File[] userFiles = userdataFolder.listFiles();
+
+		for (File file : userFiles)
+		{
+			if (!file.isFile() || !file.getName().endsWith(".yml"))
+			{
+				continue;
+			}
+			final EssentialsConf config = new EssentialsConf(file);
+			try
+			{
+
+				config.load();
+				if (config.hasProperty("home") && config.hasProperty("home.default"))
+				{
+					@SuppressWarnings("unchecked")
+					final String defworld = (String)config.getProperty("home.default");
+					final Location defloc = getFakeLocation(config, "home.worlds." + defworld);
+					if (defloc != null)
+					{
+						config.setProperty("homes.home", defloc);
+					}
+
+					List<String> worlds = config.getKeys("home.worlds");
+					Location loc;
+					String worldName;
+
+					if (worlds == null)
+					{
+						continue;
+					}
+					for (String world : worlds)
+					{
+						if (defworld.equalsIgnoreCase(world))
+						{
+							continue;
+						}
+						loc = getFakeLocation(config, "home.worlds." + world);
+						if (loc == null)
+						{
+							continue;
+						}
+						worldName = loc.getWorld().getName().toLowerCase();
+						if (worldName != null && !worldName.isEmpty())
+						{
+							config.setProperty("homes." + worldName, loc);
+						}
+					}
+					config.removeProperty("home");
+					config.save();
+				}
+
+			}
+			catch (RuntimeException ex)
+			{
+				LOGGER.log(Level.INFO, "File: " + file.toString());
+				throw ex;
+			}
+		}
+		doneFile.setProperty("updateUsersHomesFormat", true);
+		doneFile.save();
+	}
+
 	private void moveUsersDataToUserdataFolder()
 	{
 		final File usersFile = new File(ess.getDataFolder(), "users.yml");
@@ -232,12 +370,12 @@ public class EssentialsUpgrade
 					}
 					if (world != null)
 					{
-						user.setHome(new Location(world,
-												  ((Number)vals.get(0)).doubleValue(),
-												  ((Number)vals.get(1)).doubleValue(),
-												  ((Number)vals.get(2)).doubleValue(),
-												  ((Number)vals.get(3)).floatValue(),
-												  ((Number)vals.get(4)).floatValue()), true);
+						user.setHome("home", new Location(world,
+														  ((Number)vals.get(0)).doubleValue(),
+														  ((Number)vals.get(1)).doubleValue(),
+														  ((Number)vals.get(2)).doubleValue(),
+														  ((Number)vals.get(3)).floatValue(),
+														  ((Number)vals.get(4)).floatValue()));
 					}
 				}
 			}
@@ -442,6 +580,73 @@ public class EssentialsUpgrade
 		return null;
 	}
 
+	public Location getFakeLocation(EssentialsConf config, String path)
+	{
+		String worldName = config.getString((path != null ? path + "." : "") + "world");
+		if (worldName == null || worldName.isEmpty())
+		{
+			return null;
+		}
+		World world = getFakeWorld(worldName);
+		if (world == null)
+		{
+			return null;
+		}
+		return new Location(world,
+							config.getDouble((path != null ? path + "." : "") + "x", 0),
+							config.getDouble((path != null ? path + "." : "") + "y", 0),
+							config.getDouble((path != null ? path + "." : "") + "z", 0),
+							(float)config.getDouble((path != null ? path + "." : "") + "yaw", 0),
+							(float)config.getDouble((path != null ? path + "." : "") + "pitch", 0));
+	}
+
+	private void deleteOldItemsCsv()
+	{
+		if (doneFile.getBoolean("deleteOldItemsCsv", false))
+		{
+			return;
+		}
+		final File file = new File(ess.getDataFolder(), "items.csv");
+		if (file.exists())
+		{
+			try
+			{
+				final Set<BigInteger> oldconfigs = new HashSet<BigInteger>();
+				oldconfigs.add(new BigInteger("66ec40b09ac167079f558d1099e39f10", 16)); // sep 1
+				oldconfigs.add(new BigInteger("34284de1ead43b0bee2aae85e75c041d", 16)); // crlf
+				oldconfigs.add(new BigInteger("c33bc9b8ee003861611bbc2f48eb6f4f", 16)); // jul 24
+				oldconfigs.add(new BigInteger("6ff17925430735129fc2a02f830c1daa", 16)); // crlf
+
+				MessageDigest digest = ManagedFile.getDigest();
+				final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+				final DigestInputStream dis = new DigestInputStream(bis, digest);
+				final byte[] buffer = new byte[1024];
+				try
+				{
+					while (dis.read(buffer) != -1)
+					{
+					}
+				}
+				finally
+				{
+					dis.close();
+				}
+
+				BigInteger hash = new BigInteger(1, digest.digest());
+				if (oldconfigs.contains(hash) && !file.delete())
+				{
+					throw new IOException("Could not delete file " + file.toString());
+				}
+				doneFile.setProperty("deleteOldItemsCsv", true);
+				doneFile.save();
+			}
+			catch (IOException ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+	}
+
 	public void beforeSettings()
 	{
 		if (!ess.getDataFolder().exists())
@@ -457,5 +662,8 @@ public class EssentialsUpgrade
 		updateUsersToNewDefaultHome();
 		moveUsersDataToUserdataFolder();
 		convertWarps();
+		updateUsersPowerToolsFormat();
+		updateUsersHomesFormat();
+		deleteOldItemsCsv();
 	}
 }

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

@@ -0,0 +1,190 @@
+package com.earth2me.essentials;
+
+import java.util.HashMap;
+import org.bukkit.Material;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+
+
+public class FakeInventory implements Inventory
+{
+	ItemStack[] items;
+
+	public FakeInventory(ItemStack[] items)
+	{
+		this.items = new ItemStack[items.length];
+		for (int i = 0; i < items.length; i++)
+		{
+			if (items[i] == null)
+			{
+				continue;
+			}
+			this.items[i] = new ItemStack(items[i].getTypeId(), items[i].getAmount(), items[i].getDurability());
+		}
+	}
+
+	@Override
+	public int getSize()
+	{
+		return items.length;
+	}
+
+	@Override
+	public String getName()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public ItemStack getItem(int i)
+	{
+		return items[i];
+	}
+
+	@Override
+	public void setItem(int i, ItemStack is)
+	{
+		items[i] = is;
+	}
+
+	@Override
+	public HashMap<Integer, ItemStack> addItem(ItemStack... iss)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public HashMap<Integer, ItemStack> removeItem(ItemStack... iss)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public ItemStack[] getContents()
+	{
+		return items;
+	}
+
+	@Override
+	public void setContents(ItemStack[] iss)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean contains(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean contains(Material mtrl)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean contains(ItemStack is)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean contains(int i, int i1)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean contains(Material mtrl, int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean contains(ItemStack is, int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public HashMap<Integer, ? extends ItemStack> all(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public HashMap<Integer, ? extends ItemStack> all(Material mtrl)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public HashMap<Integer, ? extends ItemStack> all(ItemStack is)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int first(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int first(Material mtrl)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int first(ItemStack is)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int firstEmpty()
+	{
+		for (int i = 0; i < items.length; i++)
+		{
+			if (items[i] == null || items[i].getTypeId() == 0) {
+				return i;
+			}
+		}
+		return -1;
+	}
+
+	@Override
+	public void remove(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void remove(Material mtrl)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void remove(ItemStack is)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void clear(int i)
+	{
+		items[i] = null;
+	}
+
+	@Override
+	public void clear()
+	{
+		for (int i = 0; i < items.length; i++)
+		{
+			items[i] = null;
+		}
+	}
+}

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

@@ -5,6 +5,7 @@ import java.util.UUID;
 import org.bukkit.BlockChangeDelegate;
 import org.bukkit.Chunk;
 import org.bukkit.ChunkSnapshot;
+import org.bukkit.Difficulty;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.TreeType;
@@ -424,5 +425,34 @@ public class FakeWorld implements World
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	@Override
+	public boolean isAutoSave()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setAutoSave(boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 	
+	@Override
+	public Difficulty getDifficulty()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+	
+	@Override
+	public void setDifficulty(Difficulty difficulty)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+	
+	@Override
+	public int getSeaLevel()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}	
 }

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

@@ -1,5 +1,6 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.perm.PermissionsHandler;
 import com.earth2me.essentials.register.payment.Methods;
 import org.bukkit.World;
 import org.bukkit.command.Command;
@@ -22,7 +23,7 @@ public interface IEssentials extends Plugin
 
 	World getWorld(String name);
 
-	int broadcastMessage(String name, String message);
+	int broadcastMessage(IUser sender, String message);
 
 	ISettings getSettings();
 
@@ -52,13 +53,9 @@ public interface IEssentials extends Plugin
 
 	int scheduleSyncRepeatingTask(final Runnable run, long delay, long period);
 
-	BanWorkaround getBans();
-
 	TNTExplodeListener getTNTListener();
 
-	IPermissionsHandler getPermissionsHandler();
-
-	void setPermissionsHandler(IPermissionsHandler handler);
+	PermissionsHandler getPermissionsHandler();
 
 	void showError(final CommandSender sender, final Throwable exception, final String commandLabel);
 

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

@@ -35,8 +35,6 @@ public interface ISettings extends IConf
 
 	int getDefaultStackSize();
 
-	boolean getGenerateExitPortals();
-
 	double getHealCooldown();
 
 	Object getKit(String name);
@@ -45,12 +43,6 @@ public interface ISettings extends IConf
 
 	String getLocale();
 
-	String getNetherName();
-
-	boolean getNetherPortalsEnabled();
-
-	double getNetherRatio();
-
 	String getNewbieSpawn();
 
 	String getNicknamePrefix();
@@ -72,6 +64,12 @@ public interface ISettings extends IConf
 	boolean getReclaimSetting();
 
 	boolean getRespawnAtHome();
+	
+	List getMultipleHomes();
+	
+	int getHomeLimit(String set);
+	
+	int getHomeLimit(User user);
 
 	boolean getSortListByGroups();
 
@@ -99,22 +97,16 @@ public interface ISettings extends IConf
 
 	boolean isEcoDisabled();
 
-	boolean isNetherEnabled();
-
 	boolean isTradeInStacks(int id);
 
 	List<Integer> itemSpawnBlacklist();
 
 	boolean permissionBasedItemSpawn();
 
-	void reloadConfig();
-
 	boolean showNonEssCommandsInHelp();
 
 	boolean spawnIfNoHome();
 
-	boolean use1to1RatioInNether();
-
 	boolean warnOnBuildDisallow();
 
 	boolean warnOnSmite();
@@ -129,7 +121,17 @@ public interface ISettings extends IConf
 
 	boolean isPlayerCommand(String string);
 
-	public boolean useBukkitPermissions();
+	boolean useBukkitPermissions();
 
-	public boolean addPrefixSuffix();
+	boolean addPrefixSuffix();
+
+	boolean isUpdateEnabled();
+
+	long getAutoAfk();
+
+	long getAutoAfkKick();
+
+	boolean getFreezeAfkPlayers();
+	
+	boolean areDeathMessagesEnabled();
 }

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

@@ -22,7 +22,7 @@ public interface IUser
 	boolean isAuthorized(String node);
 
 	boolean isAuthorized(IEssentialsCommand cmd);
-	
+
 	boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix);
 
 	void setLastTeleportTimestamp(long time);
@@ -45,11 +45,15 @@ public interface IUser
 
 	void setLastLocation();
 
-	Location getHome(Location location);
+	Location getHome(String name) throws Exception;
+
+	Location getHome(Location loc) throws Exception;
 
 	String getName();
 
 	InetSocketAddress getAddress();
 
 	String getDisplayName();
+
+	boolean isHidden();
 }

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

@@ -3,7 +3,6 @@ package com.earth2me.essentials;
 import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Item;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -65,6 +64,20 @@ public final class InventoryWorkaround
 		return -1;
 	}
 
+	public static boolean addAllItems(final Inventory cinventory, final boolean forceDurability, final ItemStack... items)
+	{
+		final Inventory fake = new FakeInventory(cinventory.getContents());
+		if (addItem(fake, forceDurability, items).isEmpty())
+		{
+			addItem(cinventory, forceDurability, items);
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
 	public static Map<Integer, ItemStack> addItem(final Inventory cinventory, final boolean forceDurability, final ItemStack... items)
 	{
 		final Map<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
@@ -107,7 +120,7 @@ public final class InventoryWorkaround
 			{
 				continue;
 			}
-			
+
 			while (true)
 			{
 				// Do we already have a stack of it?
@@ -130,7 +143,7 @@ public final class InventoryWorkaround
 						// More than a single stack!
 						if (item.getAmount() > item.getType().getMaxStackSize())
 						{
-							cinventory.setItem(firstFree, new CraftItemStack(item.getTypeId(), item.getType().getMaxStackSize(), item.getDurability()));
+							cinventory.setItem(firstFree, new ItemStack(item.getTypeId(), item.getType().getMaxStackSize(), item.getDurability()));
 							item.setAmount(item.getAmount() - item.getType().getMaxStackSize());
 						}
 						else

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

@@ -1,14 +1,8 @@
 package com.earth2me.essentials;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
@@ -17,108 +11,45 @@ public class ItemDb implements IConf
 {
 	private final transient IEssentials ess;
 
-	public ItemDb(IEssentials ess)
+	public ItemDb(final IEssentials ess)
 	{
 		this.ess = ess;
+		file = new ManagedFile("items.csv", ess);
 	}
-	private final static Logger LOGGER = Logger.getLogger("Minecraft");
 	private final transient Map<String, Integer> items = new HashMap<String, Integer>();
 	private final transient Map<String, Short> durabilities = new HashMap<String, Short>();
+	private final transient ManagedFile file;
 
+	@Override
 	public void reloadConfig()
 	{
-		final File file = new File(ess.getDataFolder(), "items.csv");
-
-		if (!file.exists())
-		{
-			final InputStream res = ItemDb.class.getResourceAsStream("/items.csv");
-			FileWriter tx = null;
-			try
-			{
-				tx = new FileWriter(file);
-				for (int i = 0; (i = res.read()) > 0;)
-				{
-					tx.write(i);
-				}
-				tx.flush();
-			}
-			catch (IOException ex)
-			{
-				LOGGER.log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
-				return;
-			}
-			finally
-			{
-				try
-				{
-					res.close();
-				}
-				catch (Exception ex)
-				{
-				}
-				try
-				{
-					if (tx != null)
-					{
-						tx.close();
-					}
-				}
-				catch (Exception ex)
-				{
-				}
-			}
+		final List<String> lines = file.getLines();
+		
+		if (lines.isEmpty()) {
+			return;
 		}
 
-		BufferedReader rx = null;
-		try
-		{
-			rx = new BufferedReader(new FileReader(file));
-			durabilities.clear();
-			items.clear();
+		durabilities.clear();
+		items.clear();
 
-			for (int i = 0; rx.ready(); i++)
+		for (String line : lines)
+		{
+			line = line.trim().toLowerCase();
+			if (line.length() > 0 && line.charAt(0) == '#')
 			{
-				try
-				{
-					final String line = rx.readLine().trim().toLowerCase();
-					if (line.startsWith("#"))
-					{
-						continue;
-					}
-
-					final String[] parts = line.split("[^a-z0-9]");
-					if (parts.length < 2)
-					{
-						continue;
-					}
-
-					final int numeric = Integer.parseInt(parts[1]);
-
-					durabilities.put(parts[0].toLowerCase(), parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0);
-					items.put(parts[0].toLowerCase(), numeric);
-				}
-				catch (Exception ex)
-				{
-					LOGGER.warning(Util.format("parseError", "items.csv", i));
-				}
+				continue;
 			}
-		}
-		catch (IOException ex)
-		{
-			LOGGER.log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
-		}
-		finally
-		{
-			if (rx != null) {
-				try
-				{
-					rx.close();
-				}
-				catch (IOException ex)
-				{
-					LOGGER.log(Level.SEVERE, ex.getMessage(), ex);
-				}
+
+			final String[] parts = line.split("[^a-z0-9]");
+			if (parts.length < 2)
+			{
+				continue;
 			}
+
+			final int numeric = Integer.parseInt(parts[1]);
+
+			durabilities.put(parts[0].toLowerCase(), parts.length > 2 && !parts[2].equals("0") ? Short.parseShort(parts[2]) : 0);
+			items.put(parts[0].toLowerCase(), numeric);
 		}
 	}
 
@@ -163,7 +94,7 @@ public class ItemDb implements IConf
 					metaData = durabilities.get(itemname);
 				}
 			}
-			else if(Material.getMaterial(itemname) != null)
+			else if (Material.getMaterial(itemname) != null)
 			{
 				itemid = Material.getMaterial(itemname).getId();
 				metaData = 0;

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

@@ -0,0 +1,235 @@
+package com.earth2me.essentials;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.math.BigInteger;
+import java.security.DigestInputStream;
+import java.security.DigestOutputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import org.bukkit.Bukkit;
+
+
+public class ManagedFile
+{
+	private final static int BUFFERSIZE = 1024 * 8;
+	private final transient File file;
+
+	public ManagedFile(final String filename, final IEssentials ess)
+	{
+		file = new File(ess.getDataFolder(), filename);
+
+		if (file.exists())
+		{
+			try
+			{
+				if (checkForVersion(file, ess.getDescription().getVersion()) && !file.delete())
+				{
+					throw new IOException("Could not delete file " + file.toString());
+				}
+			}
+			catch (IOException ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			}
+		}
+
+		if (!file.exists())
+		{
+			try
+			{
+				copyResourceAscii("/" + filename, file);
+			}
+			catch (IOException ex)
+			{
+				Bukkit.getLogger().log(Level.SEVERE, Util.i18n("itemsCsvNotLoaded"), ex);
+			}
+		}
+	}
+
+	public static void copyResourceAscii(final String resourceName, final File file) throws IOException
+	{
+		final InputStreamReader reader = new InputStreamReader(ManagedFile.class.getResourceAsStream(resourceName));
+		try
+		{
+			final MessageDigest digest = getDigest();
+			final DigestOutputStream digestStream = new DigestOutputStream(new FileOutputStream(file), digest);
+			try
+			{
+				final OutputStreamWriter writer = new OutputStreamWriter(digestStream);
+				try
+				{
+					final char[] buffer = new char[BUFFERSIZE];
+					do
+					{
+						final int length = reader.read(buffer);
+						if (length >= 0)
+						{
+							writer.write(buffer, 0, length);
+						}
+						else
+						{
+							break;
+						}
+					}
+					while (true);
+					writer.write("\n");
+					writer.flush();
+					final BigInteger hashInt = new BigInteger(1, digest.digest());
+					digestStream.on(false);
+					digestStream.write('#');
+					digestStream.write(hashInt.toString(16).getBytes());
+				}
+				finally
+				{
+					writer.close();
+				}
+			}
+			finally
+			{
+				digestStream.close();
+			}
+		}
+		finally
+		{
+			reader.close();
+		}
+	}
+
+	public static boolean checkForVersion(final File file, final String version) throws IOException
+	{
+		if (file.length() < 33)
+		{
+			return false;
+		}
+		final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+		try
+		{
+			final byte[] buffer = new byte[(int)file.length()];
+			int position = 0;
+			do
+			{
+				final int length = bis.read(buffer, position, Math.min((int)file.length() - position, BUFFERSIZE));
+				if (length < 0)
+				{
+					break;
+				}
+				position += length;
+			}
+			while (position < file.length());
+			final ByteArrayInputStream bais = new ByteArrayInputStream(buffer);
+			if (bais.skip(file.length() - 33) != file.length() - 33)
+			{
+				return false;
+			}
+			final BufferedReader reader = new BufferedReader(new InputStreamReader(bais));
+			try
+			{
+				String hash = reader.readLine();
+				if (hash.matches("#[a-f0-9]{32}"))
+				{
+					hash = hash.substring(1);
+					bais.reset();
+					final String versionline = reader.readLine();
+					if (versionline.matches("#version: .+"))
+					{
+						final String versioncheck = versionline.substring(10);
+						if (!versioncheck.equalsIgnoreCase(version))
+						{
+							bais.reset();
+							final MessageDigest digest = getDigest();
+							final DigestInputStream digestStream = new DigestInputStream(bais, digest);
+							try
+							{
+								final byte[] bytes = new byte[(int)file.length() - 33];
+								digestStream.read(bytes);
+								final BigInteger correct = new BigInteger(hash, 16);
+								final BigInteger test = new BigInteger(1, digest.digest());
+								if (correct.equals(test))
+								{
+									return true;
+								}
+								else
+								{
+									Bukkit.getLogger().warning("File " + file.toString() + " has been modified by user and file version differs, please update the file manually.");
+								}
+							}
+							finally
+							{
+								digestStream.close();
+							}
+						}
+					}
+				}
+			}
+			finally
+			{
+				reader.close();
+			}
+		}
+		finally
+		{
+			bis.close();
+		}
+		return false;
+	}
+
+	public static MessageDigest getDigest() throws IOException
+	{
+		try
+		{
+			return MessageDigest.getInstance("MD5");
+		}
+		catch (NoSuchAlgorithmException ex)
+		{
+			throw new IOException(ex);
+		}
+	}
+
+	public List<String> getLines()
+	{
+		try
+		{
+			final BufferedReader reader = new BufferedReader(new FileReader(file));
+			try
+			{
+				final List<String> lines = new ArrayList<String>();
+				do
+				{
+					final String line = reader.readLine();
+					if (line == null)
+					{
+						break;
+					}
+					else
+					{
+						lines.add(line);
+					}
+				}
+				while (true);
+				return lines;
+			}
+			finally
+			{
+				reader.close();
+			}
+		}
+		catch (IOException ex)
+		{
+			Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
+			return Collections.emptyList();
+		}
+	}
+}

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

@@ -26,8 +26,10 @@ public enum Mob
 	SPIDER("Spider", Enemies.ENEMY, CreatureType.SPIDER),
 	SQUID("Squid", Enemies.FRIENDLY, CreatureType.SQUID),
 	ZOMBIE("Zombie", Enemies.ENEMY, CreatureType.ZOMBIE),
-	MONSTER("Monster", Enemies.ENEMY, CreatureType.MONSTER),
-	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF);
+	WOLF("Wolf", Enemies.NEUTRAL, CreatureType.WOLF),
+	CAVESPIDER("CaveSpider", Enemies.ENEMY, CreatureType.CAVE_SPIDER),
+	ENDERMAN("Enderman", Enemies.ENEMY, "", CreatureType.ENDERMAN),
+	SILVERFISH("Silverfish", Enemies.ENEMY, "", CreatureType.SILVERFISH);
 
 	public static final Logger logger = Logger.getLogger("Minecraft");
 

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

@@ -1,167 +0,0 @@
-/**
- * @author SpaceManiac
- * @licent MIT
- * @origin https://github.com/SpaceManiac/Nether/blob/master/org/innectis/Nether/NetherPortal.java
- */
-package com.earth2me.essentials;
-
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-
-public class NetherPortal
-{
-	private Block block;
-
-	public NetherPortal(Block b)
-	{
-		block = b;
-	}
-
-	public Block getBlock()
-	{
-		return block;
-	}
-
-	public void setBlock(Block b)
-	{
-		block = b;
-	}
-
-	// Return a random spawnable location
-	public Location getSpawn()
-	{
-		if (block.getWorld().getBlockAt(block.getX() + 1, block.getY(), block.getZ()).getType().equals(Material.PORTAL)
-			|| block.getWorld().getBlockAt(block.getX() - 1, block.getY(), block.getZ()).getType().equals(Material.PORTAL))
-		{
-		// portal is in X direction
-			return new Location(block.getWorld(), block.getX() + 1,
-								block.getY(), block.getZ() + 1 - 2 * Math.round(Math.random()));
-		}
-		else
-		{
-		// portal is in Z direction
-			return new Location(block.getWorld(), block.getX() + 1 - 2 * Math.round(Math.random()),
-								block.getY(), block.getZ() + 1);
-		}
-	}
-
-	// ==============================
-	// Find a nearby portal within 16 blocks of the given block
-	// Not guaranteed to be the nearest
-	public static NetherPortal findPortal(Block dest)
-	{
-		World world = dest.getWorld();
-
-		// Get list of columns in a circle around the block
-		ArrayList<Block> columns = new ArrayList<Block>();
-		for (int x = dest.getX() - 16; x <= dest.getX() + 16; ++x)
-		{
-			for (int z = dest.getZ() - 16; z <= dest.getZ() + 16; ++z)
-			{
-				int dx = dest.getX() - x, dz = dest.getZ() - z;
-				if (dx * dx + dz * dz <= 256)
-				{
-					columns.add(world.getBlockAt(x, 0, z));
-				}
-			}
-		}
-
-		// For each column try to find a portal block
-		for (Block col : columns)
-		{
-			for (int y = 127; y >= 0; --y)
-			{
-				Block b = world.getBlockAt(col.getX(), y, col.getZ());
-				if (b.getType().equals(Material.PORTAL) && Math.abs(dest.getY() - y) <= 16)
-				{
-					// Huzzah!
-					return new NetherPortal(b);
-				}
-			}
-		}
-
-		// Nope!
-		return null;
-	}
-
-	// Create a new portal at the specified block, fudging position if needed
-	// Will occasionally end up making portals in bad places, but let's hope not
-	public static NetherPortal createPortal(Block dest)
-	{
-		World world = dest.getWorld();
-
-		// Try not to spawn within water or lava
-		Material m = dest.getType();
-		while (((m.equals(Material.LAVA) || m.equals(Material.WATER) || m.equals(Material.STATIONARY_LAVA) 
-			|| m.equals(Material.STATIONARY_WATER) || m.equals(Material.SAND) || m.equals(Material.GRAVEL))) &&
-			dest.getY() < 120)
-		{
-			dest = world.getBlockAt(dest.getX(), dest.getY() + 4, dest.getZ());
-			m = dest.getType();
-		}
-
-		// Not too high or too low overall
-		if (dest.getY() > 120)
-		{
-			dest = world.getBlockAt(dest.getX(), 120, dest.getZ());
-		}
-		else if (dest.getY() < 8)
-		{
-			dest = world.getBlockAt(dest.getX(), 8, dest.getZ());
-		}
-
-		// Create the physical portal
-		// For now, don't worry about direction
-
-		int x = dest.getX(), y = dest.getY(), z = dest.getZ();
-		Logger.getLogger("Minecraft").log(Level.INFO, Util.format("creatingPortal", x, y, z)); 
-
-		// Clear area around portal
-		ArrayList<Block> columns = new ArrayList<Block>();
-		for (int x2 = x - 4; x2 <= x + 4; ++x2)
-		{
-			for (int z2 = z - 4; z2 <= z + 4; ++z2)
-			{
-				double dx = x + 0.5f - x2, dz = z - z2;
-				if (dx * dx + dz * dz <= 13)
-				{
-					columns.add(world.getBlockAt(x2, 0, z2));
-				}
-			}
-		}
-
-		// Clear area around portal
-		for (Block col : columns)
-		{
-			// Stone platform
-			world.getBlockAt(col.getX(), y - 1, col.getZ()).setType(Material.STONE);
-			for (int yd = 0; yd < 4; ++yd)
-			{
-				world.getBlockAt(col.getX(), y + yd, col.getZ()).setType(Material.AIR);
-			}
-		}
-
-		// Build obsidian frame
-		for (int xd = -1; xd < 3; ++xd)
-		{
-			for (int yd = -1; yd < 4; ++yd)
-			{
-				if (xd == -1 || yd == -1 || xd == 2 || yd == 3)
-				{
-					world.getBlockAt(x + xd, y + yd, z).setType(Material.OBSIDIAN);
-				}
-			}
-		}
-
-		// Set it alight!
-		dest.setType(Material.FIRE);
-
-		return new NetherPortal(dest);
-	}
-}

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

@@ -5,8 +5,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+import lombok.Delegate;
 import org.bukkit.Achievement;
 import org.bukkit.Effect;
+import org.bukkit.GameMode;
 import org.bukkit.Instrument;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -34,38 +36,32 @@ import org.bukkit.util.Vector;
 
 public class OfflinePlayer implements Player
 {
-	private final String name;
-	final transient IEssentials ess;
+	private final transient IEssentials ess;
 	private Location location = new Location(null, 0, 0, 0, 0, 0);
 	private World world;
 	private UUID uniqueId = UUID.randomUUID();
+	@Delegate(types=org.bukkit.OfflinePlayer.class)
+	private final org.bukkit.OfflinePlayer base;
 
-	public OfflinePlayer(String name, IEssentials ess)
+	public OfflinePlayer(final String name, final IEssentials ess)
 	{
-		this.name = name;
 		this.ess = ess;
 		this.world = ess.getServer().getWorlds().get(0);
+		this.base = ess.getServer().getOfflinePlayer(name);
 	}
 
-	public boolean isOnline()
-	{
-		return false;
-	}
-
-	public boolean isOp()
-	{
-		return false;
-	}
-
-	public void sendMessage(String string)
+	@Override
+	public void sendMessage(final String string)
 	{
 	}
 
+	@Override
 	public String getDisplayName()
 	{
-		return name;
+		return base.getName();
 	}
 
+	@Override
 	public void setDisplayName(String string)
 	{
 	}
@@ -83,11 +79,6 @@ public class OfflinePlayer implements Player
 	{
 	}
 
-	public String getName()
-	{
-		return name;
-	}
-
 	public PlayerInventory getInventory()
 	{
 		return null;
@@ -573,14 +564,136 @@ public class OfflinePlayer implements Player
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
-
-	public void setOp(boolean bln)
-	{
-	}
-
+	
 	@Override
 	public void sendMap(MapView mv)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	@Override
+	public GameMode getGameMode()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setGameMode(GameMode gm)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getExperience()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setExperience(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getLevel()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setLevel(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getTotalExperience()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setTotalExperience(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public float getExhaustion()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setExhaustion(float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public float getSaturation()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setSaturation(float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getFoodLevel()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setFoodLevel(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public Location getBedSpawnLocation()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean isSprinting()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setSprinting(boolean bln)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setPlayerListName(String name)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public String getPlayerListName()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public int getTicksLived()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setTicksLived(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }

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

@@ -1,47 +1,53 @@
 package com.earth2me.essentials;
 
+import lombok.Delegate;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.IInventory;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permissible;
+import org.bukkit.permissions.ServerOperator;
 
 
-public class PlayerExtension extends PlayerWrapper
+public class PlayerExtension implements Player
 {
-	protected final IEssentials ess;
-	
-	public PlayerExtension(Player base, IEssentials ess)
+	protected final transient IEssentials ess;
+	@Delegate(types =
 	{
-		super(base);
+		Player.class, Entity.class, CommandSender.class, ServerOperator.class, 
+		HumanEntity.class, ConfigurationSerializable.class, LivingEntity.class,
+		Permissible.class
+	})
+	protected Player base;
+	
+	public PlayerExtension(final Player base, final IEssentials ess)
+	{
+		this.base = base;
 		this.ess = ess;
 	}
-
-	public boolean isBanned()
+	
+	public final Player getBase()
 	{
-		return ess.getBans().isNameBanned(this.getName());
+		return base;
 	}
 
-	public boolean isIpBanned()
+	public final Player setBase(final Player base)
 	{
-		return ess.getBans().isIpBanned(getAddress().getAddress().getHostAddress());
-	}
-
-	public float getCorrectedYaw()
-	{
-		float angle = (getLocation().getYaw() - 90.0f) % 360.0f;
-		if (angle < 0) {
-			angle += 360.0f;
-		}
-		return angle;
+		return this.base = base;
 	}
 	
-	public void showInventory(IInventory inventory)
+	public void showInventory(final IInventory inventory)
 	{
 		getHandle().a(inventory);
 	}
 
-	public void showInventory(CraftInventoryPlayer inventory)
+	public void showInventory(final CraftInventoryPlayer inventory)
 	{
 		showInventory((IInventory)inventory.getInventory());
 	}
@@ -56,7 +62,7 @@ public class PlayerExtension extends PlayerWrapper
 		return ess.getPermissionsHandler().getGroup(base);
 	}
 	
-	public boolean inGroup(String group)
+	public boolean inGroup(final String group)
 	{
 		return ess.getPermissionsHandler().inGroup(base, group);
 	}

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

@@ -1,620 +0,0 @@
-package com.earth2me.essentials;
-
-import java.net.InetSocketAddress;
-import java.util.*;
-import org.bukkit.*;
-import org.bukkit.block.Block;
-import org.bukkit.entity.*;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.inventory.*;
-import org.bukkit.map.MapView;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.util.Vector;
-
-public class PlayerWrapper implements Player
-{
-	protected Player base;
-	
-	public PlayerWrapper(Player base)
-	{
-		this.base = base;
-	}
-	
-	public final Player getBase()
-	{
-		return base;
-	}
-	
-	public final Player setBase(Player base)
-	{
-		return this.base = base;
-	}
-
-	@Override
-	public void setDisplayName(String string)
-	{
-		base.setDisplayName(string);
-	}
-
-	@Override
-	public void setCompassTarget(Location lctn)
-	{
-		base.setCompassTarget(lctn);
-	}
-
-	@Override
-	public InetSocketAddress getAddress()
-	{
-		return base.getAddress();
-	}
-
-	@Override
-	public void kickPlayer(String string)
-	{
-		base.kickPlayer(string);
-	}
-
-	@Override
-	public String getName()
-	{
-		return base.getName();
-	}
-
-	@Override
-	public PlayerInventory getInventory()
-	{
-		return base.getInventory();
-	}
-
-	@Override
-	public ItemStack getItemInHand()
-	{
-		return base.getItemInHand();
-	}
-
-	@Override
-	public void setItemInHand(ItemStack is)
-	{
-		base.setItemInHand(is);
-	}
-
-	@Override
-	public int getHealth()
-	{
-		return base.getHealth();
-	}
-
-	@Override
-	public void setHealth(int i)
-	{
-		base.setHealth(i);
-	}
-
-	@Override
-	public Egg throwEgg()
-	{
-		return base.throwEgg();
-	}
-
-	@Override
-	public Snowball throwSnowball()
-	{
-		return base.throwSnowball();
-	}
-
-	@Override
-	public Arrow shootArrow()
-	{
-		return base.shootArrow();
-	}
-
-	@Override
-	public boolean isInsideVehicle()
-	{
-		return base.isInsideVehicle();
-	}
-
-	@Override
-	public boolean leaveVehicle()
-	{
-		return base.leaveVehicle();
-	}
-
-	@Override
-	public Vehicle getVehicle()
-	{
-		return base.getVehicle();
-	}
-
-	@Override
-	public Location getLocation()
-	{
-		return base.getLocation();
-	}
-
-	@Override
-	public World getWorld()
-	{
-		return base.getWorld();
-	}
-
-	@Override
-	public Server getServer()
-	{
-		return base.getServer();
-	}
-
-	@Override
-	public boolean isOnline()
-	{
-		return base.isOnline();
-	}
-
-	@Override
-	public boolean isOp()
-	{
-		return base.isOp();
-	}
-	
-	@Override
-	public boolean teleport(Location lctn)
-	{
-		return base.teleport(lctn);
-	}
-	
-	@Override
-	public boolean teleport(Entity entity)
-	{
-		return base.teleport(entity);
-	}
-
-	@Override
-	public void sendMessage(String string)
-	{
-		base.sendMessage(string);
-	}
-
-	@Override
-	public void setVelocity(Vector vector)
-	{
-		base.setVelocity(vector);
-	}
-
-	@Override
-	public Vector getVelocity()
-	{
-		return base.getVelocity();
-	}
-
-	@Override
-	public double getEyeHeight()
-	{
-		return base.getEyeHeight();
-	}
-
-	@Override
-	public double getEyeHeight(boolean bln)
-	{
-		return base.getEyeHeight(bln);
-	}
-
-	@Override
-	public List<Block> getLineOfSight(HashSet<Byte> hs, int i)
-	{
-		return base.getLineOfSight(hs, i);
-	}
-
-	@Override
-	public Block getTargetBlock(HashSet<Byte> hs, int i)
-	{
-		return base.getTargetBlock(hs, i);
-	}
-
-	@Override
-	public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i)
-	{
-		return base.getLastTwoTargetBlocks(hs, i);
-	}
-
-	@Override
-	public int getFireTicks()
-	{
-		return base.getFireTicks();
-	}
-
-	@Override
-	public int getMaxFireTicks()
-	{
-		return base.getMaxFireTicks();
-	}
-
-	@Override
-	public void setFireTicks(int i)
-	{
-		base.setFireTicks(i);
-	}
-
-	@Override
-	public void remove()
-	{
-		base.remove();
-	}
-	
-	/**
-	 * This is not deprecated because the underlying method isn't really deprecated; rather, it's just "imperfect".  By
-	 * We will continue to use this method even after the underlying CraftBukkit method is changed, so do not deprecate
-	 * it.  Chances are Bukkit will also choose to un-deprecate this method at some point.
-	 */
-	@Override
-	public void updateInventory()
-	{
-		base.updateInventory();
-	}
-
-	@Override
-	public void chat(String string)
-	{
-		base.chat(string);
-	}
-
-	@Override
-	public boolean isSneaking()
-	{
-		return base.isSneaking();
-	}
-
-	@Override
-	public void setSneaking(boolean bln)
-	{
-		base.setSneaking(bln);
-	}
-
-	@Override
-	public int getEntityId()
-	{
-		return base.getEntityId();
-	}
-
-	@Override
-	public boolean performCommand(String string)
-	{
-		return base.performCommand(string);
-	}
-
-	@Override
-	public int getRemainingAir()
-	{
-		return base.getRemainingAir();
-	}
-
-	@Override
-	public void setRemainingAir(int i)
-	{
-		base.setRemainingAir(i);
-	}
-
-	@Override
-	public int getMaximumAir()
-	{
-		return base.getMaximumAir();
-	}
-
-	@Override
-	public void setMaximumAir(int i)
-	{
-		base.setMaximumAir(i);
-	}
-
-	@Override
-	public String getDisplayName()
-	{
-		if (base.getDisplayName() != null)
-			return base.getDisplayName();
-		else
-			return base.getName();
-	}
-
-	@Override
-	public void damage(int i)
-	{
-		base.damage(i);
-	}
-
-	@Override
-	public void damage(int i, Entity entity)
-	{
-		base.damage(i, entity);
-	}
-
-	@Override
-	public Location getEyeLocation()
-	{
-		return base.getEyeLocation();
-	}
-
-	@Override
-	public void sendRawMessage(String string) {
-		base.sendRawMessage(string);
-	}
-
-	@Override
-	public Location getCompassTarget()
-	{
-		return base.getCompassTarget();
-	}
-
-	@Override
-	public int getMaximumNoDamageTicks()
-	{
-		return base.getMaximumNoDamageTicks();
-	}
-
-	@Override
-	public void setMaximumNoDamageTicks(int i)
-	{
-		base.setMaximumNoDamageTicks(i);
-	}
-
-	@Override
-	public int getLastDamage()
-	{
-		return base.getLastDamage();
-	}
-
-	@Override
-	public void setLastDamage(int i)
-	{
-		base.setLastDamage(i);
-	}
-
-	@Override
-	public int getNoDamageTicks()
-	{
-		return base.getNoDamageTicks();
-	}
-
-	@Override
-	public void setNoDamageTicks(int i)
-	{
-		base.setNoDamageTicks(i);
-	}
-
-	@Override
-	public Entity getPassenger()
-	{
-		return base.getPassenger();
-	}
-
-	@Override
-	public boolean setPassenger(Entity entity)
-	{
-		return base.setPassenger(entity);
-	}
-
-	@Override
-	public boolean isEmpty()
-	{
-		return base.isEmpty();
-	}
-
-	@Override
-	public boolean eject()
-	{
-		return base.eject();
-	}
-
-	public void saveData()
-	{
-		base.saveData();
-	}
-
-	public void loadData()
-	{
-		base.loadData();
-	}
-
-	public boolean isSleeping()
-	{
-		return base.isSleeping();
-	}
-
-	public int getSleepTicks()
-	{
-		return base.getSleepTicks();
-	}
-
-	public List<Entity> getNearbyEntities(double d, double d1, double d2)
-	{
-		return base.getNearbyEntities(d, d1, d2);
-	}
-
-	public boolean isDead()
-	{
-		return base.isDead();
-	}
-
-	public float getFallDistance()
-	{
-		return base.getFallDistance();
-	}
-
-	public void setFallDistance(float f)
-	{
-		base.setFallDistance(f);
-	}
-
-	public void setSleepingIgnored(boolean bln)
-	{
-		base.setSleepingIgnored(bln);
-	}
-
-	public boolean isSleepingIgnored()
-	{
-		return base.isSleepingIgnored();
-	}
-
-	public void awardAchievement(Achievement a)
-	{
-		base.awardAchievement(a);
-	}
-
-	public void incrementStatistic(Statistic ststc)
-	{
-		base.incrementStatistic(ststc);
-	}
-
-	public void incrementStatistic(Statistic ststc, int i)
-	{
-		base.incrementStatistic(ststc, i);
-	}
-
-	public void incrementStatistic(Statistic ststc, Material mtrl)
-	{
-		base.incrementStatistic(ststc, mtrl);
-	}
-
-	public void incrementStatistic(Statistic ststc, Material mtrl, int i)
-	{
-		base.incrementStatistic(ststc, mtrl, i);
-	}
-
-	public void playNote(Location lctn, byte b, byte b1)
-	{
-		base.playNote(lctn, b, b1);
-	}
-
-	public void sendBlockChange(Location lctn, Material mtrl, byte b)
-	{
-		base.sendBlockChange(lctn, mtrl, b);
-	}
-
-	public void sendBlockChange(Location lctn, int i, byte b)
-	{
-		base.sendBlockChange(lctn, i, b);
-	}
-
-	public void setLastDamageCause(EntityDamageEvent ede)
-	{
-		base.setLastDamageCause(ede);
-		
-	}
-
-	public EntityDamageEvent getLastDamageCause()
-	{
-		return base.getLastDamageCause();
-	}
-
-	public void playEffect(Location lctn, Effect effect, int i)
-	{
-		base.playEffect(lctn, effect, i);
-	}
-
-	public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes)
-	{
-		return base.sendChunkChange(lctn, i, i1, i2, bytes);
-	}
-
-	public UUID getUniqueId()
-	{
-		return base.getUniqueId();
-	}
-
-	public void playNote(Location lctn, Instrument i, Note note)
-	{
-		base.playNote(lctn, i, note);
-	}
-
-	public void setPlayerTime(long l, boolean bln)
-	{
-		base.setPlayerTime(l, bln);
-	}
-
-	public long getPlayerTime()
-	{
-		return base.getPlayerTime();
-	}
-
-	public long getPlayerTimeOffset()
-	{
-		return base.getPlayerTimeOffset();
-	}
-
-	public boolean isPlayerTimeRelative()
-	{
-		return base.isPlayerTimeRelative();
-	}
-
-	public void resetPlayerTime()
-	{
-		base.resetPlayerTime();
-	}
-
-	public boolean isPermissionSet(String string)
-	{
-		return base.isPermissionSet(string);
-	}
-
-	public boolean isPermissionSet(Permission prmsn)
-	{
-		return base.isPermissionSet(prmsn);
-	}
-
-	public boolean hasPermission(String string)
-	{
-		return base.hasPermission(string);
-	}
-
-	public boolean hasPermission(Permission prmsn)
-	{
-		return base.hasPermission(prmsn);
-	}
-
-	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln)
-	{
-		return base.addAttachment(plugin, string, bln);
-	}
-
-	public PermissionAttachment addAttachment(Plugin plugin)
-	{
-		return base.addAttachment(plugin);
-	}
-	
-	public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln, int i)
-	{
-		return base.addAttachment(plugin, string, bln, i);
-	}
-
-	public PermissionAttachment addAttachment(Plugin plugin, int i)
-	{
-		return base.addAttachment(plugin, i);
-	}
-
-	public void removeAttachment(PermissionAttachment pa)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	public void recalculatePermissions()
-	{
-		base.recalculatePermissions();
-	}
-
-	public Set<PermissionAttachmentInfo> getEffectivePermissions()
-	{
-		return base.getEffectivePermissions();
-	}
-
-	public void setOp(boolean bln)
-	{
-		base.setOp(bln);
-	}
-
-	@Override
-	public void sendMap(MapView mv)
-	{
-		base.sendMap(mv);
-	}
-}

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

@@ -37,6 +37,39 @@ public class Settings implements ISettings
 		return config.getBoolean("bed-sethome", false);
 	}
 
+	@Override
+	public List<String> getMultipleHomes()
+	{
+		return config.getKeys("sethome-multiple");
+	}
+
+	@Override
+	public int getHomeLimit(final User user)
+	{
+		final List<String> homeList = getMultipleHomes();
+		if (homeList == null)
+		{
+			//TODO: Replace this code to remove backwards compat, after settings are automatically updated
+			// return getHomeLimit("default");
+			return config.getInt("multiple-homes", 5);
+		}
+		int limit = getHomeLimit("default");
+		for (String set : homeList)
+		{
+			if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set)))
+			{
+				limit = getHomeLimit(set);
+			}
+		}
+		return limit;
+	}
+
+	@Override
+	public int getHomeLimit(final String set)
+	{
+		return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3));
+	}
+
 	@Override
 	public int getChatRadius()
 	{
@@ -54,19 +87,13 @@ public class Settings implements ISettings
 	{
 		return config.getInt("default-stack-size", 64);
 	}
-	
+
 	@Override
 	public int getStartingBalance()
 	{
 		return config.getInt("starting-balance", 0);
 	}
 
-	@Override
-	public boolean getNetherPortalsEnabled()
-	{
-		return isNetherEnabled() && config.getBoolean("nether.portals-enabled", false);
-	}
-
 	@Override
 	public boolean isCommandDisabled(final IEssentialsCommand cmd)
 	{
@@ -78,7 +105,10 @@ public class Settings implements ISettings
 	{
 		for (String c : config.getStringList("disabled-commands", new ArrayList<String>(0)))
 		{
-			if (!c.equalsIgnoreCase(label)) continue;
+			if (!c.equalsIgnoreCase(label))
+			{
+				continue;
+			}
 			return true;
 		}
 		return config.getBoolean("disable-" + label.toLowerCase(), false);
@@ -95,18 +125,24 @@ public class Settings implements ISettings
 	{
 		for (String c : config.getStringList("restricted-commands", new ArrayList<String>(0)))
 		{
-			if (!c.equalsIgnoreCase(label)) continue;
+			if (!c.equalsIgnoreCase(label))
+			{
+				continue;
+			}
 			return true;
 		}
 		return config.getBoolean("restrict-" + label.toLowerCase(), false);
 	}
-	
+
 	@Override
 	public boolean isPlayerCommand(String label)
 	{
 		for (String c : config.getStringList("player-commands", new ArrayList<String>(0)))
 		{
-			if (!c.equalsIgnoreCase(label)) continue;
+			if (!c.equalsIgnoreCase(label))
+			{
+				continue;
+			}
 			return true;
 		}
 		return false;
@@ -120,7 +156,9 @@ public class Settings implements ISettings
 		for (String c : config.getStringList("overridden-commands", defaultList))
 		{
 			if (!c.equalsIgnoreCase(name))
+			{
 				continue;
+			}
 			return true;
 		}
 		return config.getBoolean("override-" + name.toLowerCase(), false);
@@ -137,7 +175,9 @@ public class Settings implements ISettings
 	{
 		double cost = config.getDouble("command-costs." + label, 0.0);
 		if (cost == 0.0)
+		{
 			cost = config.getDouble("cost-" + label, 0.0);
+		}
 		return cost;
 	}
 
@@ -165,13 +205,14 @@ public class Settings implements ISettings
 		Map<String, Object> kits = (Map<String, Object>)config.getProperty("kits");
 		for (Map.Entry<String, Object> entry : kits.entrySet())
 		{
-			if (entry.getKey().equalsIgnoreCase(name.replace('.', '_').replace('/', '_'))) {
+			if (entry.getKey().equalsIgnoreCase(name.replace('.', '_').replace('/', '_')))
+			{
 				return entry.getValue();
 			}
 		}
 		return null;
 	}
-	
+
 	@Override
 	public Map<String, Object> getKits()
 	{
@@ -184,9 +225,13 @@ public class Settings implements ISettings
 		String colorName = config.getString("ops-name-color", null);
 
 		if (colorName == null)
+		{
 			return ChatColor.RED;
-		if("none".equalsIgnoreCase(colorName) || colorName.isEmpty())
+		}
+		if ("none".equalsIgnoreCase(colorName) || colorName.isEmpty())
+		{
 			throw new Exception();
+		}
 
 		try
 		{
@@ -205,35 +250,23 @@ public class Settings implements ISettings
 		return config.getBoolean("reclaim-onlogout", true);
 	}
 
-	@Override
-	public String getNetherName()
-	{
-		return config.getString("nether.folder", "nether");
-	}
-
-	@Override
-	public boolean isNetherEnabled()
-	{
-		return config.getBoolean("nether.enabled", true);
-	}
-
 	@Override
 	public int getSpawnMobLimit()
 	{
 		return config.getInt("spawnmob-limit", 10);
 	}
-        
+
 	@Override
 	public boolean showNonEssCommandsInHelp()
 	{
 		return config.getBoolean("non-ess-in-help", true);
 	}
-        
+
 	@Override
-        public boolean hidePermissionlessHelp()
+	public boolean hidePermissionlessHelp()
 	{
 		return config.getBoolean("hide-permissionless-help", true);
-	}          
+	}
 
 	@Override
 	public int getProtectCreeperMaxHeight()
@@ -266,12 +299,6 @@ public class Settings implements ISettings
 								config.getString("chat.format", "&7[{GROUP}]&f {DISPLAYNAME}&7:&f {MESSAGE}"));
 	}
 
-	@Override
-	public boolean getGenerateExitPortals()
-	{
-		return config.getBoolean("nether.generate-exit-portals", true);
-	}
-
 	@Override
 	public boolean getAnnounceNewPlayers()
 	{
@@ -295,12 +322,13 @@ public class Settings implements ISettings
 	{
 		return config.getString("newbies.spawnpoint", "default");
 	}
+
 	@Override
-        public boolean getPerWarpPermission()
+	public boolean getPerWarpPermission()
 	{
 		return config.getBoolean("per-warp-permission", false);
 	}
-	
+
 	@Override
 	public boolean getSortListByGroups()
 	{
@@ -308,7 +336,8 @@ public class Settings implements ISettings
 	}
 
 	@Override
-	public void reloadConfig() {
+	public void reloadConfig()
+	{
 		config.load();
 	}
 
@@ -316,16 +345,21 @@ public class Settings implements ISettings
 	public List<Integer> itemSpawnBlacklist()
 	{
 		final List<Integer> epItemSpwn = new ArrayList<Integer>();
-		for (String itemName : config.getString("item-spawn-blacklist", "").split(",")) {
+		for (String itemName : config.getString("item-spawn-blacklist", "").split(","))
+		{
 			itemName = itemName.trim();
-			if (itemName.isEmpty()) {
+			if (itemName.isEmpty())
+			{
 				continue;
 			}
 			ItemStack is;
-			try {
+			try
+			{
 				is = ess.getItemDb().get(itemName);
 				epItemSpwn.add(is.getTypeId());
-			} catch (Exception ex) {
+			}
+			catch (Exception ex)
+			{
 				logger.log(Level.SEVERE, Util.format("unknownItemInList", itemName, "item-spawn-blacklist"));
 			}
 		}
@@ -344,21 +378,6 @@ public class Settings implements ISettings
 		return config.getBoolean("protect.disable.warn-on-build-disallow", false);
 	}
 
-	@Override
-	public boolean use1to1RatioInNether()
-	{
-		return config.getBoolean("nether.use-1to1-ratio", false);
-	}
-	
-	@Override
-	public double getNetherRatio()
-	{
-		if (config.getBoolean("nether.use-1to1-ratio", false)) {
-			return 1.0;
-		}
-		return config.getDouble("nether.ratio", 16.0);
-	}
-	
 	@Override
 	public boolean isDebug()
 	{
@@ -368,9 +387,9 @@ public class Settings implements ISettings
 	@Override
 	public boolean warnOnSmite()
 	{
-		return config.getBoolean("warn-on-smite" ,true);
+		return config.getBoolean("warn-on-smite", true);
 	}
-	
+
 	@Override
 	public boolean permissionBasedItemSpawn()
 	{
@@ -404,23 +423,28 @@ public class Settings implements ISettings
 	@Override
 	public boolean getProtectPreventSpawn(final String creatureName)
 	{
-		return config.getBoolean("protect.prevent.spawn."+creatureName, false);
+		return config.getBoolean("protect.prevent.spawn." + creatureName, false);
 	}
 
 	@Override
 	public List<Integer> getProtectList(final String configName)
 	{
 		final List<Integer> list = new ArrayList<Integer>();
-		for (String itemName : config.getString(configName, "").split(",")) {
+		for (String itemName : config.getString(configName, "").split(","))
+		{
 			itemName = itemName.trim();
-			if (itemName.isEmpty()) {
+			if (itemName.isEmpty())
+			{
 				continue;
 			}
 			ItemStack itemStack;
-			try {
+			try
+			{
 				itemStack = ess.getItemDb().get(itemName);
 				list.add(itemStack.getTypeId());
-			} catch (Exception ex) {
+			}
+			catch (Exception ex)
+			{
 				logger.log(Level.SEVERE, Util.format("unknownItemInList", itemName, configName));
 			}
 		}
@@ -438,12 +462,13 @@ public class Settings implements ISettings
 	{
 		return config.getBoolean(configName, def);
 	}
-
 	private final static double MAXMONEY = 10000000000000.0;
+
 	public double getMaxMoney()
 	{
 		double max = config.getDouble("max-money", MAXMONEY);
-		if (Math.abs(max) > MAXMONEY) {
+		if (Math.abs(max) > MAXMONEY)
+		{
 			max = max < 0 ? -MAXMONEY : MAXMONEY;
 		}
 		return max;
@@ -453,7 +478,7 @@ public class Settings implements ISettings
 	{
 		return config.getBoolean("economy-log-enabled", false);
 	}
-	
+
 	public boolean removeGodOnDisconnect()
 	{
 		return config.getBoolean("remove-god-on-disconnect", false);
@@ -473,4 +498,34 @@ public class Settings implements ISettings
 	{
 		return config.getBoolean("add-prefix-suffix", ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat"));
 	}
+
+	@Override
+	public boolean isUpdateEnabled()
+	{
+		return config.getBoolean("update-check", false);
+	}
+
+	@Override
+	public long getAutoAfk()
+	{
+		return config.getLong("auto-afk", 300);
+	}
+
+	@Override
+	public long getAutoAfkKick()
+	{
+		return config.getLong("auto-afk-kick", -1);
+	}
+
+	@Override
+	public boolean getFreezeAfkPlayers()
+	{
+		return config.getBoolean("freeze-afk-players", false);
+	}
+
+	@Override
+	public boolean areDeathMessagesEnabled()
+	{
+		return config.getBoolean("death-messages", true);
+	}
 }

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

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import net.minecraft.server.ChunkPosition;
 import net.minecraft.server.Packet60Explosion;
 import org.bukkit.Location;
@@ -52,6 +54,7 @@ public class TNTExplodeListener extends EntityListener implements Runnable
 		{
 			return;
 		}
+		try {
 		final Set<ChunkPosition> set = new HashSet<ChunkPosition>(event.blockList().size());
 		final Player[] players = ess.getServer().getOnlinePlayers();
 		final List<ChunkPosition> blocksUnderPlayers = new ArrayList<ChunkPosition>(players.length);
@@ -72,6 +75,9 @@ public class TNTExplodeListener extends EntityListener implements Runnable
 			}
 		}
 		((CraftServer)ess.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension, new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0F, set));
+		} catch (Throwable ex) {
+			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
+		}
 		event.setCancelled(true);
 	}
 

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

@@ -10,6 +10,7 @@ import org.bukkit.entity.Player;
 /**
  * Original authors: toi & Raphfrk
  */
+@Deprecated
 public class TargetBlock
 {
 	private transient final Location location;

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

@@ -1,5 +1,6 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
@@ -10,6 +11,8 @@ import org.bukkit.entity.Entity;
 public class Teleport implements Runnable
 {
 	private static final double MOVE_CONSTANT = 0.3;
+
+
 	private static class Target
 	{
 		private final Location location;
@@ -57,9 +60,9 @@ public class Teleport implements Runnable
 		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.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.teleportTarget = target;
 		this.chargeFor = chargeFor;
 	}
@@ -72,9 +75,9 @@ public class Teleport implements Runnable
 			cancel();
 			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
+		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
 			cancel(true);
@@ -92,7 +95,7 @@ public class Teleport implements Runnable
 				user.sendMessage(Util.i18n("teleportationCommencing"));
 				try
 				{
-					
+
 					now(teleportTarget);
 					if (chargeFor != null)
 					{
@@ -229,7 +232,7 @@ public class Teleport implements Runnable
 		cooldown(false);
 		now(new Target(loc));
 	}
-	
+
 	public void now(Location loc, Trade chargeFor) throws Exception
 	{
 		cooldown(false);
@@ -253,27 +256,15 @@ public class Teleport implements Runnable
 
 	public void back() throws Exception
 	{
-		back(null);
+		now(new Target(user.getLastLocation()));
 	}
 
-	public void home(Trade chargeFor) throws Exception
+	public void home(IUser user, String home, Trade chargeFor) throws Exception
 	{
-		home(user, chargeFor);
-	}
-
-	public void home(IUser user, Trade chargeFor) throws Exception
-	{
-		Location loc = user.getHome(this.user.getLocation());
+		final Location loc = user.getHome(home);
 		if (loc == null)
 		{
-			if (ess.getSettings().spawnIfNoHome())
-			{
-				respawn(ess.getSpawn(), chargeFor);
-			}
-			else
-			{
-				throw new Exception(user == this.user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer"));
-			}
+			throw new NotEnoughArgumentsException();
 		}
 		teleport(new Target(loc), chargeFor);
 	}

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

@@ -18,22 +18,22 @@ public class Trade
 	private final transient Double money;
 	private final transient ItemStack itemStack;
 	private final transient IEssentials ess;
-
+	
 	public Trade(final String command, final IEssentials ess)
 	{
 		this(command, null, null, ess);
 	}
-
+	
 	public Trade(final double money, final IEssentials ess)
 	{
 		this(null, money, null, ess);
 	}
-
+	
 	public Trade(final ItemStack items, final IEssentials ess)
 	{
 		this(null, null, items, ess);
 	}
-
+	
 	private Trade(final String command, final Double money, final ItemStack item, final IEssentials ess)
 	{
 		this.command = command;
@@ -41,7 +41,7 @@ public class Trade
 		this.itemStack = item;
 		this.ess = ess;
 	}
-
+	
 	public void isAffordableFor(final IUser user) throws ChargeException
 	{
 		final double mon = user.getMoney();
@@ -52,13 +52,13 @@ public class Trade
 		{
 			throw new ChargeException(Util.i18n("notEnoughMoney"));
 		}
-
+		
 		if (getItemStack() != null
 			&& !InventoryWorkaround.containsItem(user.getInventory(), true, itemStack))
 		{
 			throw new ChargeException(Util.format("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase().replace("_", " ")));
 		}
-
+		
 		if (command != null && !command.isEmpty()
 			&& !user.isAuthorized("essentials.nocommandcost.all")
 			&& !user.isAuthorized("essentials.nocommandcost." + command)
@@ -69,24 +69,38 @@ public class Trade
 			throw new ChargeException(Util.i18n("notEnoughMoney"));
 		}
 	}
-
+	
 	public void pay(final IUser user)
 	{
+		pay(user, true);
+	}
+	
+	public boolean pay(final IUser user, final boolean dropItems)
+	{
+		boolean success = true;
 		if (getMoney() != null && getMoney() > 0)
 		{
 			user.giveMoney(getMoney());
 		}
 		if (getItemStack() != null)
 		{
-			final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
-			for (ItemStack itemStack : leftOver.values())
+			if (dropItems)
 			{
-				InventoryWorkaround.dropItem(user.getLocation(), itemStack);
+				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getInventory(), true, getItemStack());
+				for (ItemStack itemStack : leftOver.values())
+				{
+					InventoryWorkaround.dropItem(user.getLocation(), itemStack);
+				}
+			}
+			else
+			{
+				success = InventoryWorkaround.addAllItems(user.getInventory(), true, getItemStack());
 			}
 			user.updateInventory();
 		}
+		return success;
 	}
-
+	
 	public void charge(final IUser user) throws ChargeException
 	{
 		if (getMoney() != null)
@@ -120,18 +134,18 @@ public class Trade
 			user.takeMoney(cost);
 		}
 	}
-
+	
 	public Double getMoney()
 	{
 		return money;
 	}
-
+	
 	public ItemStack getItemStack()
 	{
 		return itemStack;
 	}
 	private static FileWriter fw = null;
-
+	
 	public static void log(String type, String subtype, String event, String sender, Trade charge, String receiver, Trade pay, Location loc, IEssentials ess)
 	{
 		if (!ess.getSettings().isEcoLogEnabled())
@@ -225,10 +239,11 @@ public class Trade
 			Logger.getLogger("Minecraft").log(Level.SEVERE, null, ex);
 		}
 	}
-
+	
 	public static void closeLog()
 	{
-		if (fw != null) {
+		if (fw != null)
+		{
 			try
 			{
 				fw.close();

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

@@ -4,67 +4,77 @@ import com.earth2me.essentials.commands.IEssentialsCommand;
 import com.earth2me.essentials.register.payment.Method;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.logging.Logger;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
 public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 {
-	private static final Logger logger = Logger.getLogger("Minecraft");
 	private boolean justPortaled = false;
 	private CommandSender replyTo = null;
-	private User teleportRequester;
-	private boolean teleportRequestHere;
-	private final Teleport teleport;
-	private long lastActivity;
+	private transient User teleportRequester;
+	private transient boolean teleportRequestHere;
+	private transient final Teleport teleport;
+	private transient long lastOnlineActivity;
+	private transient long lastActivity = System.currentTimeMillis();
 	private boolean hidden = false;
-	
-	User(Player base, IEssentials ess)
+	private transient Location afkPosition;
+
+	User(final Player base, final IEssentials ess)
 	{
 		super(base, ess);
 		teleport = new Teleport(this, ess);
+		afkPosition = getLocation();
 	}
-	
-	User update(Player base)
+
+	User update(final Player base)
 	{
 		setBase(base);
 		return this;
 	}
-	
-	public boolean isAuthorized(IEssentialsCommand cmd)
+
+	@Override
+	public boolean isAuthorized(final IEssentialsCommand cmd)
 	{
 		return isAuthorized(cmd, "essentials.");
 	}
-	
-	public boolean isAuthorized(IEssentialsCommand cmd, String permissionPrefix)
+
+	@Override
+	public boolean isAuthorized(final IEssentialsCommand cmd, final String permissionPrefix)
 	{
 		return isAuthorized(permissionPrefix + (cmd.getName().equals("r") ? "msg" : cmd.getName()));
 	}
-	
-	public boolean isAuthorized(String node)
+
+	@Override
+	public boolean isAuthorized(final String node)
 	{
+		if (base instanceof OfflinePlayer)
+		{
+			return false;
+		}
+
 		if (isOp())
 		{
 			return true;
 		}
-		
+
 		if (isJailed())
 		{
 			return false;
 		}
-		
-		return ess.getPermissionsHandler().hasPermission(this, node);
+
+		return ess.getPermissionsHandler().hasPermission(base, node);
 	}
-	
+
 	public void healCooldown() throws Exception
 	{
-		Calendar now = new GregorianCalendar();
+		final Calendar now = new GregorianCalendar();
 		if (getLastHealTimestamp() > 0)
 		{
-			double cooldown = ess.getSettings().getHealCooldown();
-			Calendar cooldownTime = new GregorianCalendar();
+			final double cooldown = ess.getSettings().getHealCooldown();
+			final Calendar cooldownTime = new GregorianCalendar();
 			cooldownTime.setTimeInMillis(getLastHealTimestamp());
 			cooldownTime.add(Calendar.SECOND, (int)cooldown);
 			cooldownTime.add(Calendar.MILLISECOND, (int)((cooldown * 1000.0) % 1000.0));
@@ -75,13 +85,14 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		setLastHealTimestamp(now.getTimeInMillis());
 	}
-	
-	public void giveMoney(double value)
+
+	@Override
+	public void giveMoney(final double value)
 	{
 		giveMoney(value, null);
 	}
-	
-	public void giveMoney(double value, CommandSender initiator)
+
+	public void giveMoney(final double value, final CommandSender initiator)
 	{
 		if (value == 0)
 		{
@@ -91,35 +102,36 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		sendMessage(Util.format("addedToAccount", Util.formatCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage((Util.format("addedToOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName())));
+			initiator.sendMessage(Util.format("addedToOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
 		}
 	}
-	
-	public void payUser(User reciever, double value) throws Exception
+
+	public void payUser(final User reciever, final double value) throws Exception
 	{
 		if (value == 0)
 		{
 			return;
 		}
-		if (!canAfford(value))
-		{
-			throw new Exception(Util.i18n("notEnoughMoney"));
-		}
-		else
+		if (canAfford(value))
 		{
 			setMoney(getMoney() - value);
 			reciever.setMoney(reciever.getMoney() + value);
 			sendMessage(Util.format("moneySentTo", Util.formatCurrency(value, ess), reciever.getDisplayName()));
 			reciever.sendMessage(Util.format("moneyRecievedFrom", Util.formatCurrency(value, ess), getDisplayName()));
 		}
+		else
+		{
+			throw new Exception(Util.i18n("notEnoughMoney"));
+		}
 	}
-	
-	public void takeMoney(double value)
+
+	@Override
+	public void takeMoney(final double value)
 	{
 		takeMoney(value, null);
 	}
-	
-	public void takeMoney(double value, CommandSender initiator)
+
+	public void takeMoney(final double value, final CommandSender initiator)
 	{
 		if (value == 0)
 		{
@@ -129,99 +141,108 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		sendMessage(Util.format("takenFromAccount", Util.formatCurrency(value, ess)));
 		if (initiator != null)
 		{
-			initiator.sendMessage((Util.format("takenFromOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName())));
+			initiator.sendMessage(Util.format("takenFromOthersAccount", Util.formatCurrency(value, ess), this.getDisplayName()));
 		}
 	}
-	
-	public boolean canAfford(double cost)
+
+	public boolean canAfford(final double cost)
 	{
-		double mon = getMoney();
+		final double mon = getMoney();
 		return mon >= cost || isAuthorized("essentials.eco.loan");
 	}
-	
+
 	public void dispose()
 	{
 		this.base = new OfflinePlayer(getName(), ess);
 	}
-	
+
 	public boolean getJustPortaled()
 	{
 		return justPortaled;
 	}
-	
-	public void setJustPortaled(boolean value)
+
+	public void setJustPortaled(final boolean value)
 	{
 		justPortaled = value;
 	}
-	
-	public void setReplyTo(CommandSender user)
+
+	@Override
+	public void setReplyTo(final CommandSender user)
 	{
 		replyTo = user;
 	}
-	
+
+	@Override
 	public CommandSender getReplyTo()
 	{
 		return replyTo;
 	}
-	
-	public int compareTo(User t)
-	{
-		return ChatColor.stripColor(this.getDisplayName()).compareToIgnoreCase(ChatColor.stripColor(t.getDisplayName()));
-	}
-	
+
 	@Override
-	public boolean equals(Object o)
+	public int compareTo(final User other)
 	{
-		if (!(o instanceof User))
+		return ChatColor.stripColor(this.getDisplayName()).compareToIgnoreCase(ChatColor.stripColor(other.getDisplayName()));
+	}
+
+	@Override
+	public boolean equals(final Object object)
+	{
+		if (!(object instanceof User))
 		{
 			return false;
 		}
-		return ChatColor.stripColor(this.getDisplayName()).equalsIgnoreCase(ChatColor.stripColor(((User)o).getDisplayName()));
-		
+		return ChatColor.stripColor(this.getDisplayName()).equalsIgnoreCase(ChatColor.stripColor(((User)object).getDisplayName()));
+
 	}
-	
+
 	@Override
 	public int hashCode()
 	{
 		return ChatColor.stripColor(this.getDisplayName()).hashCode();
 	}
-	
-	public Boolean canSpawnItem(int itemId)
+
+	public Boolean canSpawnItem(final int itemId)
 	{
 		return !ess.getSettings().itemSpawnBlacklist().contains(itemId);
 	}
-	
+
+	public Location getHome() throws Exception
+	{
+		return getHome(getHomes().get(0));
+	}
+
 	public void setHome()
 	{
-		setHome(getLocation(), true);
+		setHome("home", getLocation());
 	}
-	
-	public void setHome(boolean defaultHome)
+
+	public void setHome(final String name)
 	{
-		setHome(getLocation(), defaultHome);
+		setHome(name, getLocation());
 	}
-	
+
+	@Override
 	public void setLastLocation()
 	{
 		setLastLocation(getLocation());
 	}
-	
-	public void requestTeleport(User player, boolean here)
+
+	public void requestTeleport(final User player, final boolean here)
 	{
 		teleportRequester = player;
 		teleportRequestHere = here;
 	}
-	
+
 	public User getTeleportRequest()
 	{
 		return teleportRequester;
 	}
-	
+
 	public boolean isTeleportRequestHere()
 	{
 		return teleportRequestHere;
 	}
-	
+
 	public String getNick()
 	{
 		final StringBuilder nickname = new StringBuilder();
@@ -245,12 +266,12 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			{
 			}
 		}
-		
+
 		if (ess.getSettings().addPrefixSuffix())
 		{
-			final String prefix = ess.getPermissionsHandler().getPrefix(this).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
-			final String suffix = ess.getPermissionsHandler().getSuffix(this).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
-			
+			final String prefix = ess.getPermissionsHandler().getPrefix(base).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+			final String suffix = ess.getPermissionsHandler().getSuffix(base).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+
 			nickname.insert(0, prefix);
 			nickname.append(suffix);
 			if (suffix.length() < 2 || !suffix.substring(suffix.length() - 2, suffix.length() - 1).equals("§"))
@@ -258,25 +279,41 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 				nickname.append("§f");
 			}
 		}
-		
+
 		return nickname.toString();
 	}
-	
+
+	public void setDisplayNick(String name)
+	{
+		setDisplayName(name);
+		//TODO: Maybe we need to limit nick length, or try use a string trim.
+		if (name.length() <= 16)
+		{
+			setPlayerListName(name);
+		}
+	}
+
+	@Override
+	public String getDisplayName()
+	{
+		return super.getDisplayName() == null ? super.getName() : super.getDisplayName();
+	}
+
 	public Teleport getTeleport()
 	{
 		return teleport;
 	}
-	
-	public long getLastActivity()
+
+	public long getLastOnlineActivity()
 	{
-		return lastActivity;
+		return lastOnlineActivity;
 	}
-	
-	public void setLastActivity(long timestamp)
+
+	public void setLastOnlineActivity(final long timestamp)
 	{
-		lastActivity = timestamp;
+		lastOnlineActivity = timestamp;
 	}
-	
+
 	@Override
 	public double getMoney()
 	{
@@ -284,12 +321,12 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		{
 			try
 			{
-				Method method = ess.getPaymentMethod().getMethod();
+				final Method method = ess.getPaymentMethod().getMethod();
 				if (!method.hasAccount(this.getName()))
 				{
 					throw new Exception();
 				}
-				Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
 				return account.balance();
 			}
 			catch (Throwable ex)
@@ -298,20 +335,20 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		return super.getMoney();
 	}
-	
+
 	@Override
-	public void setMoney(double value)
+	public void setMoney(final double value)
 	{
 		if (ess.getPaymentMethod().hasMethod())
 		{
 			try
 			{
-				Method method = ess.getPaymentMethod().getMethod();
+				final Method method = ess.getPaymentMethod().getMethod();
 				if (!method.hasAccount(this.getName()))
 				{
 					throw new Exception();
 				}
-				Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
+				final Method.MethodAccount account = ess.getPaymentMethod().getMethod().getAccount(this.getName());
 				account.set(value);
 			}
 			catch (Throwable ex)
@@ -320,33 +357,38 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 		}
 		super.setMoney(value);
 	}
-	
+
 	@Override
-	public void setAfk(boolean set)
+	public void setAfk(final boolean set)
 	{
 		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : set);
+		if (set && !isAfk())
+		{
+			afkPosition = getLocation();
+		}
 		super.setAfk(set);
 	}
-	
+
 	@Override
 	public boolean toggleAfk()
 	{
-		boolean now = super.toggleAfk();
+		final boolean now = super.toggleAfk();
 		this.setSleepingIgnored(this.isAuthorized("essentials.sleepingignored") ? true : now);
 		return now;
 	}
-	
+
 	public boolean isHidden()
 	{
 		return hidden;
 	}
-	
-	public void setHidden(boolean hidden)
+
+	public void setHidden(final boolean hidden)
 	{
 		this.hidden = hidden;
 	}
-	
-	public void checkJailTimeout(final long currentTime)
+
+	//Returns true if status expired during this check
+	public boolean checkJailTimeout(final long currentTime)
 	{
 		if (getJailTimeout() > 0 && getJailTimeout() < currentTime && isJailed())
 		{
@@ -361,25 +403,97 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			catch (Exception ex)
 			{
 			}
+			return true;
 		}
+		return false;
 	}
-	
-	public void checkMuteTimeout(final long currentTime)
+
+	//Returns true if status expired during this check
+	public boolean checkMuteTimeout(final long currentTime)
 	{
 		if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted())
 		{
 			setMuteTimeout(0);
 			sendMessage(Util.i18n("canTalkAgain"));
 			setMuted(false);
+			return true;
 		}
+		return false;
 	}
-	
-	public void checkBanTimeout(final long currentTime)
+
+	//Returns true if status expired during this check
+	public boolean checkBanTimeout(final long currentTime)
 	{
-		if (getBanTimeout() > 0 && getBanTimeout() < currentTime && ess.getBans().isNameBanned(getName()))
+		if (getBanTimeout() > 0 && getBanTimeout() < currentTime && isBanned())
 		{
 			setBanTimeout(0);
-			ess.getBans().unbanByName(getName());
+			setBanned(false);
+			return true;
+		}
+		return false;
+	}
+
+	public void updateActivity(final boolean broadcast)
+	{
+		if (isAfk())
+		{
+			setAfk(false);
+			if (broadcast && !isHidden())
+			{
+				ess.broadcastMessage(this, Util.format("userIsNotAway", getDisplayName()));
+			}
+		}
+		lastActivity = System.currentTimeMillis();
+	}
+
+	public void checkActivity()
+	{
+		final long autoafkkick = ess.getSettings().getAutoAfkKick();
+		if (autoafkkick > 0 && lastActivity + autoafkkick * 1000 < System.currentTimeMillis()
+			&& !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt"))
+		{
+			final String kickReason = Util.format("autoAfkKickReason", autoafkkick / 60.0);
+			kickPlayer(kickReason);
+
+
+			for (Player player : ess.getServer().getOnlinePlayers())
+			{
+				final User user = ess.getUser(player);
+				if (user.isAuthorized("essentials.kick.notify"))
+				{
+					player.sendMessage(Util.format("playerKicked", Console.NAME, getName(), kickReason));
+				}
+			}
+		}
+		final long autoafk = ess.getSettings().getAutoAfk();
+		if (!isAfk() && autoafk > 0 && lastActivity + autoafk * 1000 < System.currentTimeMillis() && isAuthorized("essentials.afk"))
+		{
+			setAfk(true);
+			if (!isHidden())
+			{
+				ess.broadcastMessage(this, Util.format("userIsAway", getDisplayName()));
+			}
 		}
 	}
+
+	public Location getAfkPosition()
+	{
+		return afkPosition;
+	}
+
+	@Override
+	public boolean toggleGodModeEnabled()
+	{
+		if (!isGodModeEnabled())
+		{
+			setFoodLevel(20);
+		}
+		return super.toggleGodModeEnabled();
+	}
+
+	@Override
+	public boolean isGodModeEnabled()
+	{
+		return super.isGodModeEnabled() || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
+	}
 }

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

@@ -1,15 +1,14 @@
 package com.earth2me.essentials;
 
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 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.World;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -36,7 +35,8 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.load();
 		money = _getMoney();
 		unlimited = _getUnlimited();
-		powertools = getPowertools();
+		powertools = _getPowertools();
+		homes = _getHomes();
 		lastLocation = _getLastLocation();
 		lastTeleportTimestamp = _getLastTeleportTimestamp();
 		lastHealTimestamp = _getLastHealTimestamp();
@@ -57,6 +57,8 @@ public abstract class UserData extends PlayerExtension implements IConf
 		geolocation = _getGeoLocation();
 		isSocialSpyEnabled = _isSocialSpyEnabled();
 		isNPC = _isNPC();
+		arePowerToolsEnabled = _arePowerToolsEnabled();
+		kitTimestamps = _getKitTimestamps();
 	}
 	private double money;
 
@@ -89,6 +91,96 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("money", value);
 		config.save();
 	}
+	private Map<String, Object> homes;
+
+	private Map<String, Object> _getHomes()
+	{
+		Object o = config.getProperty("homes");
+
+		if (o instanceof Map)
+		{
+			return (Map<String, Object>)o;
+		}
+		else
+		{
+			return new HashMap<String, Object>();
+		}
+
+	}
+
+	public Location getHome(String name) throws Exception
+	{
+		Location loc = config.getLocation("homes." + name, getServer());
+		if (loc == null)
+		{
+			try
+			{
+				loc = config.getLocation("homes." + getHomes().get(Integer.parseInt(name) - 1), getServer());
+			}
+			catch (IndexOutOfBoundsException e)
+			{
+				return null;
+			}
+			catch (NumberFormatException e)
+			{
+				return null;
+			}
+		}
+
+		return loc;
+	}
+
+	public Location getHome(Location world) throws Exception
+	{
+		Location loc;
+		for (String home : getHomes())
+		{
+			loc = config.getLocation("homes." + home, getServer());
+			if (world.getWorld() == loc.getWorld())
+			{
+				return loc;
+			}
+
+		}
+		loc = config.getLocation("homes." + getHomes().get(0), getServer());
+		return loc;
+	}
+
+	public List<String> getHomes()
+	{
+		List<String> list = new ArrayList(homes.keySet());
+		return list;
+
+	}
+
+	public void setHome(String name, Location loc)
+	{
+		//Invalid names will corrupt the yaml
+		name = Util.sanitizeFileName(name);
+		homes.put(name, loc);
+		config.setProperty("homes." + name, loc);
+		config.save();
+	}
+
+	public void delHome(String name) throws Exception
+	{
+		String search = name;
+		if (!homes.containsKey(search))
+		{
+			search = Util.sanitizeFileName(name);
+		}
+		if (homes.containsKey(search))
+		{
+			homes.remove(name);
+			config.removeProperty("homes." + name);
+			config.save();
+		}
+		else
+		{
+			//TODO: move this message to messages file
+			throw new Exception("Home " + name + " doesn't exist");
+		}
+	}
 
 	public boolean hasHome()
 	{
@@ -99,40 +191,6 @@ public abstract class UserData extends PlayerExtension implements IConf
 		return false;
 	}
 
-	public Location getHome(Location location)
-	{
-		if (!hasHome())
-		{
-			return null;
-		}
-		World world = location.getWorld();
-		String worldHome = "home.worlds." + world.getName().toLowerCase();
-		if (!config.hasProperty(worldHome))
-		{
-			String defaultWorld = config.getString("home.default");
-			worldHome = "home.worlds." + defaultWorld;
-		}
-		Location loc = config.getLocation(worldHome, getServer());
-		return loc;
-	}
-
-	public void setHome(Location loc, boolean b)
-	{
-		String worldName = loc.getWorld().getName().toLowerCase();
-		if (worldName == null || worldName.isEmpty())
-		{
-			logger.log(Level.WARNING, Util.i18n("emptyWorldName"));
-			return;
-		}
-		if (b || !config.hasProperty("home.default"))
-		{
-			config.setProperty("home.default", worldName);
-		}
-
-		config.setProperty("home.worlds." + worldName, loc);
-		config.save();
-	}
-
 	public String getNickname()
 	{
 		return config.getString("nickname");
@@ -173,46 +231,66 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("unlimited", unlimited);
 		config.save();
 	}
-	private Map<Integer, String> powertools;
+	private Map<Integer, Object> powertools;
 
 	@SuppressWarnings("unchecked")
-	private Map<Integer, String> getPowertools()
+	private Map<Integer, Object> _getPowertools()
 	{
 		Object o = config.getProperty("powertools");
+
 		if (o instanceof Map)
 		{
-			return (Map<Integer, String>)o;
+			return (Map<Integer, Object>)o;
 		}
 		else
 		{
-			return new HashMap<Integer, String>();
+			return new HashMap<Integer, Object>();
 		}
 
 	}
 
-	public String getPowertool(ItemStack stack)
+	public void clearAllPowertools()
 	{
-		return powertools.get(stack.getTypeId());
+		powertools.clear();
+		config.setProperty("powertools", powertools);
+		config.save();
 	}
 
-	public void setPowertool(ItemStack stack, String command)
+	public List<String> getPowertool(ItemStack stack)
 	{
-		if (command == null || command.isEmpty())
+		return (List<String>)powertools.get(stack.getTypeId());
+	}
+
+	public void setPowertool(ItemStack stack, List<String> commandList)
+	{
+		if (commandList == null || commandList.isEmpty())
 		{
 			powertools.remove(stack.getTypeId());
 		}
 		else
 		{
-			powertools.put(stack.getTypeId(), command);
+			powertools.put(stack.getTypeId(), commandList);
 		}
 		config.setProperty("powertools", powertools);
 		config.save();
 	}
+
+	public boolean hasPowerTools()
+	{
+		return powertools.size() > 0;
+	}
 	private Location lastLocation;
 
 	private Location _getLastLocation()
 	{
-		return config.getLocation("lastlocation", getServer());
+		try
+		{
+			return config.getLocation("lastlocation", getServer());
+		}
+		catch (Exception e)
+		{
+			return null;
+		}
 	}
 
 	public Location getLastLocation()
@@ -222,6 +300,10 @@ public abstract class UserData extends PlayerExtension implements IConf
 
 	public void setLastLocation(Location loc)
 	{
+		if (loc == null || loc.getWorld() == null)
+		{
+			return;
+		}
 		lastLocation = loc;
 		config.setProperty("lastlocation", loc);
 		config.save();
@@ -709,4 +791,57 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.setProperty("npc", set);
 		config.save();
 	}
+	private boolean arePowerToolsEnabled;
+
+	public boolean arePowerToolsEnabled()
+	{
+		return arePowerToolsEnabled;
+	}
+
+	public void setPowerToolsEnabled(boolean set)
+	{
+		arePowerToolsEnabled = set;
+		config.setProperty("powertoolsenabled", set);
+		config.save();
+	}
+
+	public boolean togglePowerToolsEnabled()
+	{
+		boolean ret = !arePowerToolsEnabled();
+		setPowerToolsEnabled(ret);
+		return ret;
+	}
+
+	private boolean _arePowerToolsEnabled()
+	{
+		return config.getBoolean("powertoolsenabled", true);
+	}
+	private Map<String, Object> kitTimestamps;
+
+	private Map<String, Object> _getKitTimestamps()
+	{
+		final Object map = config.getProperty("timestamps.kits");
+
+		if (map instanceof Map)
+		{
+			return (Map<String, Object>)map;
+		}
+		else
+		{
+			return new HashMap<String, Object>();
+		}
+	}
+
+	public Long getKitTimestamp(final String name)
+	{
+		final Number num = (Number)kitTimestamps.get(name.toLowerCase());
+		return num == null ? null : num.longValue();
+	}
+
+	public void setKitTimestamp(final String name, final long time)
+	{
+		kitTimestamps.put(name.toLowerCase(), time);
+		config.setProperty("timestamps.kits", kitTimestamps);
+		config.save();
+	}
 }

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

@@ -1,11 +1,14 @@
 package com.earth2me.essentials;
 
 import com.google.common.base.Function;
+import com.google.common.collect.ComputationException;
 import com.google.common.collect.MapMaker;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
+import java.util.logging.Level;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 
@@ -47,6 +50,10 @@ public class UserMap implements Function<String, User>, IConf
 					{
 						// Ignore these
 					}
+					catch (ComputationException ex)
+					{
+						Bukkit.getLogger().log(Level.INFO, "Failed to preload user "+name, ex);
+					}
 				}
 			}
 		});

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

@@ -14,9 +14,12 @@ import java.text.MessageFormat;
 import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.GregorianCalendar;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -216,6 +219,46 @@ public class Util
 		return c.getTimeInMillis();
 	}
 
+	// The player can stand inside these materials 
+	private static final Set<Integer> AIR_MATERIALS = new HashSet<Integer>();
+	
+	static {
+		AIR_MATERIALS.add(Material.AIR.getId());
+		AIR_MATERIALS.add(Material.SAPLING.getId());
+		AIR_MATERIALS.add(Material.POWERED_RAIL.getId());
+		AIR_MATERIALS.add(Material.DETECTOR_RAIL.getId());
+		AIR_MATERIALS.add(Material.LONG_GRASS.getId());
+		AIR_MATERIALS.add(Material.DEAD_BUSH.getId());
+		AIR_MATERIALS.add(Material.YELLOW_FLOWER.getId());
+		AIR_MATERIALS.add(Material.RED_ROSE.getId());
+		AIR_MATERIALS.add(Material.BROWN_MUSHROOM.getId());
+		AIR_MATERIALS.add(Material.RED_MUSHROOM.getId());	
+		AIR_MATERIALS.add(Material.TORCH.getId());
+		AIR_MATERIALS.add(Material.REDSTONE_WIRE.getId());
+		AIR_MATERIALS.add(Material.SEEDS.getId());
+		AIR_MATERIALS.add(Material.SIGN_POST.getId());
+		AIR_MATERIALS.add(Material.WOODEN_DOOR.getId());
+		AIR_MATERIALS.add(Material.LADDER.getId());
+		AIR_MATERIALS.add(Material.RAILS.getId());
+		AIR_MATERIALS.add(Material.WALL_SIGN.getId());
+		AIR_MATERIALS.add(Material.LEVER.getId());
+		AIR_MATERIALS.add(Material.STONE_PLATE.getId());
+		AIR_MATERIALS.add(Material.IRON_DOOR_BLOCK.getId());
+		AIR_MATERIALS.add(Material.WOOD_PLATE.getId());	
+		AIR_MATERIALS.add(Material.REDSTONE_TORCH_OFF.getId());
+		AIR_MATERIALS.add(Material.REDSTONE_TORCH_ON.getId());
+		AIR_MATERIALS.add(Material.STONE_BUTTON.getId());
+		AIR_MATERIALS.add(Material.SUGAR_CANE_BLOCK.getId());		
+		AIR_MATERIALS.add(Material.DIODE_BLOCK_OFF.getId());
+		AIR_MATERIALS.add(Material.DIODE_BLOCK_ON.getId());		
+		AIR_MATERIALS.add(Material.TRAP_DOOR.getId());
+		AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId());
+		AIR_MATERIALS.add(Material.MELON_STEM.getId());
+		AIR_MATERIALS.add(Material.VINE.getId());
+		//TODO: Add 1.9 materials
+				
+	}
+	
 	public static Location getSafeDestination(final Location loc) throws Exception
 	{
 		if (loc == null || loc.getWorld() == null)
@@ -224,7 +267,7 @@ public class Util
 		}
 		final World world = loc.getWorld();
 		int x = loc.getBlockX();
-		int y = loc.getBlockY();
+		int y = (int)Math.round(loc.getY());
 		int z = loc.getBlockZ();
 	
 		while (isBlockAboveAir(world, x, y, z))
@@ -263,7 +306,7 @@ public class Util
 
 	private static boolean isBlockAboveAir(final World world, final int x, final int y, final int z)
 	{
-		return world.getBlockAt(x, y - 1, z).getType() == Material.AIR;
+		return AIR_MATERIALS.contains(world.getBlockAt(x, y - 1, z).getType().getId());
 	}
 
 	public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
@@ -279,8 +322,8 @@ public class Util
 			return true;
 		}
 
-		if ((world.getBlockAt(x, y, z).getType() != Material.AIR)
-			|| (world.getBlockAt(x, y + 1, z).getType() != Material.AIR))
+		if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
+			|| (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
 		{
 			return true;
 		}
@@ -469,17 +512,34 @@ public class Util
 
 	public static String joinList(Object... list)
 	{
-		final StringBuilder buf = new StringBuilder();
-		boolean first = true;
+		return joinList(", ", list);
+	}
+	
+	public static String joinList(String seperator, Object... list)
+	{
+		StringBuilder buf = new StringBuilder();
 		for (Object each : list)
 		{
-			if (!first)
+			if (buf.length() > 0)
 			{
-				buf.append(", ");
-
+				buf.append(seperator);
+			}
+			
+			if(each instanceof List)
+			{
+				buf.append(joinList(seperator, ((List)each).toArray()));
+			}
+			else
+			{
+				try 
+				{
+					buf.append(each.toString());
+				}
+				catch (Exception e)
+				{
+					buf.append(each.toString());
+				}
 			}
-			first = false;
-			buf.append(each);
 		}
 		return buf.toString();
 	}
@@ -487,5 +547,5 @@ public class Util
 	public static String capitalCase(String s)
 	{
 		return s.toUpperCase().charAt(0) + s.toLowerCase().substring(1);
-	}
+	}	
 }

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

@@ -21,6 +21,7 @@ public final class Economy
 	}
 	private static final Logger logger = Logger.getLogger("Minecraft");
 	private static IEssentials ess;
+	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
 
 	/**
 	 * @param aEss the ess to set
@@ -66,6 +67,10 @@ public final class Economy
 
 	private static User getUserByName(String name)
 	{
+		if (ess == null)
+		{
+			throw new RuntimeException(noCallBeforeLoad);
+		}
 		User user;
 		Player player = ess.getServer().getPlayer(name);
 		if (player != null)
@@ -176,6 +181,10 @@ public final class Economy
 	 */
 	public static void resetBalance(String name) throws UserDoesNotExistException, NoLoanPermittedException
 	{
+		if (ess == null)
+		{
+			throw new RuntimeException(noCallBeforeLoad);
+		}
 		setMoney(name, ess.getSettings().getStartingBalance());
 	}
 
@@ -231,6 +240,10 @@ public final class Economy
 	 */
 	public static String format(double amount)
 	{
+		if (ess == null)
+		{
+			throw new RuntimeException(noCallBeforeLoad);
+		}
 		return Util.formatCurrency(amount, ess);
 	}
 

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

@@ -15,8 +15,6 @@ public class Commandafk extends EssentialsCommand
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		charge(user);
-
 		if (args.length > 0 && user.isAuthorized("essentials.afk.others"))
 		{
 			User afkUser = ess.getUser(ess.getServer().matchPlayer(args[0]));
@@ -35,13 +33,20 @@ public class Commandafk extends EssentialsCommand
 	{
 		if (!user.toggleAfk())
 		{
-			user.sendMessage(Util.i18n("markedAsNotAway"));
-			ess.broadcastMessage(user.getName(), Util.format("userIsNotAway", user.getDisplayName()));
+			//user.sendMessage(Util.i18n("markedAsNotAway"));
+			if (!user.isHidden())
+			{
+				ess.broadcastMessage(user, Util.format("userIsNotAway", user.getDisplayName()));
+			}
+			user.updateActivity(false);
 		}
 		else
 		{
-			user.sendMessage(Util.i18n("markedAsAway"));
-			ess.broadcastMessage(user.getName(), Util.format("userIsAway", user.getDisplayName()));
+			//user.sendMessage(Util.i18n("markedAsAway"));
+			if (!user.isHidden())
+			{
+				ess.broadcastMessage(user, Util.format("userIsAway", user.getDisplayName()));
+			}
 		}
 	}
 }

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

@@ -17,9 +17,8 @@ public class Commandantioch extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		charge(user);
-		ess.broadcastMessage(user.getName(), "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
-		ess.broadcastMessage(user.getName(), "who being naughty in My sight, shall snuff it.");
+		ess.broadcastMessage(user, "...lobbest thou thy Holy Hand Grenade of Antioch towards thy foe,");
+		ess.broadcastMessage(user, "who being naughty in My sight, shall snuff it.");
 
 		final Location loc = new TargetBlock(user).getTargetBlock().getLocation();
 		loc.getWorld().spawn(loc, TNTPrimed.class);

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

@@ -19,9 +19,8 @@ public class Commandbackup extends EssentialsCommand
 		Backup backup = ess.getBackup();
 		if (backup == null)
 		{
-			return;
+			throw new Exception();
 		}
-		charge(sender);
 		backup.run();
 		sender.sendMessage(Util.i18n("backupStarted"));
 	}

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

@@ -26,7 +26,6 @@ public class Commandbalance extends EssentialsCommand
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		charge(user);
 		double bal = (args.length < 1
 					  || !(user.isAuthorized("essentials.balance.others")
 						   || user.isAuthorized("essentials.balance.other"))

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

@@ -46,14 +46,14 @@ public class Commandban extends EssentialsCommand
 		if (args.length > 1)
 		{
 			banReason = getFinalArg(args, 1);
-			player.setBanReason(commandLabel);
+			player.setBanReason(banReason);
 		}
 		else
 		{
 			banReason = Util.i18n("defaultBanReason");
 		}
+		player.setBanned(true);
 		player.kickPlayer(banReason);
-		ess.getBans().banByName(player.getName());
 		String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
 		
 		for(Player p : server.getOnlinePlayers())

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

@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
@@ -13,14 +14,24 @@ public class Commandbanip extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		ess.getBans().banByIp(args[0]);
-		sender.sendMessage(Util.i18n("banIpAddress"));
+		final User u = ess.getUser(args[0]);
+
+		if (u == null)
+		{
+			ess.getServer().banIP(args[0]);
+			sender.sendMessage(Util.i18n("banIpAddress"));
+		}
+		else
+		{
+			ess.getServer().banIP(u.getAddress().getAddress().getHostAddress());
+			sender.sendMessage(Util.i18n("banIpAddress"));
+		}
 	}
 }

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

@@ -41,12 +41,11 @@ public class Commandbigtree extends EssentialsCommand
 		final boolean success = user.getWorld().generateTree(safeLocation, (TreeType)tree);
 		if (success)
 		{
-			charge(user);
 			user.sendMessage(Util.i18n("bigTreeSuccess"));
 		}
 		else
 		{
-			user.sendMessage(Util.i18n("bigTreeFailure"));
+			throw new Exception(Util.i18n("bigTreeFailure"));
 		}
 	}
 }

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

@@ -1,6 +1,5 @@
 package com.earth2me.essentials.commands;
 
-import com.earth2me.essentials.Console;
 import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
@@ -15,15 +14,14 @@ public class Commandbroadcast extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 
-		charge(sender);
-		ess.broadcastMessage(sender instanceof Player ? ((Player)sender).getName() : Console.NAME,
+		ess.broadcastMessage(null,
 							 Util.format("broadcast", getFinalArg(args, 0)));
 	}
 }

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

@@ -21,7 +21,6 @@ public class Commandburn extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		charge(sender);
 		for (Player p : server.matchPlayer(args[0]))
 		{
 			p.setFireTicks(Integer.parseInt(args[1]) * 20);

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

@@ -27,7 +27,6 @@ public class Commandclearinventory extends EssentialsCommand
 
 				if (!online.isEmpty())
 				{
-					charge(user);
 					for (Player p : online)
 					{
 						p.getInventory().clear();
@@ -42,7 +41,6 @@ public class Commandclearinventory extends EssentialsCommand
 				Player p = server.getPlayer(args[0]);
 				if (p != null)
 				{
-					charge(user);
 					p.getInventory().clear();
 					user.sendMessage(Util.format("inventoryClearedOthers", p.getDisplayName()));
 				}
@@ -54,7 +52,6 @@ public class Commandclearinventory extends EssentialsCommand
 		}
 		else
 		{
-			charge(user);
 			user.getInventory().clear();
 			user.sendMessage(Util.i18n("inventoryCleared"));
 		}

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

@@ -15,18 +15,44 @@ public class Commandcompass extends EssentialsCommand
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		charge(user);
-		int r = (int)user.getCorrectedYaw();
+		int r = (int)(user.getLocation().getYaw() + 180 + 360) % 360;
 		String dir;
-		if (r < 23) dir = "N";
-		else if (r < 68) dir = "NE";
-		else if (r < 113) dir = "E";
-		else if (r < 158) dir = "SE";
-		else if (r < 203) dir = "S";
-		else if (r < 248) dir = "SW";
-		else if (r < 293) dir = "W";
-		else if (r < 338) dir = "NW";
-		else dir = "N";
+		if (r < 23)
+		{
+			dir = "N";
+		}
+		else if (r < 68)
+		{
+			dir = "NE";
+		}
+		else if (r < 113)
+		{
+			dir = "E";
+		}
+		else if (r < 158)
+		{
+			dir = "SE";
+		}
+		else if (r < 203)
+		{
+			dir = "S";
+		}
+		else if (r < 248)
+		{
+			dir = "SW";
+		}
+		else if (r < 293)
+		{
+			dir = "W";
+		}
+		else if (r < 338)
+		{
+			dir = "NW";
+		}
+		else
+		{
+			dir = "N";
+		}
 		user.sendMessage(Util.format("compassBearing", dir, r));
 	}
 }

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

@@ -0,0 +1,48 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import com.earth2me.essentials.Util;
+
+
+public class Commanddelhome extends EssentialsCommand
+{
+	public Commanddelhome()
+	{
+		super("delhome");
+	}
+
+	@Override
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		//Allowing both formats /delhome khobbits house | /delhome khobbits:house
+		final String[] nameParts = args[0].split(":");
+		if (nameParts[0].length() != args[0].length())
+		{
+			args = nameParts;
+		}
+
+		User user = ess.getUser(sender);
+		String name;
+		if (args.length < 1)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		else if (args.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others")))
+		{
+			user = getPlayer(server, args, 0, true);
+			name = args[1];
+		}
+		else
+		{
+			if (user == null)
+			{
+				throw new NotEnoughArgumentsException();
+			}
+			name = args[0];
+		}
+		user.delHome(name.toLowerCase());
+		sender.sendMessage(Util.format("deleteHome", name));
+	}
+}

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

@@ -16,7 +16,6 @@ public class Commanddeljail extends EssentialsCommand {
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		charge(sender);
 		ess.getJail().delJail(args[0]);
 		sender.sendMessage(Util.format("deleteJail", args[0]));
 	}

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

@@ -19,7 +19,6 @@ public class Commanddelwarp extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		charge(sender);
 		ess.getWarps().delWarp(args[0]);
 		sender.sendMessage(Util.format("deleteWarp", args[0]));
 	}

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

@@ -15,7 +15,6 @@ public class Commanddepth extends EssentialsCommand
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		charge(user);
 		int y = user.getLocation().getBlockY() - 63;
 		if (y > 0)
 		{

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

@@ -56,7 +56,6 @@ public class Commandessentials extends EssentialsCommand
 			}
 			final String tuneStr = "1D#,1E,2F#,,2A#,1E,1D#,1E,2F#,2B,2D#,2E,2D#,2A#,2B,,2F#,,1D#,1E,2F#,2B,2C#,2A#,2B,2C#,2E,2D#,2E,2C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1C#,,2F#,,2G#,,1D,1D#,,1C#,1D,1C#,1B,,1B,,1C#,,1D,,1D,1C#,1B,1C#,1D#,2F#,2G#,1D#,2F#,1C#,1D#,1B,1C#,1B,1D#,,2F#,,2G#,1D#,2F#,1C#,1D#,1B,1D,1D#,1D,1C#,1B,1C#,1D,,1B,1C#,1D#,2F#,1C#,1D,1C#,1B,1C#,,1B,,1B,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1A#,,1B,,1F#,1G#,1B,,1F#,1G#,1B,1C#,1D#,1B,1E,1D#,1E,2F#,1B,,1B,,1F#,1G#,1B,1F#,1E,1D#,1C#,1B,,,,1F#,1B,,1F#,1G#,1B,,1F#,1G#,1B,1B,1C#,1D#,1B,1F#,1G#,1F#,1B,,1B,1A#,1B,1F#,1G#,1B,1E,1D#,1E,2F#,1B,,1B,,";
 			final String[] tune = tuneStr.split(",");
-
 			for (Player player : server.getOnlinePlayers())
 			{
 				final Location loc = player.getLocation();
@@ -91,7 +90,7 @@ public class Commandessentials extends EssentialsCommand
 					for (Player player : server.getOnlinePlayers())
 					{
 						Block block = noteBlocks.get(player);
-						if (block == null)
+						if (block == null || block.getType() != Material.NOTE_BLOCK)
 						{
 							continue;
 						}
@@ -102,7 +101,6 @@ public class Commandessentials extends EssentialsCommand
 			return;
 		}
 		ess.reload();
-		charge(sender);
 		sender.sendMessage(Util.format("essentialsReload", ess.getDescription().getVersion()));
 	}
 
@@ -111,7 +109,10 @@ public class Commandessentials extends EssentialsCommand
 		ess.getScheduler().cancelTask(taskid);
 		for (Block block : noteBlocks.values())
 		{
-			block.setType(Material.AIR);
+			if (block.getType() == Material.NOTE_BLOCK)
+			{
+				block.setType(Material.AIR);
+			}
 		}
 		noteBlocks.clear();
 	}

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

@@ -30,7 +30,6 @@ public class Commandext extends EssentialsCommand
 	{
 		if (args.length < 1)
 		{
-			charge(user);
 			user.setFireTicks(0);
 			user.sendMessage(Util.i18n("extinguish"));
 			return;
@@ -43,7 +42,6 @@ public class Commandext extends EssentialsCommand
 	{
 		for (Player p : server.matchPlayer(name))
 		{
-			charge(sender);
 			p.setFireTicks(0);
 			sender.sendMessage(Util.format("extinguishOthers", p.getDisplayName()));
 		}

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

@@ -17,7 +17,6 @@ public class Commandfireball extends EssentialsCommand
 	@Override
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		charge(user);
         final Vector direction = user.getEyeLocation().getDirection().multiply(2);
 		user.getWorld().spawn(user.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), Fireball.class);
 	}

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

@@ -16,7 +16,6 @@ public class Commandgc extends EssentialsCommand
 	@Override
 	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		charge(sender);
 		sender.sendMessage(Util.format("gcmax", (Runtime.getRuntime().maxMemory() / 1024 / 1024)));
 		sender.sendMessage(Util.format("gcfree", (Runtime.getRuntime().freeMemory() / 1024 / 1024)));
 		sender.sendMessage(Util.format("gctotal", (Runtime.getRuntime().totalMemory() / 1024 / 1024)));

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

@@ -15,12 +15,11 @@ public class Commandgetpos extends EssentialsCommand
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		charge(user);
 		Location coords = user.getLocation();
-		user.sendMessage("§7X: " + coords.getBlockX() + " (-North <-> +South)");
+		user.sendMessage("§7X: " + coords.getBlockX() + " (+East <-> -West)");
 		user.sendMessage("§7Y: " + coords.getBlockY() + " (+Up <-> -Down)");
-		user.sendMessage("§7Z: " + coords.getBlockZ() + " (+East <-> -West)");
-		user.sendMessage("§7Yaw: " + user.getCorrectedYaw() + " (Rotation)");
+		user.sendMessage("§7Z: " + coords.getBlockZ() + " (+South <-> -North)");
+		user.sendMessage("§7Yaw: " + (coords.getYaw() + 180 + 360) % 360 + " (Rotation)");
 		user.sendMessage("§7Pitch: " + coords.getPitch() + " (Head angle)");
 	}
 }

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

@@ -36,8 +36,7 @@ public class Commandgive extends EssentialsCommand
 				: (!ess.getUser(sender).isAuthorized("essentials.itemspawn.exempt")
 				   && !ess.getUser(sender).canSpawnItem(stack.getTypeId()))))
 		{
-			sender.sendMessage(ChatColor.RED + "You are not allowed to spawn the item " + itemname);
-			return;
+			throw new Exception(ChatColor.RED + "You are not allowed to spawn the item " + itemname);
 		}
 		if (args.length > 2 && Integer.parseInt(args[2]) > 0)
 		{
@@ -46,13 +45,11 @@ public class Commandgive extends EssentialsCommand
 
 		if (stack.getType() == Material.AIR)
 		{
-			sender.sendMessage(ChatColor.RED + "You can't give air.");
-			return;
+			throw new Exception(ChatColor.RED + "You can't give air.");
 		}
 
 		User giveTo = getPlayer(server, args, 0);
 		String itemName = stack.getType().toString().toLowerCase().replace('_', ' ');
-		charge(sender);
 		sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
 		giveTo.getInventory().addItem(stack);
 		giveTo.updateInventory();

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

@@ -28,7 +28,6 @@ public class Commandgod extends EssentialsCommand
 	@Override
 	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		charge(user);
 		if (args.length > 0 && user.isAuthorized("essentials.god.others"))
 		{
 			godOtherPlayers(server, user, args[0]);

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

@@ -25,7 +25,6 @@ public class Commandheal extends EssentialsCommand
 			{
 				user.healCooldown();
 			}
-			charge(user);
 			healOtherPlayers(server, user, args[0]);
 			return;
 		}
@@ -34,8 +33,8 @@ public class Commandheal extends EssentialsCommand
 		{
 			user.healCooldown();
 		}
-		charge(user);
 		user.setHealth(20);
+		user.setFoodLevel(20);
 		user.sendMessage(Util.i18n("heal"));
 	}
 

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

@@ -20,6 +20,9 @@ import java.util.logging.Level;
 
 public class Commandhelp extends EssentialsCommand
 {
+	private static final String DESCRIPTION = "description";
+	private static final String PERMISSION = "permission";
+	private static final String PERMISSIONS = "permissions";
 	public final Yaml yaml = new Yaml(new SafeConstructor());
 
 	public Commandhelp()
@@ -28,7 +31,7 @@ public class Commandhelp extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
 		int page = 1;
 		String match = "";
@@ -53,34 +56,32 @@ public class Commandhelp extends EssentialsCommand
 			}
 		}
 
-		List<String> lines = getHelpLines(user, match);
-		if (lines.size() > 0)
+		final List<String> lines = getHelpLines(user, match);
+		if (lines.isEmpty())
 		{
-			int start = (page - 1) * 9;
-			int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
-
-			user.sendMessage(Util.format("helpPages", page, pages));
-			for (int i = start; i < lines.size() && i < start + 9; i++)
-			{
-				user.sendMessage(lines.get(i));
-			}
+			throw new Exception(Util.i18n("noHelpFound"));
 		}
-		else
+
+		final int start = (page - 1) * 9;
+		final int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
+
+		user.sendMessage(Util.format("helpPages", page, pages));
+		for (int i = start; i < lines.size() && i < start + 9; i++)
 		{
-			user.sendMessage(Util.i18n("noHelpFound"));
+			user.sendMessage(lines.get(i));
 		}
 	}
 
 	@Override
-	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
 	{
 		sender.sendMessage(Util.i18n("helpConsole"));
 	}
 
 	@SuppressWarnings("CallToThreadDumpStack")
-	private List<String> getHelpLines(User user, String match) throws Exception
+	private List<String> getHelpLines(final User user, final String match) throws Exception
 	{
-		List<String> retval = new ArrayList<String>();
+		final List<String> retval = new ArrayList<String>();
 		File helpFile = new File(ess.getDataFolder(), "help_" + Util.sanitizeFileName(user.getName()) + ".txt");
 		if (!helpFile.exists())
 		{
@@ -116,15 +117,16 @@ public class Commandhelp extends EssentialsCommand
 			try
 			{
 				final PluginDescriptionFile desc = p.getDescription();
-				final HashMap<String, HashMap<String, String>> cmds = (HashMap<String, HashMap<String, String>>)desc.getCommands();
+				final HashMap<String, HashMap<String, Object>> cmds = (HashMap<String, HashMap<String, Object>>)desc.getCommands();
 				pluginName = p.getDescription().getName().toLowerCase();
-				for (Entry<String, HashMap<String, String>> k : cmds.entrySet())
+				for (Entry<String, HashMap<String, Object>> k : cmds.entrySet())
 				{
 					try
 					{
 						if ((!match.equalsIgnoreCase(""))
 							&& (!k.getKey().toLowerCase().contains(match))
-							&& (!k.getValue().get("description").toLowerCase().contains(match))
+							&& (!(k.getValue().get(DESCRIPTION) instanceof String
+								  && ((String)k.getValue().get(DESCRIPTION)).toLowerCase().contains(match)))
 							&& (!pluginName.contains(match)))
 						{
 							continue;
@@ -135,37 +137,69 @@ public class Commandhelp extends EssentialsCommand
 							final String node = "essentials." + k.getKey();
 							if (!ess.getSettings().isCommandDisabled(k.getKey()) && user.isAuthorized(node))
 							{
-								retval.add("§c" + k.getKey() + "§7: " + k.getValue().get("description"));
+								retval.add("§c" + k.getKey() + "§7: " + k.getValue().get(DESCRIPTION));
 							}
 						}
 						else
 						{
 							if (ess.getSettings().showNonEssCommandsInHelp())
 							{
-								final HashMap<String, String> value = k.getValue();
-								if (value.containsKey("permission") && value.get("permission") != null && !(value.get("permission").equals("")))
+								final HashMap<String, Object> value = k.getValue();
+								if (value.containsKey(PERMISSION) && value.get(PERMISSION) instanceof String && !(value.get(PERMISSION).equals("")))
 								{
-									if (user.isAuthorized(value.get("permission")))
+									if (user.isAuthorized((String)value.get(PERMISSION)))
 									{
-										retval.add("§c" + k.getKey() + "§7: " + value.get("description"));
+										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
 									}
 								}
-								else if (value.containsKey("permissions") && value.get("permissions") != null && !(value.get("permissions").equals("")))
+								else if (value.containsKey(PERMISSION) && value.get(PERMISSION) instanceof List && !((List<Object>)value.get(PERMISSION)).isEmpty())
 								{
-									if (user.isAuthorized(value.get("permissions")))
+									boolean enabled = false;
+									for (Object o : (List<Object>)value.get(PERMISSION))
 									{
-										retval.add("§c" + k.getKey() + "§7: " + value.get("description"));
+										if (o instanceof String && user.isAuthorized((String)o))
+										{
+											enabled = true;
+											break;
+										}
+									}
+									if (enabled)
+									{
+										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
+									}
+								}
+								else if (value.containsKey(PERMISSIONS) && value.get(PERMISSIONS) instanceof String && !(value.get(PERMISSIONS).equals("")))
+								{
+									if (user.isAuthorized((String)value.get(PERMISSIONS)))
+									{
+										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
+									}
+								}
+								else if (value.containsKey(PERMISSIONS) && value.get(PERMISSIONS) instanceof List && !((List<Object>)value.get(PERMISSIONS)).isEmpty())
+								{
+									boolean enabled = false;
+									for (Object o : (List<Object>)value.get(PERMISSIONS))
+									{
+										if (o instanceof String && user.isAuthorized((String)o))
+										{
+											enabled = true;
+											break;
+										}
+									}
+									if (enabled)
+									{
+										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
 									}
 								}
 								else if (user.isAuthorized("essentials.help." + pluginName))
 								{
-									retval.add("§c" + k.getKey() + "§7: " + value.get("description"));
+									retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
 								}
 								else
 								{
 									if (!ess.getSettings().hidePermissionlessHelp())
 									{
-										retval.add("§c" + k.getKey() + "§7: " + value.get("description"));
+										retval.add("§c" + k.getKey() + "§7: " + value.get(DESCRIPTION));
 									}
 								}
 							}

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

@@ -22,7 +22,6 @@ public class Commandhelpop extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		charge(user);
 		final String message = Util.format("helpOp", user.getDisplayName(), getFinalArg(args, 0));
 		logger.log(Level.INFO, message);
 		for (Player p : server.getOnlinePlayers())

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

@@ -4,6 +4,7 @@ import com.earth2me.essentials.Trade;
 import org.bukkit.Server;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import java.util.List;
 
 
 public class Commandhome extends EssentialsCommand
@@ -18,24 +19,49 @@ public class Commandhome extends EssentialsCommand
 	{
 		Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
-		if(args.length > 0 && user.isAuthorized("essentials.home.others"))
+		User u = user;
+		String homeName = "";
+		String[] nameParts;
+		if (args.length > 0)
 		{
-			User u;
-			try
+			nameParts = args[0].split(":");
+			if (nameParts[0].length() == args[0].length() || !user.isAuthorized("essentials.home.others"))
 			{
-				u = getPlayer(server, args, 0);
+				homeName = nameParts[0];
 			}
-			catch(NoSuchFieldException ex)
+			else
 			{
-				u = ess.getOfflineUser(args[0]);
+				u = getPlayer(server, nameParts[0].split(" "), 0, true);
+				if (nameParts.length > 1)
+				{
+					homeName = nameParts[1];
+				}
 			}
-			if (u == null)
-			{
-				throw new Exception(Util.i18n("playerNotFound"));
-			}
-			user.getTeleport().home(u, charge);
-			return;
 		}
-		user.getTeleport().home(charge);
+		try
+		{
+			user.getTeleport().home(u, homeName.toLowerCase(), charge);
+		}
+		catch (NotEnoughArgumentsException e)
+		{
+			List<String> homes = u.getHomes();
+			if (homes.isEmpty() && u.equals(user) && ess.getSettings().spawnIfNoHome())
+			{
+				user.getTeleport().respawn(ess.getSpawn(), charge);				
+			}
+			else if (homes.isEmpty())
+			{
+				throw new Exception(u == user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer"));
+			}
+			else if (homes.size() == 1 && u.equals(user))
+			{
+				user.getTeleport().home(u, homes.get(0), charge);
+			}
+			else
+			{
+				user.sendMessage(Util.format("homes", Util.joinList(homes)));
+			}
+		}
+		throw new NoChargeException();
 	}
 }

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

@@ -68,9 +68,8 @@ public class Commandinfo extends EssentialsCommand
 		}
 		else
 		{
-			sender.sendMessage(Util.i18n("infoFileDoesNotExist"));
 			file.createNewFile();
-			return;
+			throw new Exception(Util.i18n("infoFileDoesNotExist"));
 		}
 
 		if (bookmarks.isEmpty())
@@ -88,7 +87,6 @@ public class Commandinfo extends EssentialsCommand
 			int start = (page - 1) * 9;
 			int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
 
-			charge(sender);
 			sender.sendMessage(Util.format("infoPages", page, pages ));
 			for (int i = start; i < lines.size() && i < start + 9; i++)
 			{
@@ -140,7 +138,6 @@ public class Commandinfo extends EssentialsCommand
 				}
 				int pages = end / 9 + (end % 9 > 0 ? 1 : 0);
 
-				charge(sender);
 				sender.sendMessage(Util.format("infoPages", page, pages ));
 				for (int i = start; i < end && i < start + 9; i++)
 				{
@@ -182,7 +179,6 @@ public class Commandinfo extends EssentialsCommand
 		int page = chapterpage + 1;
 		int pages = (chapterend - chapterstart) / 9 + ((chapterend - chapterstart) % 9 > 0 ? 1 : 0);
 
-		charge(sender);
 		sender.sendMessage(Util.format("infoChapterPages", pageStr, page , pages));
 		for (int i = start; i < chapterend && i < start + 9; i++)
 		{

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

@@ -31,11 +31,9 @@ public class Commandinvsee extends EssentialsCommand
 		{
 			invUser.getInventory().setContents(user.getSavedInventory());
 			user.setSavedInventory(null);
-			user.sendMessage(Util.i18n("invRestored"));
-			return;
+			throw new Exception(Util.i18n("invRestored"));
 		}
 
-		charge(user);
 		if (user.getSavedInventory() == null)
 		{
 			user.setSavedInventory(user.getInventory().getContents());
@@ -51,5 +49,6 @@ public class Commandinvsee extends EssentialsCommand
 		user.getInventory().setContents(invUserStack);
 		user.sendMessage(Util.format("invSee", invUser.getDisplayName()));
 		user.sendMessage(Util.i18n("invSeeHelp"));
+		throw new NoChargeException();
 	}
 }

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

@@ -31,8 +31,7 @@ public class Commanditem extends EssentialsCommand
 			: (!user.isAuthorized("essentials.itemspawn.exempt")
 			   && !user.canSpawnItem(stack.getTypeId())))
 		{
-			user.sendMessage(Util.format("cantSpawnItem", itemname));
-			return;
+			throw new Exception(Util.format("cantSpawnItem", itemname));
 		}
 
 		if (args.length > 1 && Integer.parseInt(args[1]) > 0)
@@ -42,12 +41,10 @@ public class Commanditem extends EssentialsCommand
 
 		if (stack.getType() == Material.AIR)
 		{
-			user.sendMessage(Util.format("cantSpawnItem", "Air"));
-			return;
+			throw new Exception(Util.format("cantSpawnItem", "Air"));
 		}
 
 		String itemName = stack.getType().toString().toLowerCase().replace('_', ' ');
-		charge(user);
 		user.sendMessage(Util.format("itemSpawn", stack.getAmount(), itemName));
 		user.getInventory().addItem(stack);
 		user.updateInventory();

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

@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
@@ -14,12 +15,6 @@ public class Commandjails extends EssentialsCommand
 	@Override
 	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		StringBuilder jailList = new StringBuilder();
-		for (String j : ess.getJail().getJails())
-		{
-			jailList.append(j);
-			jailList.append(' ');
-		}
-		sender.sendMessage("§7" + jailList);
+		sender.sendMessage("§7" + Util.joinList(" ", ess.getJail().getJails()));
 	}
 }

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

@@ -26,10 +26,8 @@ public class Commandkick extends EssentialsCommand
 		User player = getPlayer(server, args, 0);
 		if (player.isAuthorized("essentials.kick.exempt"))
 		{
-			sender.sendMessage(Util.i18n("kickExempt"));
-			return;
+			throw new Exception(Util.i18n("kickExempt"));
 		}
-		charge(sender);
 		final String kickReason = args.length > 1 ? getFinalArg(args, 1) : Util.i18n("kickDefault");
 		player.kickPlayer(kickReason);
 		String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;

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

@@ -16,8 +16,6 @@ public class Commandkickall extends EssentialsCommand
 	@Override
 	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		charge(sender);
-
 		for (Player p : server.getOnlinePlayers())
 		{
 			if (sender instanceof Player && p.getName().equalsIgnoreCase(((Player)sender).getName()))

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

@@ -4,6 +4,7 @@ import com.earth2me.essentials.Util;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageEvent;
 
 
 public class Commandkill extends EssentialsCommand
@@ -21,9 +22,15 @@ public class Commandkill extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		charge(sender);
 		for (Player p : server.matchPlayer(args[0]))
 		{
+			final EntityDamageEvent ede = new EntityDamageEvent(p, sender instanceof Player && ((Player)sender).getName().equals(p.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, 1000);
+			server.getPluginManager().callEvent(ede);
+			if (ede.isCancelled() && !sender.hasPermission("essentials.kill.force"))
+			{
+				continue;
+			}
+
 			p.setHealth(0);
 			sender.sendMessage(Util.format("kill", p.getDisplayName()));
 		}

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

@@ -9,27 +9,26 @@ import org.bukkit.Server;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import java.util.GregorianCalendar;
+import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 
 public class Commandkit extends EssentialsCommand
 {
-	static private final Map<User, Map<String, Long>> kitPlayers = new HashMap<User, Map<String, Long>>();
-
 	public Commandkit()
 	{
 		super("kit");
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			try
 			{
-				Map<String, Object> kits = ess.getSettings().getKits();
-				StringBuilder list = new StringBuilder();
+				final Map<String, Object> kits = ess.getSettings().getKits();
+				final StringBuilder list = new StringBuilder();
 				for (String k : kits.keySet())
 				{
 					if (user.isAuthorized("essentials.kit." + k.toLowerCase()))
@@ -55,8 +54,8 @@ public class Commandkit extends EssentialsCommand
 		{
 			try
 			{
-				String kitName = args[0].toLowerCase();
-				Object kit = ess.getSettings().getKit(kitName);
+				final String kitName = args[0].toLowerCase();
+				final Object kit = ess.getSettings().getKit(kitName);
 				List<String> items;
 
 				if (!user.isAuthorized("essentials.kit." + kitName))
@@ -69,39 +68,26 @@ public class Commandkit extends EssentialsCommand
 				{
 
 					//System.out.println("Kit is timed");
-					Map<String, Object> els = (Map<String, Object>)kit;
+					final Map<String, Object> els = (Map<String, Object>)kit;
 					items = (List<String>)els.get("items");
-					double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
-					Calendar c = new GregorianCalendar();
-					c.add(Calendar.SECOND, (int)delay);
-					c.add(Calendar.MILLISECOND, (int)((delay*1000.0)%1000.0));
+					final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L;
+					final Calendar c = new GregorianCalendar();
+					c.add(Calendar.SECOND, -(int)delay);
+					c.add(Calendar.MILLISECOND, -(int)((delay*1000.0)%1000.0));
 			
-					long time = c.getTimeInMillis();
-					Calendar now = new GregorianCalendar();
-
-					Map<String, Long> kitTimes;
-					if (!kitPlayers.containsKey(user))
-					{
-						kitTimes = new HashMap<String, Long>();
-						kitTimes.put(kitName, time);
-						kitPlayers.put(user, kitTimes);
-					}
-					else
-					{
-						kitTimes = kitPlayers.get(user);
-						if (!kitTimes.containsKey(kitName))
-						{
-							kitTimes.put(kitName, time);
-						}
-						else if (kitTimes.get(kitName) < now.getTimeInMillis())
-						{
-							kitTimes.put(kitName, time);
-						}
-						else
-						{
-							user.sendMessage(Util.format("kitTimed", Util.formatDateDiff(kitTimes.get(kitName))));
-							return;
-						}
+					final long mintime = c.getTimeInMillis();
+					
+					final Long lastTime = user.getKitTimestamp(kitName);
+					if (lastTime == null || lastTime < mintime) {
+						final Calendar now = new GregorianCalendar();
+						user.setKitTimestamp(kitName, now.getTimeInMillis());
+					} else {
+						final Calendar future = new GregorianCalendar();
+						future.setTimeInMillis(lastTime);
+						future.add(Calendar.SECOND, (int)delay);
+						future.add(Calendar.MILLISECOND, (int)((delay*1000.0)%1000.0));
+						user.sendMessage(Util.format("kitTimed", Util.formatDateDiff(future.getTimeInMillis())));
+						return;
 					}
 				}
 				catch (Exception ex)
@@ -109,7 +95,7 @@ public class Commandkit extends EssentialsCommand
 					items = (List<String>)kit;
 				}
 
-				Trade charge = new Trade("kit-" + kitName, ess);
+				final Trade charge = new Trade("kit-" + kitName, ess);
 				try
 				{
 					charge.isAffordableFor(user);
@@ -123,11 +109,11 @@ public class Commandkit extends EssentialsCommand
 				boolean spew = false;
 				for (String d : items)
 				{
-					String[] parts = d.split("[^0-9]+", 3);
-					int id = Integer.parseInt(parts[0]);
-					int amount = parts.length > 1 ? Integer.parseInt(parts[parts.length > 2 ? 2 : 1]) : 1;
-					short data = parts.length > 2 ? Short.parseShort(parts[1]) : 0;
-					HashMap<Integer,ItemStack> overfilled = user.getInventory().addItem(new ItemStack(id, amount, data));
+					final String[] parts = d.split("[^0-9]+", 3);
+					final int id = Material.getMaterial(Integer.parseInt(parts[0])).getId();
+					final int amount = parts.length > 1 ? Integer.parseInt(parts[parts.length > 2 ? 2 : 1]) : 1;
+					final short data = parts.length > 2 ? Short.parseShort(parts[1]) : 0;
+					final HashMap<Integer,ItemStack> overfilled = user.getInventory().addItem(new ItemStack(id, amount, data));
 					for (ItemStack itemStack : overfilled.values())
 					{
 						user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
@@ -140,7 +126,6 @@ public class Commandkit extends EssentialsCommand
 				}
 				try
 				{
-					charge(user);
 					charge.charge(user);
 				}
 				catch (Exception ex)

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

@@ -26,20 +26,14 @@ public class Commandlightning extends EssentialsCommand
 		if (args.length < 1 & user != null)
 		{
 			user.getWorld().strikeLightning(user.getTargetBlock(null, 600).getLocation());
-			charge(user);
 			return;
 		}
 
 		if (server.matchPlayer(args[0]).isEmpty())
 		{
-			sender.sendMessage(Util.i18n("playerNotFound"));
-			return;
+			throw new Exception(Util.i18n("playerNotFound"));
 		}
 
-		if (user != null)
-		{
-			charge(user);
-		}
 		for (Player p : server.matchPlayer(args[0]))
 		{
 			sender.sendMessage(Util.format("lightningUse", p.getDisplayName()));

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

@@ -44,7 +44,6 @@ public class Commandlist extends EssentialsCommand
 				playerHidden++;
 			}
 		}
-		charge(sender);
 		//TODO: move these to messages file
 		StringBuilder online = new StringBuilder();
 		online.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().length - playerHidden);

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

@@ -5,6 +5,7 @@ import org.bukkit.Server;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 
@@ -24,7 +25,7 @@ public class Commandmail extends EssentialsCommand
 			if (mail.isEmpty())
 			{
 				user.sendMessage(Util.i18n("noMail"));
-				return;
+				throw new NoChargeException();
 			}
 			for (String s : mail)
 			{
@@ -37,8 +38,7 @@ public class Commandmail extends EssentialsCommand
 		{
 			if (!user.isAuthorized("essentials.mail.send"))
 			{
-				user.sendMessage(Util.i18n("noMailSendPerm"));
-				return;
+				throw new Exception(Util.i18n("noMailSendPerm"));
 			}
 
 			Player player = server.getPlayer(args[1]);
@@ -53,10 +53,8 @@ public class Commandmail extends EssentialsCommand
 			}
 			if (u == null)
 			{
-				user.sendMessage(Util.format("playerNeverOnServer", args[1]));
-				return;
+				throw new Exception(Util.format("playerNeverOnServer", args[1]));
 			}
-			charge(user);
 			if (!u.isIgnoredPlayer(user.getName()))
 			{
 				u.addMail(ChatColor.stripColor(user.getDisplayName()) + ": " + getFinalArg(args, 2));
@@ -72,4 +70,59 @@ public class Commandmail extends EssentialsCommand
 		}
 		throw new NotEnoughArgumentsException();
 	}
+
+	@Override
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	{
+		if (args.length >= 1 && "read".equalsIgnoreCase(args[0]))
+		{
+			throw new Exception(Util.format("onlyPlayers", commandLabel + " read"));
+		}
+		else if (args.length >= 1 && "clear".equalsIgnoreCase(args[0]))
+		{
+			throw new Exception(Util.format("onlyPlayers", commandLabel + " clear"));
+		}
+		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]);
+			}
+			if (u == null)
+			{
+				throw new Exception(Util.format("playerNeverOnServer", args[1]));
+			}
+			u.addMail("Server: " + getFinalArg(args, 2));
+			sender.sendMessage(Util.i18n("mailSent"));
+			return;
+		}
+		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]);
+			}
+			if (u == null)
+			{
+				throw new Exception(Util.format("playerNeverOnServer", args[0]));
+			}
+			u.addMail("Server: " + getFinalArg(args, 1));
+			sender.sendMessage(Util.i18n("mailSent"));
+			return;
+		}
+		throw new NotEnoughArgumentsException();
+	}
 }

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

@@ -17,21 +17,22 @@ public class Commandme extends EssentialsCommand
 	{
 		if (user.isMuted())
 		{
-			user.sendMessage(Util.i18n("voiceSilenced"));
-			return;
+			throw new Exception(Util.i18n("voiceSilenced"));
 		}
 
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		StringBuilder message = new StringBuilder();
+		final StringBuilder message = new StringBuilder();
+		message.append("* ");
+		message.append(user.getDisplayName());
+		message.append(' ');
 		for (int i = 0; i < args.length; i++)
 		{
 			message.append(args[i]);
 			message.append(' ');
 		}
-		charge(user);
-		ess.broadcastMessage(user.getName(), "* " + user.getDisplayName() + " " + message);
+		ess.broadcastMessage(user, message.toString());
 	}
 }

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

@@ -15,7 +15,6 @@ public class Commandmotd extends EssentialsCommand
 	@Override
 	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		charge(sender);
 		for (String m : ess.getMotd(sender, Util.i18n("noMotd")))
 		{
 			sender.sendMessage(m);

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

@@ -30,8 +30,7 @@ public class Commandmsg extends EssentialsCommand
 			User user = ess.getUser(sender);
 			if (user.isMuted())
 			{
-				user.sendMessage(Util.i18n("voiceSilenced"));
-				return;
+				throw new Exception(Util.i18n("voiceSilenced"));
 			}
 		}
 
@@ -55,8 +54,7 @@ public class Commandmsg extends EssentialsCommand
 
 		if (matches.isEmpty())
 		{
-			sender.sendMessage(Util.i18n("playerNotFound"));
-			return;
+			throw new Exception(Util.i18n("playerNotFound"));
 		}
 
 		int i = 0;
@@ -70,11 +68,9 @@ public class Commandmsg extends EssentialsCommand
 		}
 		if (i == matches.size())
 		{
-			sender.sendMessage(Util.i18n("playerNotFound"));
-			return;
+			throw new Exception(Util.i18n("playerNotFound"));
 		}
 
-		charge(sender);
 		for (Player p : matches)
 		{
 			sender.sendMessage(Util.format("msgFormat", translatedMe, p.getDisplayName(), message));

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

@@ -24,8 +24,7 @@ public class Commandmute extends EssentialsCommand
 		User p = getPlayer(server, args, 0, true);
 		if (!p.isMuted() && p.isAuthorized("essentials.mute.exempt"))
 		{
-			sender.sendMessage(Util.i18n("muteExempt"));
-			return;
+			throw new Exception(Util.i18n("muteExempt"));
 		}
 		long muteTimestamp = 0;
 		if (args.length > 1)
@@ -34,7 +33,6 @@ public class Commandmute extends EssentialsCommand
 			muteTimestamp = Util.parseDateDiff(time, true);
 		}
 		p.setMuteTimeout(muteTimestamp);
-		charge(sender);
 		boolean muted = p.toggleMuted();
 		sender.sendMessage(
 				muted

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

@@ -21,13 +21,16 @@ public class Commandnick extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
+		
+		if (!ess.getSettings().changeDisplayName()) {
+			throw new Exception(Util.i18n("nickDisplayName"));
+		}
 
 		if (args.length > 1)
 		{
 			if (!user.isAuthorized("essentials.nick.others"))
 			{
-				user.sendMessage(Util.i18n("nickOthersPermission"));
-				return;
+				throw new Exception(Util.i18n("nickOthersPermission"));
 			}
 
 			setOthersNickname(server, user, args);
@@ -38,7 +41,7 @@ public class Commandnick extends EssentialsCommand
 		String nick = args[0];
 		if ("off".equalsIgnoreCase(nick) || user.getName().equalsIgnoreCase(nick))
 		{
-			user.setDisplayName(user.getName());
+			user.setDisplayNick(user.getName());
 			user.setNickname(null);
 			user.sendMessage(Util.i18n("nickNoMore"));
 			return;
@@ -46,8 +49,7 @@ public class Commandnick extends EssentialsCommand
 
 		if (nick.matches("[^a-zA-Z_0-9]"))
 		{
-			user.sendMessage(Util.i18n("nickNamesAlpha"));
-			return;
+			throw new Exception(Util.i18n("nickNamesAlpha"));
 		}
 
 		for (Player p : server.getOnlinePlayers())
@@ -61,13 +63,11 @@ public class Commandnick extends EssentialsCommand
 			String nk = nick.toLowerCase();
 			if (nk.equals(dn) || nk.equals(n))
 			{
-				user.sendMessage(Util.i18n("nickInUse"));
-				return;
+				throw new Exception(Util.i18n("nickInUse"));
 			}
 		}
 
-		charge(user);
-		user.setDisplayName(ess.getSettings().getNicknamePrefix() + nick);
+		user.setDisplayNick(ess.getSettings().getNicknamePrefix() + nick);
 		user.setNickname(nick);
 		user.sendMessage(Util.format("nickSet", user.getDisplayName() + "§7."));
 	}
@@ -80,6 +80,11 @@ public class Commandnick extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		
+		if (!ess.getSettings().changeDisplayName()) {
+			sender.sendMessage(Util.i18n("nickDisplayName"));
+			return;
+		}
+		
 		setOthersNickname(server, sender, args);
 		
 	}
@@ -90,13 +95,13 @@ public class Commandnick extends EssentialsCommand
 		String nick = args[1];
 		if ("off".equalsIgnoreCase(nick) || target.getName().equalsIgnoreCase(nick))
 		{
-			target.setDisplayName(target.getName());
+			target.setDisplayNick(target.getName());
 			target.setNickname(null);
 			target.sendMessage(Util.i18n("nickNoMore"));
 		}
 		else
 		{
-			target.setDisplayName(ess.getSettings().getNicknamePrefix() + nick);
+			target.setDisplayNick(ess.getSettings().getNicknamePrefix() + nick);
 			target.setNickname(nick);
 			target.sendMessage(Util.format("nickSet", target.getDisplayName() + "§7."));
 		}

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

@@ -1,173 +0,0 @@
-package com.earth2me.essentials.commands;
-
-import java.io.File;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
-
-
-public class Commandplugin extends EssentialsCommand
-{
-	private Server server;
-
-	public Commandplugin()
-	{
-		super("plugin");
-	}
-
-	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
-		this.server = server;
-
-		PluginCommands sub = null;
-		try
-		{
-			sub = PluginCommands.valueOf(args[0].toUpperCase());
-		}
-		catch (Exception ex)
-		{
-			sender.sendMessage("§cUsage: /plugin [load|reload|enable|disable|list] [PluginName]");
-			return;
-		}
-
-		switch (sub)
-		{
-		case LOAD: // All disable functions are broken until 
-			// http://leaky.bukkit.org/issues/641 is fixed.
-			sender.sendMessage("This function is broken. Performing /reload now.");
-			server.reload();
-			/*if (args.length < 2) return;
-			User.charge(sender, this);
-			loadPlugin(args[1], sender);*/
-			return;
-
-		case RELOAD:
-			sender.sendMessage("This function is broken. Performing /reload now.");
-			server.reload();
-			/*if (args.length < 2) return;
-			User.charge(sender, this);
-			reloadPlugin(args[1], sender);*/
-			return;
-
-		case ENABLE:
-			sender.sendMessage("This function is broken. Performing /reload now.");
-			server.reload();
-			/*if (args.length < 2) return;
-			User.charge(sender, this);
-			enablePlugin(args[1], sender);*/
-			return;
-
-		case DISABLE:
-			sender.sendMessage("This function is broken.");
-			/*if (args.length < 2) return;
-			User.charge(sender, this);
-			disablePlugin(args[1], sender);*/
-			return;
-
-		case LIST:
-			charge(sender);
-			listPlugins(sender);
-			return;
-		}
-	}
-
-	private void listPlugins(CommandSender player)
-	{
-		StringBuilder plugins = new StringBuilder();
-		for (Plugin p : server.getPluginManager().getPlugins())
-		{
-			plugins.append(p.isEnabled() ? " §a" : " §c");
-			plugins.append(p.getDescription().getName());
-		}
-
-		plugins.insert(0, "§7Plugins:§f");
-		player.sendMessage(plugins.toString());
-	}
-
-	private boolean reloadPlugin(String name, CommandSender player)
-	{
-		return disablePlugin(name, player) && enablePlugin(name, player);
-	}
-
-	private boolean loadPlugin(String name, CommandSender sender)
-	{
-		try
-		{
-			PluginManager pm = server.getPluginManager();
-			pm.loadPlugin(new File("plugins", name + ".jar"));
-			sender.sendMessage("§7Plugin loaded.");
-			return enablePlugin(name, sender);
-		}
-		catch (Throwable ex)
-		{
-			sender.sendMessage("§cCould not load plugin. Is the file named properly?");
-			return false;
-		}
-	}
-
-	private boolean enablePlugin(String name, CommandSender sender)
-	{
-		try
-		{
-			final PluginManager pm = server.getPluginManager();
-			final Plugin plugin = pm.getPlugin(name);
-			if (!plugin.isEnabled()) 
-			{	
-				new Thread(new Runnable()
-				{
-					public void run()
-					{
-						synchronized (pm)
-						{
-							pm.enablePlugin(plugin);
-						}
-					}
-				}).start();
-			}
-			sender.sendMessage("§7Plugin enabled.");
-			return true;
-		}
-		catch (Throwable ex)
-		{
-			listPlugins(sender);
-			return false;
-		}
-	}
-
-	private boolean disablePlugin(String name, CommandSender sender)
-	{
-		try
-		{
-			final PluginManager pm = server.getPluginManager();
-			final Plugin plugin = pm.getPlugin(name);
-			if (plugin.isEnabled())
-			{
-				new Thread(new Runnable()
-				{
-					public void run()
-					{
-						synchronized (pm)
-						{
-							pm.disablePlugin(plugin);
-						}
-					}
-				}).start();
-			}
-			sender.sendMessage("§7Plugin disabled.");
-			return true;
-		}
-		catch (Throwable ex)
-		{
-			listPlugins(sender);
-			return false;
-		}
-	}
-
-
-	private enum PluginCommands
-	{
-		LOAD, RELOAD, LIST, ENABLE, DISABLE
-	}
-}

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

@@ -2,6 +2,8 @@ package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import java.util.ArrayList;
+import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
@@ -15,25 +17,92 @@ public class Commandpowertool extends EssentialsCommand
 	}
 
 	@Override
-	protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
+		String command = getFinalArg(args, 0);
 
-		ItemStack is = user.getItemInHand();
-		if (is == null || is.getType() == Material.AIR)
+		// check to see if this is a clear all command
+		if(command != null && command.equalsIgnoreCase("clearall"))
 		{
-			user.sendMessage(Util.i18n("powerToolAir"));
+			user.clearAllPowertools();
+			user.sendMessage(Util.i18n("powerToolClearAll"));
 			return;
 		}
-		String command = getFinalArg(args, 0);
+		
+		final ItemStack itemStack = user.getItemInHand();
+		if (itemStack == null || itemStack.getType() == Material.AIR)
+		{
+			throw new Exception(Util.i18n("powerToolAir"));
+		}
+
+		final String itemName = itemStack.getType().toString().toLowerCase().replaceAll("_", " ");
+		List<String> powertools = user.getPowertool(itemStack);
 		if (command != null && !command.isEmpty())
 		{
-			user.sendMessage(Util.format("powerToolAttach",is.getType().toString().toLowerCase().replaceAll("_", " ")));
+			if (command.equalsIgnoreCase("l:"))
+			{
+				if (powertools == null || powertools.isEmpty())
+				{
+					throw new Exception(Util.format("powerToolListEmpty", itemName));
+				}
+				else
+				{
+					user.sendMessage(Util.format("powerToolList", Util.joinList(powertools), itemName));
+				}
+				return;
+			}
+			if (command.startsWith("r:"))
+			{
+				try
+				{
+					command = command.substring(2);
+					if (!powertools.contains(command))
+					{
+						throw new Exception(Util.format("powerToolNoSuchCommandAssigned", command, itemName));
+					}
+
+					powertools.remove(command);
+					user.sendMessage(Util.format("powerToolRemove", command, itemName));
+				}
+				catch (Exception e)
+				{
+					user.sendMessage(e.getMessage());
+					return;
+				}
+			}
+			else
+			{
+				if (command.startsWith("a:"))
+				{
+					command = command.substring(2);
+					if (powertools.contains(command))
+					{
+						throw new Exception(Util.format("powerToolAlreadySet", command, itemName));
+					}
+				}
+				else if (powertools != null && !powertools.isEmpty())
+				{
+					// Replace all commands with this one
+					powertools.clear();
+				}
+				else
+				{
+					powertools = new ArrayList<String>();
+				}
+
+				powertools.add(command);
+				user.sendMessage(Util.format("powerToolAttach", Util.joinList(powertools), itemName));
+			}
 		}
 		else
 		{
-			user.sendMessage(Util.format("powerToolRemove", is.getType().toString().toLowerCase().replaceAll("_", " ")));
+			if (powertools != null)
+			{
+				powertools.clear();
+			}
+			user.sendMessage(Util.format("powerToolRemoveAll", itemName));
 		}
-		charge(user);
-		user.setPowertool(is, command);
+
+		user.setPowertool(itemStack, powertools);
 	}
 }

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

@@ -0,0 +1,29 @@
+package com.earth2me.essentials.commands;
+
+import com.earth2me.essentials.User;
+import com.earth2me.essentials.Util;
+import org.bukkit.Server;
+
+
+public class Commandpowertooltoggle extends EssentialsCommand
+{
+	public Commandpowertooltoggle()
+	{
+		super("powertooltoggle");
+	}
+
+	@Override
+	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
+	{
+		if(!user.hasPowerTools())
+		{
+			user.sendMessage(Util.i18n("noPowerTools"));
+			return;
+		}		
+		user.sendMessage(user.togglePowerToolsEnabled()
+						 ? Util.i18n("powerToolsEnabled")
+						 : Util.i18n("powerToolsDisabled"));		
+	}
+		
+		
+}

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

@@ -11,7 +11,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
@@ -97,29 +96,31 @@ public class Commandptime extends EssentialsCommand
 	 */
 	private void getUsersTime(final CommandSender sender, final Collection<User> users)
 	{
-		if (users.size() > 1) 
+		if (users.size() > 1)
 		{
 			sender.sendMessage(Util.format("pTimePlayers"));
 		}
-		
-		for (User user : users) 
+
+		for (User user : users)
 		{
-			if(user.getPlayerTimeOffset() == 0)
+			if (user.getPlayerTimeOffset() == 0)
 			{
 				sender.sendMessage(Util.format("pTimeNormal", user.getName()));
 			}
-			else {
+			else
+			{
 				String time = DescParseTickFormat.format(user.getPlayerTime());
-				if(!user.isPlayerTimeRelative()) 
+				if (!user.isPlayerTimeRelative())
 				{
 					sender.sendMessage(Util.format("pTimeCurrentFixed", user.getName(), time));
 				}
-				else {
+				else
+				{
 					sender.sendMessage(Util.format("pTimeCurrent", user.getName(), time));
 				}
 			}
 		}
-		
+
 		return;
 	}
 
@@ -177,7 +178,8 @@ public class Commandptime extends EssentialsCommand
 			{
 				sender.sendMessage(Util.format("pTimeSetFixed", time, msg.toString()));
 			}
-			else {
+			else
+			{
 				sender.sendMessage(Util.format("pTimeSet", time, msg.toString()));
 			}
 		}

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

@@ -32,11 +32,9 @@ public class Commandr extends EssentialsCommand
 
 		if (target == null)
 		{
-			sender.sendMessage(Util.i18n("foreverAlone"));
-			return;
+			throw new Exception(Util.i18n("foreverAlone"));
 		}
 
-		charge(sender);
 		sender.sendMessage(Util.format("msgFormat", Util.i18n("me"), targetName, message));
 		if (target instanceof Player)
 		{

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

@@ -1,6 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
@@ -15,14 +16,13 @@ public class Commandrealname extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
 		final String whois = args[0].toLowerCase();
-		charge(user);
 		for (Player p : server.getOnlinePlayers())
 		{
 			final User u = ess.getUser(p);
@@ -37,7 +37,7 @@ public class Commandrealname extends EssentialsCommand
 			{
 				continue;
 			}
-			user.sendMessage(u.getDisplayName() + " " + Util.i18n("is") + " " + u.getName());
+			sender.sendMessage(u.getDisplayName() + " " + Util.i18n("is") + " " + u.getName());
 		}
 	}
 }

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

@@ -15,7 +15,6 @@ public class Commandreloadall extends EssentialsCommand
 	@Override
 	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		charge(sender);
 		server.reload();
 		sender.sendMessage(Util.i18n("reloadAllPlugins"));
 	}

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

@@ -1,21 +1,17 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.ChargeException;
+import com.earth2me.essentials.IUser;
+import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import java.util.ArrayList;
+import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
 
 
-/**
- *
- * @author Seiji
- */
 public class Commandrepair extends EssentialsCommand
 {
 	public Commandrepair()
@@ -24,7 +20,7 @@ public class Commandrepair extends EssentialsCommand
 	}
 
 	@Override
-	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
+	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
 		if (args.length < 1)
 		{
@@ -33,46 +29,36 @@ public class Commandrepair extends EssentialsCommand
 
 		if (args[0].equalsIgnoreCase("hand"))
 		{
-			ItemStack item = user.getItemInHand();
-			try
+			final ItemStack item = user.getItemInHand();
+			if (item == null)
 			{
-				repairItem(item);
-			}
-			catch (Exception e)
-			{
-				user.sendMessage(e.getMessage());
-				return;
+				throw new Exception(Util.i18n("repairInvalidType"));
 			}
+			final String itemName = item.getType().toString().toLowerCase();
+			final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), ess);
 
-			String itemName = item.getType().toString().toLowerCase().replace('_', ' ');
-			charge(user);
-			user.sendMessage(Util.format("repair", itemName));
+			charge.isAffordableFor(user);
+
+			repairItem(item);
+
+			charge.charge(user);
+
+			user.sendMessage(Util.format("repair", itemName.replace('_', ' ')));
 		}
 		else if (args[0].equalsIgnoreCase("all"))
 		{
-			StringBuilder itemList = new StringBuilder();
-			itemList.append(repairItems(user.getInventory().getContents()));
+			final List<String> repaired = new ArrayList<String>();
+			repairItems(user.getInventory().getContents(), user, repaired);
 
-			String armor = repairItems(user.getInventory().getArmorContents());
+			repairItems(user.getInventory().getArmorContents(), user, repaired);
 
-			if (armor.length() > 0)
+			if (repaired.isEmpty())
 			{
-				if (itemList.length() > 0)
-				{
-					itemList.append(", ");
-				}
-
-				itemList.append(armor);
-			}
-
-			if (itemList.length() == 0)
-			{
-				user.sendMessage(Util.format("repairNone"));
+				throw new Exception(Util.format("repairNone"));
 			}
 			else
 			{
-				charge(user);
-				user.sendMessage(Util.format("repair", itemList.toString()));
+				user.sendMessage(Util.format("repair", Util.joinList(repaired)));
 			}
 
 		}
@@ -82,10 +68,9 @@ public class Commandrepair extends EssentialsCommand
 		}
 	}
 
-	private void repairItem(ItemStack item) throws Exception
+	private void repairItem(final ItemStack item) throws Exception
 	{
-		Material material = Material.getMaterial(item.getTypeId());
-		String error = null;
+		final Material material = Material.getMaterial(item.getTypeId());
 		if (material.isBlock() || material.getMaxDurability() < 0)
 		{
 			throw new Exception(Util.i18n("repairInvalidType"));
@@ -99,28 +84,43 @@ public class Commandrepair extends EssentialsCommand
 		item.setDurability((short)0);
 	}
 
-	private String repairItems(ItemStack[] items)
+	private void repairItems(final ItemStack[] items, final IUser user, final List<String> repaired)
 	{
-		StringBuilder itemList = new StringBuilder();
 		for (ItemStack item : items)
 		{
+			if (item == null)
+			{
+				continue;
+			}
+			final String itemName = item.getType().toString().toLowerCase();
+			final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), ess);
+			try
+			{
+				charge.isAffordableFor(user);
+			}
+			catch (ChargeException ex)
+			{
+				user.sendMessage(ex.getMessage());
+				continue;
+			}
+
 			try
 			{
 				repairItem(item);
-				if (itemList.length() > 0)
-				{
-					itemList.append(", ");
-				}
-
-				String itemName = item.getType().toString().toLowerCase().replace('_', ' ');
-				itemList.append(itemName);
 			}
 			catch (Exception e)
 			{
+				continue;
 			}
-
+			try
+			{
+				charge.charge(user);
+			}
+			catch (ChargeException ex)
+			{
+				user.sendMessage(ex.getMessage());
+			}
+			repaired.add(itemName.replace('_', ' '));
 		}
-
-		return itemList.toString();
 	}
 }

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

@@ -15,7 +15,6 @@ public class Commandrules extends EssentialsCommand
 	@Override
 	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		charge(sender);
 		for (String m : ess.getLines(sender, "rules", Util.i18n("noRules")))
 		{
 			sender.sendMessage(m);

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

@@ -145,11 +145,9 @@ public class Commandsell extends EssentialsCommand
 		{
 			user.sendMessage(Util.i18n("itemNotEnough1"));
 			user.sendMessage(Util.i18n("itemNotEnough2"));
-			user.sendMessage(Util.i18n("itemNotEnough3"));
-			return;
+			throw new Exception(Util.i18n("itemNotEnough3"));
 		}
 
-		charge(user);
 		final ItemStack ris = new ItemStack(is.getType(), amount, is.getDurability());
 		InventoryWorkaround.removeItem(user.getInventory(), true, ris);
 		user.updateInventory();

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

@@ -17,16 +17,38 @@ public class Commandsethome extends EssentialsCommand
 	{
 		if (args.length > 0)
 		{
+			//Allowing both formats /sethome khobbits house | /sethome khobbits:house
+			final String[] nameParts = args[0].split(":");
+			if (nameParts[0].length() != args[0].length())
+			{
+				args = nameParts;
+			}
+
 			if (args.length < 2)
 			{
-				user.setHome(args[0].equalsIgnoreCase("default"));
+				if (user.isAuthorized("essentials.sethome.multiple"))
+				{
+					if ((user.isAuthorized("essentials.sethome.multiple.unlimited")) || (user.getHomes().size() < ess.getSettings().getHomeLimit(user))
+						|| (user.getHomes().contains(args[0].toLowerCase())))
+					{
+						user.setHome(args[0].toLowerCase());
+					}
+					else
+					{
+						throw new Exception(Util.format("maxHomes", ess.getSettings().getHomeLimit(user)));
+					}
+
+				}
+				else {
+					throw new Exception(Util.format("maxHomes", 1));
+				}
 			}
 			else
 			{
 				if (user.isAuthorized("essentials.sethome.others"))
 				{
 					User usersHome = ess.getUser(ess.getServer().getPlayer(args[0]));
-					if(usersHome == null)
+					if (usersHome == null)
 					{
 						usersHome = ess.getOfflineUser(args[0]);
 					}
@@ -34,15 +56,19 @@ public class Commandsethome extends EssentialsCommand
 					{
 						throw new Exception(Util.i18n("playerNotFound"));
 					}
-					usersHome.setHome(user.getLocation(), args[1].equalsIgnoreCase("default"));
+					String name = args[1].toLowerCase();
+					if (!user.isAuthorized("essentials.sethome.multiple"))
+					{
+						name = "home";
+					}
+					usersHome.setHome(name, user.getLocation());
 				}
 			}
 		}
 		else
 		{
-			user.setHome(false);
+			user.setHome();
 		}
-		charge(user);
 		user.sendMessage(Util.i18n("homeSet"));
 
 	}

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

@@ -15,12 +15,10 @@ public class Commandsetjail extends EssentialsCommand
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
-		
 		if (args.length < 1)
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		charge(user);
 		ess.getJail().setJail(user.getLocation(), args[0]);
 		user.sendMessage(Util.format("jailSet",args[0]));