just use better pattern

Author: sovdeeth

src/main/java/ch/njol/skript/variables/FlatFileStorage.java

@@ -530,8 +530,12 @@ static byte[] decode(String hex) {
 
 	/**
 	 * A regex pattern of a line in a CSV file.
+	 * (?<=^|,): start of line or comma
+	 * (?=")("[^"].*?(?<!")"),: matches a quoted string, ignoring double quotes
+	 * (?!")(.*?): matches a non-quoted string
+	 * (,|$): end of line or comma
 	 */
-		private static final Pattern CSV_LINE_PATTERN = Pattern.compile("(?<=^|,)\\s*([^\",]*|\"([^\"]|\"\")*\")\\s*(,|$)");
+		private static final Pattern CSV_LINE_PATTERN = Pattern.compile("(?<=^|,)\\s*(?:(?=\")(\"[^\"].*?(?<!\")\")|(?!\")(.*?))\\s*(,|$)");
 
 	/**
 	 * Splits the given CSV line into its values.
@@ -544,32 +548,16 @@ static byte[] decode(String hex) {
 	@Nullable
 	static String[] splitCSV(String line) {
 
+		Matcher matcher = CSV_LINE_PATTERN.matcher(line);
 
 		int lastEnd = 0;
 		ArrayList<String> result = new ArrayList<>();
 
-		// avoid regex matching quoted var names
-		if (line.startsWith("\"")) {
-			// find closing quote '",'
-			int start = 0;
-			while (start < line.length() && (start == 0 || line.charAt(start - 1) == '"')) {
-				start = line.indexOf("\",", start + 2);
-				if (start == -1) {
-					// No closing quote found
-					return null;
-				}
-			}
-			result.add(line.substring(1, start).replace("\"\"", "\""));
-			lastEnd = start + 2;
-		}
-
-		Matcher matcher = CSV_LINE_PATTERN.matcher(line);
-
 		while (matcher.find(lastEnd)) {
 			if (lastEnd != matcher.start())
 				return null; // other stuff inbetween finds
 
-			String value = matcher.group(1);
+			String value = matcher.group(1) != null ? matcher.group(1) : matcher.group(2);
 			if (value.startsWith("\""))
 				// Unescape value
 				result.add(value.substring(1, value.length() - 1).replace("\"\"", "\""));