Refactoring: New Charge class

user.canAfford(String), user.canAfford(EssentialsCommand), user.charge(String), user.charge(EssentialsCommand) have been removed.
Teleport class has been changed to use the Charge class.
This also fixes some bugs, like the one with warp signs.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1512 e251c2fe-e539-e718-e476-b85c1f46cddb

1 files changed, 0 insertions, 36 deletions

diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 26279171f..c8ef473c0 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -117,32 +117,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo
 		sendMessage(Util.format("takenFromAccount", Util.formatCurrency(value)));
 	}
 
-	public void charge(String cmd) throws Exception
-	{
-		if (isAuthorized("essentials.nocommandcost.all")
-			|| isAuthorized("essentials.nocommandcost." + cmd))
-		{
-			return;
-		}
-		double mon = getMoney();
-		double cost = ess.getSettings().getCommandCost(cmd.startsWith("/") ? cmd.substring(1) : cmd);
-		if (mon < cost && !isAuthorized("essentials.eco.loan"))
-		{
-			throw new Exception(Util.i18n("notEnoughMoney"));
-		}
-		takeMoney(cost);
-	}
-
-	public void canAfford(String cmd) throws Exception
-	{
-		double mon = getMoney();
-		double cost = ess.getSettings().getCommandCost(cmd.startsWith("/") ? cmd.substring(1) : cmd);
-		if (mon < cost && !isAuthorized("essentials.eco.loan"))
-		{
-			throw new Exception(Util.i18n("notEnoughMoney"));
-		}
-	}
-
 	public boolean canAfford(double cost)
 	{
 		double mon = getMoney();
@@ -156,21 +130,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo
 		}
 	}
 
-	public void canAfford(IEssentialsCommand cmd) throws Exception
-	{
-		canAfford(cmd.getName());
-	}
-
 	public void dispose()
 	{
 		this.base = new OfflinePlayer(getName());
 	}
 
-	public void charge(IEssentialsCommand cmd) throws Exception
-	{
-		charge(cmd.getName());
-	}
-
 	public boolean getJustPortaled()
 	{
 		return justPortaled;