zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Use Collection instead of List; Fix plugin duplication in getDependingPlugins results

Browse source
This commit is contained in:
Roman Zhuravlev 2025-09-20 01:35:08 +05:00
parent 88f8f2bd92
commit 0d10233ab2
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Common/src/main/java/net/frankheijden/serverutils/common/commands/CommandServerUtils.java
View file

@ -7,9 +7,12 @@ import cloud.commandframework.context.CommandContext;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@ -202,7 +205,7 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
private void handleUnloadPlugin(CommandContext<C> context) { private void handleUnloadPlugin(CommandContext<C> context) {
C sender = context.getSender(); C sender = context.getSender();
List<P> plugins = Arrays.asList(context.get("plugins")); List<P> plugins = new ArrayList<>(Arrays.asList(context.get("plugins")));
if (checkProtectedPlugins(sender, plugins)) { if (checkProtectedPlugins(sender, plugins)) {
return; return;
@ -210,7 +213,7 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
boolean recursive = context.flags().contains("recursive"); boolean recursive = context.flags().contains("recursive");
List<P> dependingPlugins = getDependingPlugins(context, sender, plugins, "unloadplugin"); Collection<P> dependingPlugins = getDependingPlugins(context, sender, plugins, "unloadplugin");
if (!recursive) { if (!recursive) {
if (!dependingPlugins.isEmpty()) return; if (!dependingPlugins.isEmpty()) return;
} else { } else {
@ -240,7 +243,7 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
boolean recursive = context.flags().contains("recursive"); boolean recursive = context.flags().contains("recursive");
List<P> dependingPlugins = getDependingPlugins(context, sender, plugins, "reloadplugin"); Collection<P> dependingPlugins = getDependingPlugins(context, sender, plugins, "reloadplugin");
if (!recursive && !dependingPlugins.isEmpty()) { if (!recursive && !dependingPlugins.isEmpty()) {
return; return;
} }
@ -297,15 +300,16 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
return !getDependingPlugins(context, sender, plugins, subcommand).isEmpty(); return !getDependingPlugins(context, sender, plugins, subcommand).isEmpty();
} }
protected List<P> getDependingPlugins(CommandContext<C> context, C sender, List<P> plugins, String subcommand) { protected Collection<P> getDependingPlugins(CommandContext<C> context, C sender, List<P> plugins,
if (context.flags().contains("force")) return Collections.emptyList(); String subcommand) {
if (context.flags().contains("force")) return Collections.emptySet();
boolean recursive = context.flags().contains("recursive"); boolean recursive = context.flags().contains("recursive");
AbstractPluginManager<P, ?> pluginManager = plugin.getPluginManager(); AbstractPluginManager<P, ?> pluginManager = plugin.getPluginManager();
MessagesResource messages = plugin.getMessagesResource(); MessagesResource messages = plugin.getMessagesResource();
List<P> dependingPluginsAll = new ArrayList<>(); Map<String, P> dependingPluginsAll = new HashMap<>();
boolean hasDependingPlugins = false; boolean hasDependingPlugins = false;
for (P plugin : plugins) { for (P plugin : plugins) {
String pluginId = pluginManager.getPluginId(plugin); String pluginId = pluginManager.getPluginId(plugin);
@ -328,7 +332,9 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
} }
hasDependingPlugins = true; hasDependingPlugins = true;
dependingPluginsAll.addAll(dependingPlugins); for (P dependingPlugin : dependingPlugins) {
dependingPluginsAll.putIfAbsent(pluginManager.getPluginId(dependingPlugin), dependingPlugin);
}
} }
} }
@ -350,7 +356,7 @@ public abstract class CommandServerUtils<U extends ServerUtilsPlugin<P, ?, C, ?,
)); ));
} }
return dependingPluginsAll; return dependingPluginsAll.values();
} }
protected boolean checkServerUtils(CommandContext<C> context, C sender, List<P> plugins) { protected boolean checkServerUtils(CommandContext<C> context, C sender, List<P> plugins) {