ChomeNS/brigadier
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed how optional commands work - we don't find an earlier command in the tree anymore.

Browse source
This commit is contained in:
Nathan Adams 2017-06-30 09:17:07 +02:00
parent 9a3f987c97
commit 4af7274892
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/mojang/brigadier/CommandDispatcher.java
View file

@ -89,9 +89,7 @@ public class CommandDispatcher<S> {
continue; continue;
} }
if (child.getCommand() != null) { context.withCommand(child.getCommand());
context.withCommand(child.getCommand());
}
if (remaining.isEmpty()) { if (remaining.isEmpty()) {
return new ParseResults<>(context); return new ParseResults<>(context);
} else { } else {

4
src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
View file

@ -49,8 +49,8 @@ public class CommandDispatcherTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void testCreateAndMergeCommands() throws Exception { public void testCreateAndMergeCommands() throws Exception {
subject.register(literal("base").then(literal("foo")).executes(command)); subject.register(literal("base").then(literal("foo").executes(command)));
subject.register(literal("base").then(literal("bar")).executes(command)); subject.register(literal("base").then(literal("bar").executes(command)));
assertThat(subject.execute("base foo", source), is(42)); assertThat(subject.execute("base foo", source), is(42));
assertThat(subject.execute("base bar", source), is(42)); assertThat(subject.execute("base bar", source), is(42));