From d425ab5f93b429da5902c530bcb81fce86669bf8 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 30 Apr 2013 00:03:59 +0100 Subject: Fix Eco take bug and fix NPE --- .../src/com/earth2me/essentials/commands/Commandeco.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java b/Essentials/src/com/earth2me/essentials/commands/Commandeco.java index 16cbdbcc3..c3c64b904 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandeco.java @@ -19,11 +19,11 @@ public class Commandeco extends EssentialsCommand @Override public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception { - if (args.length < 2) { throw new NotEnoughArgumentsException(); } + Commandeco.EcoCommands cmd; double startingBalance = (double)ess.getSettings().getStartingBalance(); 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 minBalance = ess.getSettings().getMinMoney(); @@ -123,11 +123,14 @@ public class Commandeco extends EssentialsCommand { player.takeMoney(amount, sender); } - else + else if (sender == null) { - 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); + player.sendMessage(_("takenFromAccount", Util.displayCurrency(money - minBalance, ess))); + } + else + { + throw new Exception(_("notEnoughMoney")); } } -- cgit v1.2.3