Merge branch 'master' into feature/docs-site-styling

build.gradle

@@ -7,6 +7,7 @@ import java.time.LocalTime
 plugins {
 	id 'com.github.johnrengelman.shadow' version '7.0.0'
 	id 'com.github.hierynomus.license' version '0.16.1'
+	id 'maven-publish'
 	id 'java'
 }
 
@@ -68,6 +69,7 @@ task relocateShadowJar(type: ConfigureShadowRelocation) {
 
 task sourceJar(type: Jar) {
 	from sourceSets.main.allJava
+	archiveClassifier = "sources"
 }
 
 tasks.withType(ShadowJar) {
@@ -104,6 +106,18 @@ processResources {
 	]
 }
 
+publishing {
+	publications {
+		maven(MavenPublication) {
+			groupId "com.github.SkriptLang"
+			artifactId "Skript"
+			version project.version
+			artifact sourceJar
+			artifact tasks.jar
+		}
+	}
+}
+
 license {
 	header file('licenseheader.txt')
 	exclude('**/Metrics.java') // Not under GPLv3

jitpack.yml

@@ -0,0 +1,5 @@
+before_install:
+    - source "$HOME/.sdkman/bin/sdkman-init.sh"
+    - sdk update
+    - sdk install java 16.0.1-open
+    - sdk use java 16.0.1-open

src/main/java/ch/njol/skript/lang/SkriptParser.java

@@ -279,9 +279,17 @@ private static <T> Variable<T> parseVariable(final String expr, final Class<? ex
 		if (varPattern.matcher(expr).matches()) {
 			String variableName = "" + expr.substring(expr.indexOf('{') + 1, expr.lastIndexOf('}'));
 			boolean inExpression = false;
+			int variableDepth = 0;
 			for (char c : variableName.toCharArray()) {
-				if (c == '%')
+				if (c == '%' && variableDepth == 0)
 					inExpression = !inExpression;
+				if (inExpression) {
+					if (c == '{') {
+						variableDepth++;
+					} else if (c == '}')
+						variableDepth--;
+				}
+
 				if (!inExpression && (c == '{' || c == '}'))
 					return null;
 			}

src/test/skript/tests/regressions/4143-nested-variables-erroring-in-2.6-beta1.sk

@@ -0,0 +1,10 @@
+on load:
+	suppress conflict warnings
+
+test "nested variable parsing":
+	delete {_a}
+	delete {_a%{b}%}
+	delete {_a%{b%{c}%}%}
+	delete {_a%{b%{c%{d}%}%}%}
+	delete {_a%{b%{c%{d%{e}%}%}%}%}
+	delete {_a%{b%{c} + {d}%} + {e%{f} + {g}%}%}