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

Fix Eco take bug and fix NPE

Browse Source
This commit is contained in:
KHobbits 2013-04-30 00:03:59 +01:00
parent 012741fea6
commit d425ab5f93
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,11 +19,11 @@ public class Commandeco extends EssentialsCommand
@Override @Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 2) if (args.length < 2)
{ {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
Commandeco.EcoCommands cmd; Commandeco.EcoCommands cmd;
double startingBalance = (double)ess.getSettings().getStartingBalance(); double startingBalance = (double)ess.getSettings().getStartingBalance();
double amount; double amount;
@ -115,7 +115,7 @@ public class Commandeco extends EssentialsCommand
} }
} }
private void take(double amount, final User player, final CommandSender sender) private void take(double amount, final User player, final CommandSender sender) throws Exception
{ {
double money = player.getMoney(); double money = player.getMoney();
double minBalance = ess.getSettings().getMinMoney(); double minBalance = ess.getSettings().getMinMoney();
@ -123,11 +123,14 @@ public class Commandeco extends EssentialsCommand
{ {
player.takeMoney(amount, sender); player.takeMoney(amount, sender);
} }
else if (sender == null)
{
player.setMoney(minBalance);
player.sendMessage(_("takenFromAccount", Util.displayCurrency(money - minBalance, ess)));
}
else else
{ {
player.sendMessage(_("takenFromAccount", Util.displayCurrency(money - minBalance, ess))); throw new Exception(_("notEnoughMoney"));
sender.sendMessage(_("takenFromOthersAccount", Util.displayCurrency(money - minBalance, ess), player.getDisplayName(), Util.displayCurrency(player.getMoney(), ess)));
player.setMoney(minBalance);
} }
} }