Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-25 01:21:20 +01:00
Code Issues Projects Releases Wiki Activity

Prefer primitives over list

Browse Source
This commit is contained in:
LeoDog896 2021-02-08 18:33:01 -05:00
parent 4379f4b1e1
commit f300d60411
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,7 +400,7 @@ public final class CommandManager {
// Contains the arguments of the already-parsed syntaxes // Contains the arguments of the already-parsed syntaxes
List<Argument<?>[]> syntaxesArguments = new ArrayList<>(); List<Argument<?>[]> syntaxesArguments = new ArrayList<>();
// Contains the nodes of an argument // Contains the nodes of an argument
Map<Argument<?>, List<DeclareCommandsPacket.Node>> storedArgumentsNodes = new HashMap<>(); Map<Argument<?>, DeclareCommandsPacket.Node[]> storedArgumentsNodes = new HashMap<>();
for (CommandSyntax syntax : syntaxes) { for (CommandSyntax syntax : syntaxes) {
final CommandCondition commandCondition = syntax.getCommandCondition(); final CommandCondition commandCondition = syntax.getCommandCondition();
@ -411,7 +411,7 @@ public final class CommandManager {
// Represent the last nodes computed in the last iteration // Represent the last nodes computed in the last iteration
List<DeclareCommandsPacket.Node> lastNodes = null; DeclareCommandsPacket.Node[] lastNodes = null;
// Represent the children of the last node // Represent the children of the last node
IntList argChildren = null; IntList argChildren = null;
@ -439,7 +439,7 @@ public final class CommandManager {
final DeclareCommandsPacket.Node[] argumentNodes = toNodes(argument, isLast); final DeclareCommandsPacket.Node[] argumentNodes = toNodes(argument, isLast);
storedArgumentsNodes.put(argument, Arrays.asList(argumentNodes)); storedArgumentsNodes.put(argument, argumentNodes);
for (DeclareCommandsPacket.Node node : argumentNodes) { for (DeclareCommandsPacket.Node node : argumentNodes) {
final int childId = nodes.size(); final int childId = nodes.size();
@ -453,9 +453,12 @@ public final class CommandManager {
if (lastNodes != null) { if (lastNodes != null) {
final int[] children = ArrayUtils.toArray(argChildren); final int[] children = ArrayUtils.toArray(argChildren);
lastNodes.forEach(n -> n.children = n.children == null ?
children : for (DeclareCommandsPacket.Node lastNode : lastNodes) {
ArrayUtils.concatenateIntArrays(n.children, children)); lastNode.children = lastNode.children == null ?
children :
ArrayUtils.concatenateIntArrays(lastNode.children, children);
}
} }
nodes.add(node); nodes.add(node);
@ -468,7 +471,10 @@ public final class CommandManager {
if (isLast) { if (isLast) {
// Last argument doesn't have children // Last argument doesn't have children
final int[] children = new int[0]; final int[] children = new int[0];
argumentNodes.forEach(node -> node.children = children);
for (DeclareCommandsPacket.Node node : argumentNodes) {
node.children = children;
}
} else { } else {
// Create children list which will be filled during next iteration // Create children list which will be filled during next iteration
argChildren = new IntArrayList(); argChildren = new IntArrayList();