TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-07-04 03:33:42 +00:00
Code Issues Projects Releases Wiki Activity

Add npcs-in-balance-ranking configurable option. Resolves #716.

Browse source
This commit is contained in:
Ali Moghnieh 2016-07-06 19:34:25 +01:00
parent d75e0ce26e
commit 992ef5dc91
4 changed files with 23 additions and 1 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

@ -257,4 +257,6 @@ public interface ISettings extends IConf {
Entry<Pattern, Long> getCommandCooldownEntry(String label);
boolean isCommandCooldownPersistent(String label);
boolean isNpcsInBalanceRanking();
}

12
Essentials/src/com/earth2me/essentials/Settings.java
View file

@ -536,6 +536,7 @@ public class Settings implements net.ess3.api.ISettings {
isCustomQuitMessage = !customQuitMessage.equals("none");
muteCommands = _getMuteCommands();
commandCooldowns = _getCommandCooldowns();
npcsInBalanceRanking = _isNpcsInBalanceRanking();
}
private List<Integer> itemSpawnBl = new ArrayList<Integer>();
@ -1262,4 +1263,15 @@ 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;
}
}

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 | #