diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-01-19 17:12:07 -0800 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-01-19 17:12:07 -0800 |
commit | 23a15cb11a9ca3de2a6f22142abf767082815bf6 (patch) | |
tree | 3f7db184a29df990613021229efd1593d5285e1f | |
parent | 41547e3243941294bd1a3fd09d4d1b985c964fbf (diff) | |
parent | a586edfd0b5f18893dbe177610031e028fa60ea2 (diff) | |
download | Essentials-23a15cb11a9ca3de2a6f22142abf767082815bf6.tar Essentials-23a15cb11a9ca3de2a6f22142abf767082815bf6.tar.gz Essentials-23a15cb11a9ca3de2a6f22142abf767082815bf6.tar.lz Essentials-23a15cb11a9ca3de2a6f22142abf767082815bf6.tar.xz Essentials-23a15cb11a9ca3de2a6f22142abf767082815bf6.zip |
Merge pull request #274 from GunfighterJ/2.9
Cleanup /eco, fix reset broadcast
-rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandeco.java | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java b/Essentials/src/com/earth2me/essentials/commands/Commandeco.java index 1c391a9bd..6b2a31c9e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandeco.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandeco.java @@ -18,8 +18,10 @@ public class Commandeco extends EssentialsCommand @Override public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception { - double startingBalance = (double)ess.getSettings().getStartingBalance(); - String start = ess.getSettings().getCurrencySymbol() + ess.getSettings().getStartingBalance(); + boolean broadcast = false; + boolean broadcastAll = false; + final double startingBalance = (double)ess.getSettings().getStartingBalance(); + final String start = ess.getSettings().getCurrencySymbol() + ess.getSettings().getStartingBalance(); if (args.length < 2) { throw new NotEnoughArgumentsException(); @@ -36,11 +38,10 @@ public class Commandeco extends EssentialsCommand throw new NotEnoughArgumentsException(ex); } - double min = ess.getSettings().getMinMoney(); + final double minBalance = ess.getSettings().getMinMoney(); if (args[1].contentEquals("**")) { - server.broadcastMessage(_("resetBalAll", start)); for (String sUser : ess.getUserMap().getAllUniqueUsers()) { final User player = ess.getUser(sUser); @@ -66,18 +67,18 @@ public class Commandeco extends EssentialsCommand case RESET: player.setMoney(startingBalance); + broadcastAll = true; break; case SET: - boolean underMinimum = (player.getMoney() - amount) < min; - player.setMoney(underMinimum ? min : amount); + boolean underMinimum = (player.getMoney() - amount) < minBalance; + player.setMoney(underMinimum ? minBalance : amount); break; } } } else if (args[1].contentEquals("*")) { - server.broadcastMessage(_("resetBal", start)); for (Player onlinePlayer : server.getOnlinePlayers()) { final User player = ess.getUser(onlinePlayer); @@ -103,11 +104,12 @@ public class Commandeco extends EssentialsCommand case RESET: player.setMoney(startingBalance); + broadcast = true; break; case SET: - boolean underMinimum = (player.getMoney() - amount) < min; - player.setMoney(underMinimum ? min : amount); + boolean underMinimum = (player.getMoney() - amount) < minBalance; + player.setMoney(underMinimum ? minBalance : amount); break; } } @@ -140,11 +142,20 @@ public class Commandeco extends EssentialsCommand break; case SET: - boolean underMinimum = (player.getMoney() - amount) < min; - player.setMoney(underMinimum ? min : amount); + boolean underMinimum = (player.getMoney() - amount) < minBalance; + player.setMoney(underMinimum ? minBalance : amount); break; } } + + if(broadcast) + { + server.broadcastMessage(_("resetBal", start)); + } + if(broadcastAll) + { + server.broadcastMessage(_("resetBalAll", start)); + } } |