Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into new-block-api

Browse Source
This commit is contained in:
TheMode 2021-07-18 17:20:22 +02:00
commit d4398bda5b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,11 +352,14 @@ public final class CommandManager {
final int index = i + 1; final int index = i + 1;
if (ArrayUtils.sameStart(arguments, parsedArguments, index)) { if (ArrayUtils.sameStart(arguments, parsedArguments, index)) {
final Argument<?> sharedArgument = parsedArguments[i]; final Argument<?> sharedArgument = parsedArguments[i];
final var indexed = new IndexedArgument(entry.getKey(), sharedArgument, i); final var sharedSyntax = entry.getKey();
final var indexed = new IndexedArgument(sharedSyntax, sharedArgument, i);
final List<DeclareCommandsPacket.Node[]> storedNodes = storedArgumentsNodes.get(indexed); final List<DeclareCommandsPacket.Node[]> storedNodes = storedArgumentsNodes.get(indexed);
if (storedNodes == null)
continue; // Retrieved argument has already been redirected
argChildren = new IntArrayList(); argChildren = new IntArrayList();
lastNodes = storedNodes.get(storedNodes.size() >= index ? index : 1); lastNodes = storedNodes.get(storedNodes.size() > index ? index : i);
foundSharedPart = true; foundSharedPart = true;
} }
} }