diff options
| author | Iaccidentally <coryhuckaby@gmail.com> | 2012-11-16 00:25:00 -0800 |
|---|---|---|
| committer | Iaccidentally <coryhuckaby@gmail.com> | 2012-11-16 00:25:00 -0800 |
| commit | bcc4bb39fa56edc090802f781f63fe4716109de7 (patch) | |
| tree | b1a8426be7ee9637dfaa720b7c4a8b51d025235c | |
| parent | 9551cc0cd22dd29744d113477281a464bfb7238b (diff) | |
| parent | 4e0a221dfe104f6996fabd11c0fc767a2a94c0ff (diff) | |
| download | Essentials-bcc4bb39fa56edc090802f781f63fe4716109de7.tar Essentials-bcc4bb39fa56edc090802f781f63fe4716109de7.tar.gz Essentials-bcc4bb39fa56edc090802f781f63fe4716109de7.tar.lz Essentials-bcc4bb39fa56edc090802f781f63fe4716109de7.tar.xz Essentials-bcc4bb39fa56edc090802f781f63fe4716109de7.zip | |
Merge pull request #199 from evonuts/master
Clean PR for /eco reset broadcast messages.
| -rw-r--r-- | Essentials/src/messages.properties | 2 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandeco.java | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index db3dd53da..677407742 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -78,6 +78,8 @@ disabledToSpawnMob=\u00a74Spawning this mob was disabled in the config file. dontMoveMessage=\u00a76Teleportation will commence in\u00a7c {0}\u00a76. Don''t move. downloadingGeoIp=Downloading GeoIP database ... this might take a while (country: 0.6 MB, city: 20MB) duplicatedUserdata=Duplicated userdata: {0} and {1} +ecoResetAll=\u00a76All player balances on this server have been reset to \u00a7c{0}. +ecoResetAllOnline=\u00a76All online player balances have been reset to \u00a7c{0}. durability=\u00a76This tool has \u00a7c{0}\u00a76 uses left. enableUnlimited=\u00a76Giving unlimited amount of\u00a7c {0} \u00a76to {1}. enabled=enabled diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java index 8dbb7ada4..ce8d991ba 100644 --- a/Essentials/src/net/ess3/commands/Commandeco.java +++ b/Essentials/src/net/ess3/commands/Commandeco.java @@ -31,6 +31,8 @@ public class Commandeco extends EssentialsCommand if (args[1].contentEquals("**")) { + boolean ecoResetAll = false; + ISettings settings = ess.getSettings(); for (String sUser : ess.getUserMap().getAllUniqueUsers()) { final IUser player = ess.getUserMap().getUser(sUser); @@ -48,14 +50,22 @@ public class Commandeco extends EssentialsCommand break; case RESET: - ISettings settings = ess.getSettings(); player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount); + ecoResetAll = true; break; } } + if (ecoResetAll == true) + { + ess.broadcastMessage(null, _("ecoResetAll", settings.getData().getEconomy().getCurrencySymbol() + amount)); + } + + } else if (args[1].contentEquals("*")) { + boolean ecoResetAllOnline = false; + ISettings settings = ess.getSettings(); for (Player onlinePlayer : server.getOnlinePlayers()) { final IUser player = ess.getUserMap().getUser(onlinePlayer); @@ -74,11 +84,15 @@ public class Commandeco extends EssentialsCommand break; case RESET: - ISettings settings = ess.getSettings(); player.setMoney(amount == 0 ? settings.getData().getEconomy().getStartingBalance() : amount); + ecoResetAllOnline = true; break; } } + if (ecoResetAllOnline == true) + { + ess.broadcastMessage(null, _("ecoResetAllOnline", settings.getData().getEconomy().getCurrencySymbol() + amount)); + } } else { |