Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-19 19:41:01 +02:00
Code Issues Projects Releases Wiki Activity

[CHANGE] Rewrite eco command with better logic :: the command will now attempt to do exactly what it is told, with respect to the minimum balance :: fix missing messages

Browse Source
This commit is contained in:
Iaccidentally 2013-04-27 23:44:23 -04:00
parent 3396cf6e02
commit 02df03a4b1
15 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
Essentials/src/com/earth2me/essentials/commands/Commandeco.java
View File

@ -19,27 +19,26 @@ public class Commandeco extends EssentialsCommand
@Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
Double broadcast = null;
Double broadcastAll = null;
final double startingBalance = (double)ess.getSettings().getStartingBalance();
if (args.length < 2)
{
throw new NotEnoughArgumentsException();
}
EcoCommands cmd;
Commandeco.EcoCommands cmd;
double startingBalance = (double)ess.getSettings().getStartingBalance();
double amount;
Double broadcast = null;
Double broadcastAll = null;
try
{
cmd = EcoCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH));
amount = Double.parseDouble(args[2].replaceAll("[^0-9\\.]", ""));
cmd = Commandeco.EcoCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH));
amount = (cmd == Commandeco.EcoCommands.RESET) ? startingBalance : Double.parseDouble(args[2].replaceAll("[^0-9\\.]", ""));
}
catch (Exception ex)
{
throw new NotEnoughArgumentsException(ex);
}
final double minBalance = ess.getSettings().getMinMoney();
if (args[1].contentEquals("**"))
{
for (String sUser : ess.getUserMap().getAllUniqueUsers())
@ -52,28 +51,13 @@ public class Commandeco extends EssentialsCommand
break;
case TAKE:
if (player.canAfford(amount, false))
{
player.takeMoney(amount);
}
else
{
if (player.getMoney() > 0)
{
player.setMoney(0);
}
}
take(amount, player, null);
break;
case RESET:
player.setMoney(startingBalance);
broadcastAll = startingBalance;
break;
case SET:
boolean underMinimum = (player.getMoney() - amount) < minBalance;
player.setMoney(underMinimum ? minBalance : amount);
broadcastAll = underMinimum ? minBalance : amount;
set(amount, player, null);
broadcastAll = amount;
break;
}
}
@ -90,28 +74,13 @@ public class Commandeco extends EssentialsCommand
break;
case TAKE:
if (player.canAfford(amount))
{
player.takeMoney(amount);
}
else
{
if (player.getMoney() > 0)
{
player.setMoney(0);
}
}
take(amount, player, null);
break;
case RESET:
player.setMoney(startingBalance);
broadcast = startingBalance;
break;
case SET:
boolean underMinimum = (player.getMoney() - amount) < minBalance;
player.setMoney(underMinimum ? minBalance : amount);
broadcast = underMinimum ? minBalance : amount;
set(amount, player, null);
broadcast = amount;
break;
}
}
@ -126,21 +95,12 @@ public class Commandeco extends EssentialsCommand
break;
case TAKE:
if (!player.canAfford(amount))
{
throw new Exception(_("notEnoughMoney"));
}
player.takeMoney(amount, sender);
take(amount, player, sender);
break;
case RESET:
player.setMoney(startingBalance);
break;
case SET:
boolean underMinimum = (player.getMoney() - amount) < minBalance;
player.setMoney(underMinimum ? minBalance : amount);
set(amount, player, sender);
break;
}
}
@ -155,9 +115,37 @@ public class Commandeco extends EssentialsCommand
}
}
private void take(double amount, final User player, final CommandSender sender)
{
double money = player.getMoney();
double minBalance = ess.getSettings().getMinMoney();
if (money - amount > minBalance)
{
player.takeMoney(amount, sender);
}
else
{
player.sendMessage(_("takenFromAccount", Util.displayCurrency(money - minBalance, ess)));
sender.sendMessage(_("takenFromOthersAccount", Util.displayCurrency(money - minBalance, ess), player.getDisplayName(), Util.displayCurrency(player.getMoney(), ess)));
player.setMoney(minBalance);
}
}
private void set(double amount, final User player, final CommandSender sender)
{
double minBalance = ess.getSettings().getMinMoney();
boolean underMinimum = amount < minBalance;
player.setMoney(underMinimum ? minBalance : amount);
player.sendMessage(_("setBal", Util.displayCurrency(player.getMoney(), ess)));
if (sender != null)
{
sender.sendMessage(_("setBalOthers", player.getDisplayName(), Util.displayCurrency(player.getMoney(), ess)));
}
}
private enum EcoCommands
{
GIVE, TAKE, RESET, SET
GIVE, TAKE, SET, RESET
}
}

2
Essentials/src/messages.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs.
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_cs.properties
View File

@ -538,3 +538,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_da.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_de.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_en.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs.
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_es.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_fi.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_fr.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_it.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_nl.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_pl.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Niepoprawny typ pogody
cannotStackMob=\u00a74Nie masz uprawnien by stackowac wiele mobow
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_pt.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_ro.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.

2
Essentials/src/messages_se.properties
View File

@ -535,3 +535,5 @@ pWeatherInvalidAlias=\u00a74Invalid weather type
cannotStackMob=\u00a74You do not have permission to stack multiple mobs
kitNotFound=\u00a74That kit does not exist.
socialSpy=\u00a76SocialSpy for {0}\u00a76: {1}
setBal=\u00a7aYour balance was set to {0}.
setBalOthers=\u00a7aYou set {0}''s balance to {1}.