Skip to content

Cache overridden-commands and player-commands in Settings #4345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JRoy merged 2 commits into from
Jul 11, 2021
Merged

Cache overridden-commands and player-commands in Settings #4345

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5acedab
Cache overridden-commands and player-commands in Settings
mdcfe Jul 11, 2021
6e31e53
Merge branch '2.x' into fix/uncached-settings-hot-paths
mdcfe Jul 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions Essentials/src/main/java/com/earth2me/essentials/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@

public class Settings implements net.ess3.api.ISettings {
private static final Logger logger = Logger.getLogger("Essentials");
private static final BigDecimal MAXMONEY = new BigDecimal("10000000000000");
private static final BigDecimal MINMONEY = new BigDecimal("-10000000000000");
private static final BigDecimal DEFAULT_MAX_MONEY = new BigDecimal("10000000000000");
private static final BigDecimal DEFAULT_MIN_MONEY = new BigDecimal("-10000000000000");
private final transient EssentialsConfiguration config;
private final transient IEssentials ess;
private final transient AtomicInteger reloadCount = new AtomicInteger(0);
Expand All @@ -62,6 +62,8 @@ public class Settings implements net.ess3.api.ISettings {
private boolean teleportSafety;
private boolean forceDisableTeleportSafety;
private Set<String> disabledCommands = new HashSet<>();
private List<String> overriddenCommands = Collections.emptyList();
private List<String> playerCommands = Collections.emptyList();
private final transient Map<String, Command> disabledBukkitCommands = new HashMap<>();
private Map<String, BigDecimal> commandCosts;
private Set<String> socialSpyCommands = new HashSet<>();
Expand All @@ -76,8 +78,8 @@ public class Settings implements net.ess3.api.ISettings {
private boolean configDebug = false;
// #easteregg
private boolean economyDisabled = false;
private BigDecimal maxMoney = MAXMONEY;
private BigDecimal minMoney = MINMONEY;
private BigDecimal maxMoney = DEFAULT_MAX_MONEY;
private BigDecimal minMoney = DEFAULT_MIN_MONEY;
private boolean economyLog = false;
// #easteregg
private boolean economyLogUpdate = false;
Expand Down Expand Up @@ -317,9 +319,13 @@ private Set<String> _getDisabledCommands() {
return disCommands;
}

private List<String> _getPlayerCommands() {
return config.getList("player-commands", String.class);
}

@Override
public boolean isPlayerCommand(final String label) {
for (final String c : config.getList("player-commands", String.class)) {
for (final String c : playerCommands) {
if (!c.equalsIgnoreCase(label)) {
continue;
}
Expand All @@ -328,9 +334,13 @@ public boolean isPlayerCommand(final String label) {
return false;
}

private List<String> _getOverriddenCommands() {
return config.getList("overridden-commands", String.class);
}

@Override
public boolean isCommandOverridden(final String name) {
for (final String c : config.getList("overridden-commands", String.class)) {
for (final String c : overriddenCommands) {
if (!c.equalsIgnoreCase(name)) {
continue;
}
Expand Down Expand Up @@ -643,6 +653,8 @@ public void reloadConfig() {
chatFormats.clear();
changeDisplayName = _changeDisplayName();
disabledCommands = _getDisabledCommands();
overriddenCommands = _getOverriddenCommands();
playerCommands = _getPlayerCommands();

// This will be late loaded
if (ess.getKnownCommandsProvider() != null) {
Expand Down Expand Up @@ -934,7 +946,7 @@ public boolean getProtectBoolean(final String configName, final boolean def) {
}

private BigDecimal _getMaxMoney() {
return config.getBigDecimal("max-money", MAXMONEY);
return config.getBigDecimal("max-money", DEFAULT_MAX_MONEY);
}

@Override
Expand All @@ -943,7 +955,7 @@ public BigDecimal getMaxMoney() {
}

private BigDecimal _getMinMoney() {
BigDecimal min = config.getBigDecimal("min-money", MINMONEY);
BigDecimal min = config.getBigDecimal("min-money", DEFAULT_MIN_MONEY);
if (min.signum() > 0) {
min = min.negate();
}
Expand Down