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

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

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() {