Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make price line pattern matcher more strict (Fixes #401)

This commit is contained in:
Phoenix616 2021-01-14 19:01:04 +01:00
parent 71e8ef732f
commit 9843e92525
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java
View File

@ -31,11 +31,16 @@ public class ChestShopSign {
public static final byte PRICE_LINE = 2; public static final byte PRICE_LINE = 2;
public static final byte ITEM_LINE = 3; public static final byte ITEM_LINE = 3;
public static final Pattern[] SHOP_SIGN_PATTERN = { public static final Pattern[][] SHOP_SIGN_PATTERN = {
Pattern.compile("^?[\\w \\-.:]*$"), { Pattern.compile("^?[\\w \\-.:]*$") },
Pattern.compile("^[1-9][0-9]{0,5}$|^Q [1-9][0-9]{0,4} : C [0-9]{0,5}$"), { Pattern.compile("^[1-9][0-9]{0,5}$"), Pattern.compile("^Q [1-9][0-9]{0,4} : C [0-9]{0,5}$") },
Pattern.compile("(?i)^[\\d.bs(free) :]+$"), {
Pattern.compile("^[\\w? #:\\-]+$") Pattern.compile("(?i)^([BS] *((\\d*([.e]\\d+)?)|free))( *: *([BS] *((\\d*([.e]\\d+)?)|free)))?$"),
Pattern.compile("(?i)^(((\\d*([.e]\\d+)?)|free) *[BS])( *: *([BS] *((\\d*([.e]\\d+)?)|free)))?$"),
Pattern.compile("(?i)^(((\\d*([.e]\\d+)?)|free) *[BS]) *: *(((\\d*([.e]\\d+)?)|free) *[BS])$"),
Pattern.compile("(?i)^([BS] *((\\d*([.e]\\d+)?)|free)) *: *(((\\d*([.e]\\d+)?)|free) *[BS])$"),
},
{ Pattern.compile("^[\\w? #:\\-]+$") }
}; };
public static final String AUTOFILL_CODE = "?"; public static final String AUTOFILL_CODE = "?";
@ -143,7 +148,14 @@ public class ChestShopSign {
public static boolean isValidPreparedSign(String[] lines) { public static boolean isValidPreparedSign(String[] lines) {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (!SHOP_SIGN_PATTERN[i].matcher(lines[i]).matches()) { boolean matches = false;
for (Pattern pattern : SHOP_SIGN_PATTERN[i]) {
if (pattern.matcher(lines[i]).matches()) {
matches = true;
break;
}
}
if (!matches) {
return false; return false;
} }
} }