Update com/Acrobot/ChestShop/Signs/ChestShopSign.java

Updated to alternate fix.
This commit is contained in:
meiamsome 2012-08-15 01:22:55 +02:00
parent ebfcfd56f0
commit e7e66b142f

View File

@ -23,7 +23,7 @@ public class ChestShopSign {
public static final Pattern[] SHOP_SIGN_PATTERN = { public static final Pattern[] SHOP_SIGN_PATTERN = {
Pattern.compile("^$|^\\w.+$"), Pattern.compile("^$|^\\w.+$"),
Pattern.compile("[0-9]+"), Pattern.compile("[0-9]+"),
Pattern.compile("(?i)(((b *[0-9]+)|([0-9]+ *b))|((s *[0-9]+)|([0-9]+ *s)))|((((b *[0-9]+)|([0-9]+ *b))[ ]*:[ ]*((s *[0-9]+)|([0-9]+ *s))))"), Pattern.compile(".+"),
Pattern.compile("[\\w : -]+") Pattern.compile("[\\w : -]+")
}; };
@ -40,7 +40,8 @@ public class ChestShopSign {
} }
public static boolean isValid(String[] line) { public static boolean isValid(String[] line) {
return isValidPreparedSign(line) && !line[0].isEmpty(); return isValidPreparedSign(line) && (line[2].toUpperCase().contains("B") || line[2].toUpperCase().contains("S")) && !line[0].isEmpty();
} }
public static boolean isValid(Block sign) { public static boolean isValid(Block sign) {
@ -60,5 +61,6 @@ public class ChestShopSign {
return false; return false;
} }
} }
return lines[2].indexOf(':') == lines[2].lastIndexOf(':');
} }
} }