Merge 2fac63ba74
into f20bede62a
This commit is contained in:
commit
caad928b1d
2 changed files with 5 additions and 3 deletions
src/main/java/com/mojang/brigadier
|
@ -11,6 +11,7 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
|||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Locale;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class BoolArgumentType implements ArgumentType<Boolean> {
|
||||
|
@ -34,10 +35,11 @@ public class BoolArgumentType implements ArgumentType<Boolean> {
|
|||
|
||||
@Override
|
||||
public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> context, final SuggestionsBuilder builder) {
|
||||
if ("true".startsWith(builder.getRemainingLowerCase())) {
|
||||
String remaining = builder.getRemaining().toLowerCase(Locale.ROOT);
|
||||
if ("true".startsWith(remaining)) {
|
||||
builder.suggest("true");
|
||||
}
|
||||
if ("false".startsWith(builder.getRemainingLowerCase())) {
|
||||
if ("false".startsWith(remaining)) {
|
||||
builder.suggest("false");
|
||||
}
|
||||
return builder.buildFuture();
|
||||
|
|
|
@ -55,7 +55,7 @@ public class LiteralCommandNode<S> extends CommandNode<S> {
|
|||
final int start = reader.getCursor();
|
||||
if (reader.canRead(literal.length())) {
|
||||
final int end = start + literal.length();
|
||||
if (reader.getString().substring(start, end).equals(literal)) {
|
||||
if (reader.getString().toLowerCase(Locale.ROOT).substring(start, end).equals(literalLowerCase)) {
|
||||
reader.setCursor(end);
|
||||
if (!reader.canRead() || reader.peek() == ' ') {
|
||||
return end;
|
||||
|
|
Loading…
Reference in a new issue