SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2026-02-04 23:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run expansion config logic before loading expansion

Browse Source
This commit is contained in:
PiggyPiglet
2026-02-03 08:39:07 +08:00
parent abb85e6d16
commit 55c52a83ac
1 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/java/at/helpch/placeholderapi/expansion/manager/LocalExpansionManager.java
View File

@@ -217,17 +217,7 @@ public final class LocalExpansionManager /*implements Listener*/ {
@ApiStatus.Internal @ApiStatus.Internal
public boolean register(@NotNull final PlaceholderExpansion expansion) { public boolean register(@NotNull final PlaceholderExpansion expansion) {
final String identifier = expansion.getIdentifier().toLowerCase(Locale.ROOT); final String identifier = expansion.getIdentifier().toLowerCase(Locale.ROOT);
if (!expansion.canRegister()) {
return false;
}
// Avoid loading two external expansions with the same identifier
if (expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL && expansions.containsKey(identifier)) {
logger.atWarning().log("Failed to load external expansion %s. Identifier is already in use.", expansion.getIdentifier());
return false;
}
if (expansion instanceof Configurable<?> configurable) { if (expansion instanceof Configurable<?> configurable) {
final PlaceholderAPIConfig config = configManager.config(); final PlaceholderAPIConfig config = configManager.config();
@@ -242,36 +232,16 @@ public final class LocalExpansionManager /*implements Listener*/ {
final Object expansionConfig = configManager.convertExpansion((Map<String, Object>) config.expansions().get(expansion.getIdentifier()), configurable.provideConfigType()); final Object expansionConfig = configManager.convertExpansion((Map<String, Object>) config.expansions().get(expansion.getIdentifier()), configurable.provideConfigType());
config.expansions().put(expansion.getIdentifier(), expansionConfig); config.expansions().put(expansion.getIdentifier(), expansionConfig);
} }
// Map<String, Object> defaults = ((Configurable<?>) expansion).getDefaults(); }
// String pre = "expansions." + identifier + ".";
// boolean save = false; if (!expansion.canRegister()) {
// return false;
// final PlaceholderAPIConfig config = this.config.config(); }
//
// if (defaults != null) { // Avoid loading two external expansions with the same identifier
// for (Map.Entry<String, Object> entries : defaults.entrySet()) { if (expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL && expansions.containsKey(identifier)) {
// if (entries.getKey() == null || entries.getKey().isEmpty()) { logger.atWarning().log("Failed to load external expansion %s. Identifier is already in use.", expansion.getIdentifier());
// continue; return false;
// }
//
// if (entries.getValue() == null) {
// if (cfg.contains(pre + entries.getKey())) {
// save = true;
// cfg.set(pre + entries.getKey(), null);
// }
// } else {
// if (!cfg.contains(pre + entries.getKey())) {
// save = true;
// cfg.set(pre + entries.getKey(), entries.getValue());
// }
// }
// }
// }
//
// if (save) {
// plugin.saveConfig();
// plugin.reloadConfig();
// }
} }
// if (expansion instanceof VersionSpecific) { // if (expansion instanceof VersionSpecific) {