Upstream/RandomTeleport
1
0
Fork 0
mirror of https://github.com/Phoenix616/RandomTeleport.git synced 2025-02-16 12:31:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue where the parser would try to parse too much

Browse Source
This commit is contained in:
Phoenix616 2020-06-10 23:20:05 +01:00
parent a76b60a3c7
commit 4047c6529d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,6 @@ public class SimpleOptionParser implements OptionParser {
@Override @Override
public boolean parse(RandomSearcher searcher, String[] args) { public boolean parse(RandomSearcher searcher, String[] args) {
boolean ret = false;
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
if (args[i].startsWith("-")) { if (args[i].startsWith("-")) {
String option = args[i].toLowerCase().substring(1); String option = args[i].toLowerCase().substring(1);
@ -65,13 +63,23 @@ public class SimpleOptionParser implements OptionParser {
"option", option, "option", option,
"perm", "randomteleport.manual.option." + aliases.iterator().next())); "perm", "randomteleport.manual.option." + aliases.iterator().next()));
} }
if (argsLength < 0 || i + argsLength < args.length) { i++;
ret |= parser.apply(searcher, Arrays.copyOfRange(args, i + 1, argsLength < 0 ? args.length : i + 1 + argsLength)); int argLength = argsLength > 0 ? argsLength : 0;
for (int j = i + argLength; j < args.length; j++) {
if (!args[j].startsWith("-")) {
argLength++;
} else {
break;
}
} }
if (i + argLength < args.length) {
return parser.apply(searcher, Arrays.copyOfRange(args, i, i + argLength));
}
break;
} }
} }
} }
return ret; return false;
} }
private boolean hasAccess(CommandSender initiator) { private boolean hasAccess(CommandSender initiator) {