Upstream/RandomTeleport
1
0
Fork 0
mirror of https://github.com/Phoenix616/RandomTeleport.git synced 2024-11-22 10:36:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix SimpleOptionParser

Browse Source
This commit is contained in:
Phoenix616 2019-03-27 13:53:40 +01:00
parent 94ce85551a
commit 8fe13fa16d
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
randomteleport-plugin/src/main/java/de/themoep/randomteleport/searcher/options/SimpleOptionParser.java
View File

@ -20,9 +20,7 @@ package de.themoep.randomteleport.searcher.options;
import de.themoep.randomteleport.searcher.RandomSearcher;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
@ -44,22 +42,14 @@ public class SimpleOptionParser implements OptionParser {
@Override
public boolean parse(RandomSearcher searcher, String[] args) {
boolean ret = false;
String option = null;
List<String> values = new ArrayList<>();
for (String arg : args) {
if (arg.startsWith("-")) {
if (option != null) {
if (aliases.contains(option.toLowerCase())) {
ret |= parser.apply(searcher, values.toArray(new String[0]));
}
values.clear();
}
option = arg.substring(1);
if (option.startsWith("-") && option.length() > 1) {
option = option.substring(1);
}
} else {
values.add(arg);
String[] optionParts = String.join(" ", args).split(" -");
for (String optionPart : optionParts) {
String[] parts = optionPart.split(" ");
while (parts[0].startsWith("-")) {
parts[0] = parts[0].substring(1);
}
if (aliases.contains(parts[0].toLowerCase())) {
ret |= parser.apply(searcher, Arrays.copyOfRange(parts, 1, parts.length));
}
}
return ret;