diff options
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/commands/Commandbalance.java')
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandbalance.java | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java index fde83a561..062709bd4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java @@ -21,18 +21,25 @@ public class Commandbalance extends EssentialsCommand { throw new NotEnoughArgumentsException(); } - sender.sendMessage(_("balance", Util.displayCurrency(getPlayer(server, args, 0, true, true).getMoney(), ess))); + + User target = getPlayer(server, args, 0, true, true); + sender.sendMessage(_("balanceOther", target.getDisplayName(), Util.displayCurrency(target.getMoney(), ess))); } @Override public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - //TODO: Remove 'other' perm - final double bal = (args.length < 1 - || !(user.isAuthorized("essentials.balance.others") - || user.isAuthorized("essentials.balance.other")) - ? user - : getPlayer(server, args, 0, true, true)).getMoney(); - user.sendMessage(_("balance", Util.displayCurrency(bal, ess))); + + if (args.length < 1 || !user.isAuthorized("essentials.balance.others")) + { + final double bal = user.getMoney(); + user.sendMessage(_("balance", Util.displayCurrency(bal, ess))); + } + else + { + final User target = getPlayer(server, args, 0, true, true); + final double bal = target.getMoney(); + user.sendMessage(_("balanceOther", target.getDisplayName(), Util.displayCurrency(bal, ess))); + } } } |