Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-10 02:17:41 +01:00
Code Issues Projects Releases Wiki Activity

Use collections for the correct situations

Browse Source
This commit is contained in:
LeoDog896 2021-02-08 19:11:47 -05:00
parent e809e69a07
commit 8d7cce3044
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/net/minestom/server/command/CommandManager.java
View File

@ -2,6 +2,8 @@ package net.minestom.server.command;
import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
import net.minestom.server.MinecraftServer; import net.minestom.server.MinecraftServer;
import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandData; import net.minestom.server.command.builder.CommandData;
@ -17,7 +19,6 @@ import net.minestom.server.utils.ArrayUtils;
import net.minestom.server.utils.callback.CommandCallback; import net.minestom.server.utils.callback.CommandCallback;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -310,35 +311,36 @@ public final class CommandManager {
IntList cmdChildren = new IntArrayList(); IntList cmdChildren = new IntArrayList();
final Collection<CommandSyntax> syntaxes = command.getSyntaxes(); final Collection<CommandSyntax> syntaxes = command.getSyntaxes();
List<String> names = new ArrayList<>(); // Create command for main name
names.add(command.getName()); createCommand(player, nodes, cmdChildren, command.getName(), syntaxes, rootChildren);
names.addAll(Arrays.asList(command.getAliases()));
for (String name : names) { // Repeat that for all aliases.
createCommand(player, nodes, cmdChildren, name, syntaxes, rootChildren); for (String alias : command.getAliases()) {
createCommand(player, nodes, cmdChildren, alias, syntaxes, rootChildren);
} }
} }
// Pair<CommandName,EnabledTracking> // Pair<CommandName,EnabledTracking>
final List<Pair<String, Boolean>> commandsPair = new ArrayList<>(); final Object2BooleanMap<String> commandsPair = new Object2BooleanOpenHashMap<>();
for (CommandProcessor commandProcessor : commandProcessorMap.values()) { for (CommandProcessor commandProcessor : commandProcessorMap.values()) {
final boolean enableTracking = commandProcessor.enableWritingTracking(); final boolean enableTracking = commandProcessor.enableWritingTracking();
// Do not show command if return false // Do not show command if return false
if (!commandProcessor.hasAccess(player)) if (!commandProcessor.hasAccess(player))
continue; continue;
commandsPair.add(Pair.of(commandProcessor.getCommandName(), enableTracking)); commandsPair.put(commandProcessor.getCommandName(), enableTracking);
final String[] aliases = commandProcessor.getAliases(); final String[] aliases = commandProcessor.getAliases();
if (aliases == null || aliases.length == 0) if (aliases == null || aliases.length == 0)
continue; continue;
for (String alias : aliases) { for (String alias : aliases) {
commandsPair.add(Pair.of(alias, enableTracking)); commandsPair.put(alias, enableTracking);
} }
} }
for (Pair<String, Boolean> pair : commandsPair) { for (Object2BooleanMap.Entry<String> entry : commandsPair.object2BooleanEntrySet()) {
final String name = pair.getLeft(); final String name = entry.getKey();
final boolean tracking = pair.getRight(); final boolean tracking = entry.getBooleanValue();
// Server suggestion (ask_server) // Server suggestion (ask_server)
{ {
DeclareCommandsPacket.Node tabNode = new DeclareCommandsPacket.Node(); DeclareCommandsPacket.Node tabNode = new DeclareCommandsPacket.Node();