From 5aedf498a4eec650f2f8a5ce5d62f0865b0aa486 Mon Sep 17 00:00:00 2001
From: TPGamesNL <29547183+TPGamesNL@users.noreply.github.com>
Date: Thu, 1 Jul 2021 18:35:19 +0200
Subject: [PATCH 1/2] Fix doubly nested variable parsing (#4144)

---
 src/main/java/ch/njol/skript/lang/SkriptParser.java    | 10 +++++++++-
 .../4143-nested-variables-erroring-in-2.6-beta1.sk     | 10 ++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 src/test/skript/tests/regressions/4143-nested-variables-erroring-in-2.6-beta1.sk

diff --git a/src/main/java/ch/njol/skript/lang/SkriptParser.java b/src/main/java/ch/njol/skript/lang/SkriptParser.java
index f517fb98866..b7686e31222 100644
--- a/src/main/java/ch/njol/skript/lang/SkriptParser.java
+++ b/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;
 			}
diff --git a/src/test/skript/tests/regressions/4143-nested-variables-erroring-in-2.6-beta1.sk b/src/test/skript/tests/regressions/4143-nested-variables-erroring-in-2.6-beta1.sk
new file mode 100644
index 00000000000..398c1558d57
--- /dev/null
+++ b/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}%}%}

From d8b1d526df67b5e2ee89cb6efccca1780ed8a73f Mon Sep 17 00:00:00 2001
From: TPGamesNL <29547183+TPGamesNL@users.noreply.github.com>
Date: Thu, 1 Jul 2021 21:07:51 +0200
Subject: [PATCH 2/2] Fix JitPack publishing (maven) (#4145)

---
 build.gradle | 14 ++++++++++++++
 jitpack.yml  |  5 +++++
 2 files changed, 19 insertions(+)
 create mode 100644 jitpack.yml

diff --git a/build.gradle b/build.gradle
index 6a72e4699d0..ab35d47948d 100644
--- a/build.gradle
+++ b/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
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 00000000000..7d4c6bd1b6a
--- /dev/null
+++ b/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