Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add workaround for when expressions are parsed in masks/patterns where '&&' is used

Browse Source 
Fixes #1517
This commit is contained in:
dordsor21 2022-01-05 17:46:18 +00:00
parent 0408cd0575
commit 722c411219
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/factory/parser/FaweParser.java
View File

@ -33,12 +33,14 @@ public abstract class FaweParser<T> extends InputParser<T> implements AliasedPar
List<String> inputs = new ArrayList<>(); List<String> inputs = new ArrayList<>();
List<Boolean> and = new ArrayList<>(); List<Boolean> and = new ArrayList<>();
int last = 0; int last = 0;
outer: boolean expression = false;
for (int i = 0; i < toParse.length(); i++) { for (int i = 0; i < toParse.length(); i++) {
char c = toParse.charAt(i); char c = toParse.charAt(i);
switch (c) { switch (c) {
case ',': case ',', '&' -> {
case '&': if (expression) {
continue;
}
String result = toParse.substring(last, i); String result = toParse.substring(last, i);
if (!result.isEmpty()) { if (!result.isEmpty()) {
inputs.add(result); inputs.add(result);
@ -47,8 +49,9 @@ public abstract class FaweParser<T> extends InputParser<T> implements AliasedPar
throw new InputParseException(Caption.of("fawe.error.parse.invalid-dangling-character", c)); throw new InputParseException(Caption.of("fawe.error.parse.invalid-dangling-character", c));
} }
last = i + 1; last = i + 1;
continue outer; }
default: case '=' -> expression = true;
default -> {
if (c == '[') { if (c == '[') {
int next = StringMan.findMatchingBracket(toParse, i); int next = StringMan.findMatchingBracket(toParse, i);
if (next != -1) { if (next != -1) {
@ -57,7 +60,9 @@ public abstract class FaweParser<T> extends InputParser<T> implements AliasedPar
toParse += "]"; toParse += "]";
i = toParse.length(); i = toParse.length();
} }
expression = false;
} }
}
} }
} }
inputs.add(toParse.substring(last)); inputs.add(toParse.substring(last));