Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 09:37:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' into custom-currency-formatting

Browse Source
This commit is contained in:
Ali Moghnieh 2016-07-06 21:21:24 +01:00
commit caeb59ede4
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/ISettings.java
View File

@ -260,5 +260,7 @@ public interface ISettings extends IConf {
boolean isCommandCooldownPersistent(String label);
boolean isNpcsInBalanceRanking();
NumberFormat getCurrencyFormat();
}

13
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -547,6 +547,7 @@ public class Settings implements net.ess3.api.ISettings {
isCustomQuitMessage = !customQuitMessage.equals("none");
muteCommands = _getMuteCommands();
commandCooldowns = _getCommandCooldowns();
npcsInBalanceRanking = _isNpcsInBalanceRanking();
currencyFormat = _getCurrencyFormat();
}
@ -1274,7 +1275,17 @@ public class Settings implements net.ess3.api.ISettings {
// TODO: enable per command cooldown specification for persistence.
return config.getBoolean("command-cooldown-persistence", true);
}
private boolean npcsInBalanceRanking = false;
public boolean _isNpcsInBalanceRanking() {
return config.getBoolean("npcs-in-balance-ranking", false);
}
@Override
public boolean isNpcsInBalanceRanking() {
return npcsInBalanceRanking;
}
private NumberFormat currencyFormat;
private NumberFormat _getCurrencyFormat() {

6
Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java
View File

@ -96,7 +96,11 @@ public class Commandbalancetop extends EssentialsCommand {
} else {
for (UUID u : ess.getUserMap().getAllUniqueUsers()) {
final User user = ess.getUserMap().getUser(u);
if (user != null && !user.isNPC()) { // Don't list NPCs in output
if (user != null) {
if (!ess.getSettings().isNpcsInBalanceRanking() && user.isNPC()) {
// Don't list NPCs in output
continue;
}
final BigDecimal userMoney = user.getMoney();
user.updateMoneyCache(userMoney);
totalMoney = totalMoney.add(userMoney);

4
Essentials/src/config.yml
View File

@ -502,6 +502,10 @@ command-cooldowns:
# Whether command cooldowns should be persistent past server shutdowns
command-cooldown-persistence: true
# Whether NPC balances should be listed in balance ranking features such as /balancetop.
# NPC balances can include features like factions from FactionsUUID plugin.
npcs-in-balance-ranking: false
############################################################
# +------------------------------------------------------+ #
# | EssentialsHome | #