From 7854602a0441194da5f47e8aa2facc8b641cefff Mon Sep 17 00:00:00 2001 From: LeoDog896 Date: Tue, 9 Feb 2021 13:21:25 -0500 Subject: [PATCH] Remove unnecessary toNodes wrapper --- .../server/command/CommandManager.java | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/main/java/net/minestom/server/command/CommandManager.java b/src/main/java/net/minestom/server/command/CommandManager.java index 1e17f81ca..2cb75560a 100644 --- a/src/main/java/net/minestom/server/command/CommandManager.java +++ b/src/main/java/net/minestom/server/command/CommandManager.java @@ -450,7 +450,7 @@ public final class CommandManager { } - final DeclareCommandsPacket.Node[] argumentNodes = toNodes(argument, isLast); + final DeclareCommandsPacket.Node[] argumentNodes = argument.toNodes(isLast); storedArgumentsNodes.put(argument, argumentNodes); for (DeclareCommandsPacket.Node node : argumentNodes) { final int childId = nodes.size(); @@ -517,28 +517,6 @@ public final class CommandManager { return literalNode; } - // TODO should we even have this function? - /** - * Converts an argument to a node with the correct brigadier parser. - * - * @param argument the argument to convert - * @param executable true if this is the last argument, false otherwise - * @return the list of nodes that the argument require - */ - @NotNull - private DeclareCommandsPacket.Node[] toNodes(@NotNull Argument argument, boolean executable) { - - // You can uncomment this to test any brigadier parser on the client - - /* - DeclareCommandsPacket.Node testNode = simpleArgumentNode(nodes, argument, executable, false); - testNode.parser = "minecraft:block_state"; - return nodes; - */ - - return argument.toNodes(executable); - } - public byte getFlag(@NotNull NodeType type, boolean executable, boolean redirect, boolean suggestionType) { byte result = (byte) type.mask;