Merge branch 'refs/heads/master' into 3.0

Conflicts:
	.gitignore
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsTimer.java
	Essentials/src/com/earth2me/essentials/ISettings.java
	Essentials/src/com/earth2me/essentials/Jails.java
	Essentials/src/com/earth2me/essentials/OfflinePlayer.java
	Essentials/src/com/earth2me/essentials/Settings.java
	Essentials/src/com/earth2me/essentials/User.java
	Essentials/src/com/earth2me/essentials/UserData.java
	Essentials/src/com/earth2me/essentials/UserMap.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/commands/Commandnear.java
	Essentials/src/com/earth2me/essentials/commands/Commandping.java
	Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
	Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
	Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
	Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
	Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
	Essentials/src/messages_en.properties
	Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
	Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
	EssentialsChat/src/plugin.yml
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java

5 files changed, 24 insertions, 30 deletions

diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java
index c143797ea..d7c53ac44 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java
@@ -44,9 +44,9 @@ public class SignBlockListener implements Listener
 		if (mat == Material.SIGN_POST.getId() || mat == Material.WALL_SIGN.getId())
 		{
 			final Sign csign = (Sign)block.getState();
-			for (Signs signs : Signs.values())
+
+			for (EssentialsSign sign : ess.getSettings().enabledSigns())
 			{
-				final EssentialsSign sign = signs.getSign();
 				if (csign.getLine(0).equalsIgnoreCase(sign.getSuccessName())
 					&& !sign.onSignBreak(block, player, ess))
 				{
@@ -62,9 +62,8 @@ public class SignBlockListener implements Listener
 				LOGGER.log(Level.INFO, "Prevented that a block was broken next to a sign.");
 				return true;
 			}
-			for (Signs signs : Signs.values())
+			for (EssentialsSign sign : ess.getSettings().enabledSigns())
 			{
-				final EssentialsSign sign = signs.getSign();
 				if (sign.getBlocks().contains(block.getType())
 					&& !sign.onBlockBreak(block, player, ess))
 				{
@@ -159,9 +158,8 @@ public class SignBlockListener implements Listener
 			event.setCancelled(true);
 			return;
 		}
-		for (Signs signs : Signs.values())
+		for (EssentialsSign sign : ess.getSettings().enabledSigns())
 		{
-			final EssentialsSign sign = signs.getSign();
 			if (sign.getBlocks().contains(block.getType())
 				&& !sign.onBlockBurn(block, ess))
 			{
@@ -188,9 +186,8 @@ public class SignBlockListener implements Listener
 			event.setCancelled(true);
 			return;
 		}
-		for (Signs signs : Signs.values())
+		for (EssentialsSign sign : ess.getSettings().enabledSigns())
 		{
-			final EssentialsSign sign = signs.getSign();
 			if (sign.getBlocks().contains(block.getType())
 				&& !sign.onBlockIgnite(block, ess))
 			{
@@ -213,9 +210,8 @@ public class SignBlockListener implements Listener
 				event.setCancelled(true);
 				return;
 			}
-			for (Signs signs : Signs.values())
+			for (EssentialsSign sign : ess.getSettings().enabledSigns())
 			{
-				final EssentialsSign sign = signs.getSign();
 				if (sign.getBlocks().contains(block.getType())
 					&& !sign.onBlockPush(block, ess))
 				{
@@ -240,9 +236,8 @@ public class SignBlockListener implements Listener
 				event.setCancelled(true);
 				return;
 			}
-			for (Signs signs : Signs.values())
+			for (EssentialsSign sign : ess.getSettings().enabledSigns())
 			{
-				final EssentialsSign sign = signs.getSign();
 				if (sign.getBlocks().contains(block.getType())
 					&& !sign.onBlockPush(block, ess))
 				{
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java
index 2d3413559..1b540c807 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java
@@ -6,7 +6,7 @@ import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EndermanPickupEvent;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 
 
@@ -32,9 +32,8 @@ public class SignEntityListener implements Listener
 				event.setCancelled(true);
 				return;
 			}
-			for (Signs signs : Signs.values())
+			for (EssentialsSign sign : ess.getSettings().enabledSigns())
 			{
-				final EssentialsSign sign = signs.getSign();
 				if (sign.getBlocks().contains(block.getType()))
 				{
 					event.setCancelled(!sign.onBlockExplode(block, ess));
@@ -45,7 +44,7 @@ public class SignEntityListener implements Listener
 	}
 
 	@EventHandler(priority = EventPriority.LOW)
-	public void onEndermanPickup(final EndermanPickupEvent event)
+	public void onEntityChangeBlock(final EntityChangeBlockEvent event)
 	{
 		if (event.isCancelled())
 		{
@@ -61,9 +60,8 @@ public class SignEntityListener implements Listener
 			event.setCancelled(true);
 			return;
 		}
-		for (Signs signs : Signs.values())
+		for (EssentialsSign sign : ess.getSettings().enabledSigns())
 		{
-			final EssentialsSign sign = signs.getSign();
 			if (sign.getBlocks().contains(block.getType())
 				&& !sign.onBlockBreak(block, ess))
 			{
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java
index dd2219ef8..11e4fb2b4 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignPlayerListener.java
@@ -41,9 +41,8 @@ public class SignPlayerListener implements Listener
 				return;
 			}
 			final Sign csign = (Sign)block.getState();
-			for (Signs signs : Signs.values())
+			for (EssentialsSign sign : ess.getSettings().enabledSigns())
 			{
-				final EssentialsSign sign = signs.getSign();
 				if (csign.getLine(0).equalsIgnoreCase(sign.getSuccessName()))
 				{
 					sign.onSignInteract(block, event.getPlayer(), ess);
@@ -54,9 +53,8 @@ public class SignPlayerListener implements Listener
 		}
 		else
 		{
-			for (Signs signs : Signs.values())
+			for (EssentialsSign sign : ess.getSettings().enabledSigns())
 			{
-				final EssentialsSign sign = signs.getSign();
 				if (sign.getBlocks().contains(block.getType())
 					&& !sign.onBlockInteract(block, event.getPlayer(), ess))
 				{
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
index c5733a11e..2ea488ec8 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
@@ -129,7 +129,7 @@ public class SignProtection extends EssentialsSign
 		if (block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN)
 		{
 			final BlockSign sign = new BlockSign(block);
-			if (sign.getLine(0).equalsIgnoreCase(this.getSuccessName()))
+			if (sign.getLine(0).equals(this.getSuccessName()))
 			{
 				return checkProtectionSign(sign, user, username, ess);
 			}
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java
index 01cbae6b7..c57d94bb8 100644
--- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java
+++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java
@@ -40,7 +40,7 @@ public class SignTrade extends EssentialsSign
 			try
 			{
 				stored = getTrade(sign, 1, true, true, ess);
-				substractAmount(sign, 1, stored, ess);
+				subtractAmount(sign, 1, stored, ess);
 				stored.pay(player);
 			}
 			catch (SignException e)
@@ -57,12 +57,14 @@ public class SignTrade extends EssentialsSign
 			final Trade charge = getTrade(sign, 1, false, false, ess);
 			final Trade trade = getTrade(sign, 2, false, true, ess);
 			charge.isAffordableFor(player);
+			addAmount(sign, 1, charge, ess);
+			subtractAmount(sign, 2, trade, ess);
 			if (!trade.pay(player, false))
 			{
+				subtractAmount(sign, 1, charge, ess);
+				addAmount(sign, 2, trade, ess);
 				throw new ChargeException("Full inventory");
 			}
-			substractAmount(sign, 2, trade, ess);
-			addAmount(sign, 1, charge, ess);
 			charge.charge(player);
 			Trade.log("Sign", "Trade", "Interact", sign.getLine(3), charge, username, trade, sign.getBlock().getLocation(), ess);
 		}
@@ -260,7 +262,7 @@ public class SignTrade extends EssentialsSign
 		throw new SignException(_("invalidSignLine", index + 1));
 	}
 
-	protected final void substractAmount(final ISign sign, final int index, final Trade trade, final IEssentials ess) throws SignException
+	protected final void subtractAmount(final ISign sign, final int index, final Trade trade, final IEssentials ess) throws SignException
 	{
 		final Double money = trade.getMoney();
 		if (money != null)
@@ -298,6 +300,7 @@ public class SignTrade extends EssentialsSign
 		}
 	}
 
+	//TODO: Translate these exceptions.
 	private void changeAmount(final ISign sign, final int index, final double value, final IEssentials ess) throws SignException
 	{
 
@@ -317,7 +320,7 @@ public class SignTrade extends EssentialsSign
 				final String newline = Util.formatCurrency(money, ess) + ":" + Util.formatCurrency(amount + value, ess).substring(1);
 				if (newline.length() > 15)
 				{
-					throw new SignException("Line too long!");
+					throw new SignException("This sign is full: Line too long!");
 				}
 				sign.setLine(index, newline);
 				return;
@@ -333,7 +336,7 @@ public class SignTrade extends EssentialsSign
 				final String newline = stackamount + " " + split[1] + ":" + (amount + Math.round(value));
 				if (newline.length() > 15)
 				{
-					throw new SignException("Line too long!");
+					throw new SignException("This sign is full: Line too long!");
 				}
 				sign.setLine(index, newline);
 				return;
@@ -347,7 +350,7 @@ public class SignTrade extends EssentialsSign
 				final String newline = stackamount + " " + split[1] + ":" + (amount + Math.round(value));
 				if (newline.length() > 15)
 				{
-					throw new SignException("Line too long!");
+					throw new SignException("This sign is full: Line too long!");
 				}
 				sign.setLine(index, newline);
 				return;