fix errors with spigot specifically.

use paper folks.
This commit is contained in:
2021-11-25 02:03:20 +01:00
parent 9e255076b0
commit bbc0e44660
2 changed files with 20 additions and 7 deletions
@@ -69,8 +69,13 @@ public class CommandWhitelistBukkit extends JavaPlugin {
private void reloadPluginConfig() { private void reloadPluginConfig() {
File configFile = new File("plugins/CommandWhitelist/config.yml"); File configFile = new File("plugins/CommandWhitelist/config.yml");
if (configCache == null) if (configCache == null) {
try {
configCache = new ConfigCache(configFile, true, getSLF4JLogger()); configCache = new ConfigCache(configFile, true, getSLF4JLogger());
} catch (NoSuchMethodError e) {
configCache = new ConfigCache(configFile, true, null);
}
}
else else
configCache.reloadConfig(); configCache.reloadConfig();
} }
@@ -78,9 +83,11 @@ public class CommandWhitelistBukkit extends JavaPlugin {
public void reloadPluginConfig(CommandSender sender) { public void reloadPluginConfig(CommandSender sender) {
getServer().getScheduler().runTaskAsynchronously(this, () -> { getServer().getScheduler().runTaskAsynchronously(this, () -> {
reloadPluginConfig(); reloadPluginConfig();
try {
for (Player p : Bukkit.getOnlinePlayers()) { for (Player p : Bukkit.getOnlinePlayers()) {
p.updateCommands(); p.updateCommands();
} }
} catch (Exception ignored) {}
audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.config_reloaded)); audiences.sender(sender).sendMessage(CWCommand.miniMessage.parse(configCache.prefix + configCache.config_reloaded));
}); });
} }
@@ -132,8 +132,10 @@ public class ConfigCache {
if (commands.contains(cmd)) continue; if (commands.contains(cmd)) continue;
commands.add(cmd); commands.add(cmd);
} }
List<String> subCommands = new ArrayList<>();
List<String> subCommands = section.getStringList(id + ".subcommands"); for (String subCmd : section.getStringList(id + ".subcommands")) {
subCommands.add(String.valueOf(subCmd));
}
String customCommandDeniedMessage = section.getString(id + ".custom_command_denied_message"); String customCommandDeniedMessage = section.getString(id + ".custom_command_denied_message");
return new CWGroup(id, commands, subCommands, customCommandDeniedMessage); return new CWGroup(id, commands, subCommands, customCommandDeniedMessage);
} }
@@ -148,6 +150,10 @@ public class ConfigCache {
} }
private void warn(String log) { private void warn(String log) {
if (logger == null) {
System.out.println("WARNING: "+log);
return;
}
if (logger instanceof org.slf4j.Logger) { if (logger instanceof org.slf4j.Logger) {
((org.slf4j.Logger) logger).warn(log); ((org.slf4j.Logger) logger).warn(log);
return; return;