From f4826007256edf37411ca198f3dda4546929cd34 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Mon, 9 Sep 2024 11:10:33 -0400
Subject: [PATCH 01/18] fix exponent capping at long max value (#7060)

---
 .../java/ch/njol/skript/classes/data/DefaultOperations.java | 6 +-----
 src/test/skript/tests/regressions/7059-exponent overflow.sk | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 src/test/skript/tests/regressions/7059-exponent overflow.sk

diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java b/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
index 860c7ee1030..1588d31ece8 100644
--- a/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
+++ b/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
@@ -47,11 +47,7 @@ public class DefaultOperations {
 			return left.doubleValue() * right.doubleValue();
 		});
 		Arithmetics.registerOperation(Operator.DIVISION, Number.class, (left, right) -> left.doubleValue() / right.doubleValue());
-		Arithmetics.registerOperation(Operator.EXPONENTIATION, Number.class, (left, right) -> {
-			if (Utils.isInteger(left, right) && right.longValue() >= 0)
-				return (long) Math.pow(left.longValue(), right.longValue());
-			return Math.pow(left.doubleValue(), right.doubleValue());
-		});
+		Arithmetics.registerOperation(Operator.EXPONENTIATION, Number.class, (left, right) -> Math.pow(left.doubleValue(), right.doubleValue()));
 		Arithmetics.registerDifference(Number.class, (left, right) -> {
 			if (Utils.isInteger(left, right))
 				return Math.abs(left.longValue() - right.longValue());
diff --git a/src/test/skript/tests/regressions/7059-exponent overflow.sk b/src/test/skript/tests/regressions/7059-exponent overflow.sk
new file mode 100644
index 00000000000..16579aee95b
--- /dev/null
+++ b/src/test/skript/tests/regressions/7059-exponent overflow.sk	
@@ -0,0 +1,2 @@
+test "overflow exponents":
+	assert 10 ^ 25 is 10000000000000000000000000 with "exponentiation was unexpectedly capped"

From 86742a9680b2b1940a4a4c29ff68a7e72f31a085 Mon Sep 17 00:00:00 2001
From: Efy <35348263+Efnilite@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:39:28 +0200
Subject: [PATCH 02/18] Fix events in StructParse (#7067)

* init commit

* update name

* fixes

* update

* update

* uhh

* uhh

* should be good now

* remove return false from load
---
 .../njol/skript/test/runner/StructParse.java  | 45 +++++++++----------
 .../pull-7067-events in structs.sk            |  8 ++++
 2 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 src/test/skript/tests/regressions/pull-7067-events in structs.sk

diff --git a/src/main/java/ch/njol/skript/test/runner/StructParse.java b/src/main/java/ch/njol/skript/test/runner/StructParse.java
index 3bf0e2d75f5..3a4312a6806 100644
--- a/src/main/java/ch/njol/skript/test/runner/StructParse.java
+++ b/src/main/java/ch/njol/skript/test/runner/StructParse.java
@@ -1,26 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
-import ch.njol.skript.classes.Changer;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.classes.Changer.ChangerUtils;
 import ch.njol.skript.config.Node;
@@ -30,6 +11,8 @@
 import ch.njol.skript.doc.NoDoc;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.lang.util.ContextlessEvent;
 import ch.njol.skript.log.LogEntry;
 import ch.njol.skript.log.RetainingLogHandler;
@@ -42,9 +25,6 @@
 import org.skriptlang.skript.lang.entry.util.ExpressionEntryData;
 import org.skriptlang.skript.lang.structure.Structure;
 
-import static ch.njol.skript.lang.SkriptParser.ParseResult;
-
-
 @Name("Parse Structure")
 @Description("Parses the code inside this structure as a structure and use 'parse logs' to grab any logs from it.")
 @NoDoc
@@ -54,7 +34,7 @@ public class StructParse extends Structure {
 		Skript.registerStructure(StructParse.class, "parse");
 	}
 
-	private static EntryValidator validator = EntryValidator.builder()
+	private static final EntryValidator validator = EntryValidator.builder()
 		.addEntryData(new ExpressionEntryData<>("results", null, false, Object.class))
 		.addSection("code", false)
 		.build();
@@ -64,26 +44,33 @@ public class StructParse extends Structure {
 	private Expression<?> resultsExpression;
 
 	@Override
-	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult, EntryContainer entryContainer) {
+	public boolean init(Literal<?>[] args, int matchedPattern,
+						ParseResult parseResult, EntryContainer entryContainer) {
 		SectionNode parseStructureSectionNode = entryContainer.getSource();
 
 		Class<? extends Event>[] originalEvents = getParser().getCurrentEvents();
 		getParser().setCurrentEvent("parse", ContextlessEvent.class);
 		EntryContainer validatedEntries = validator.validate(parseStructureSectionNode);
 		getParser().setCurrentEvents(originalEvents);
+
 		if (validatedEntries == null) {
 			Skript.error("A parse structure must have a result entry and a code section");
 			return false;
 		}
+
 		Expression<?> maybeResultsExpression = (Expression<?>) validatedEntries.get("results", false);
 		if (!ChangerUtils.acceptsChange(maybeResultsExpression, ChangeMode.SET, String[].class)) {
 			Skript.error(maybeResultsExpression.toString(null, false) + " cannot be set to strings");
+			return false;
 		}
+
 		SectionNode codeSectionNode = (SectionNode) validatedEntries.get("code", false);
 		Node maybeStructureSectionNodeToParse = Iterables.getFirst(codeSectionNode, null);
 		if (Iterables.size(codeSectionNode) != 1 || !(maybeStructureSectionNodeToParse instanceof SectionNode)) {
 			Skript.error("The code section must contain a single section to parse as a structure");
+			return false;
 		}
+
 		resultsExpression = maybeResultsExpression;
 		structureSectionNodeToParse = (SectionNode) maybeStructureSectionNodeToParse;
 		return true;
@@ -100,7 +87,15 @@ public boolean load() {
 		try (RetainingLogHandler handler = SkriptLogger.startRetainingLog()) {
 			String structureSectionNodeKey = ScriptLoader.replaceOptions(structureSectionNodeToParse.getKey());
 			String error = "Can't understand this structure: " + structureSectionNodeKey;
-			Structure.parse(structureSectionNodeKey, structureSectionNodeToParse, error);
+			Structure structure = Structure.parse(structureSectionNodeKey, structureSectionNodeToParse, error);
+
+			getParser().setCurrentStructure(structure);
+			if (structure != null && structure.preLoad() && structure.load()) {
+				structure.postLoad();
+			}
+
+			getParser().setCurrentStructure(null);
+
 			logs = handler.getLog().stream()
 				.map(LogEntry::getMessage)
 				.toArray(String[]::new);
diff --git a/src/test/skript/tests/regressions/pull-7067-events in structs.sk b/src/test/skript/tests/regressions/pull-7067-events in structs.sk
new file mode 100644
index 00000000000..3c8939d04e5
--- /dev/null
+++ b/src/test/skript/tests/regressions/pull-7067-events in structs.sk	
@@ -0,0 +1,8 @@
+parse:
+	results: {StructEvent::parse::*}
+	code:
+		on script load:
+			stop
+
+test "events in structs":
+	assert {StructEvent::parse::*} is not set with "using event in struct caused an error"

From 96dce83818b7785a666d267745f0e454ae9405b9 Mon Sep 17 00:00:00 2001
From: Sparky200 <sparky200.sparky200@gmail.com>
Date: Tue, 17 Sep 2024 07:14:40 -0500
Subject: [PATCH 03/18] Fix NPE caused by unregistered ClassInfo (#7085)

---
 src/main/java/ch/njol/skript/lang/SkriptParser.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/njol/skript/lang/SkriptParser.java b/src/main/java/ch/njol/skript/lang/SkriptParser.java
index c8d9b551a69..cefa92b2549 100644
--- a/src/main/java/ch/njol/skript/lang/SkriptParser.java
+++ b/src/main/java/ch/njol/skript/lang/SkriptParser.java
@@ -1181,7 +1181,15 @@ public static String notOfType(Class<?>... types) {
 				}
 				Class<?> c = types[i];
 				assert c != null;
-				message.append(Classes.getSuperClassInfo(c).getName().withIndefiniteArticle());
+				ClassInfo<?> classInfo = Classes.getSuperClassInfo(c);
+				// if there's a registered class info,
+				if (classInfo != null) {
+					// use the article,
+					message.append(classInfo.getName().withIndefiniteArticle());
+				} else {
+					// otherwise fallback to class name
+					message.append(c.getName());
+				}
 			}
 			return message.toString();
 		}

From c11551faa7d690e61990ddbebe80ddd2c118ed8f Mon Sep 17 00:00:00 2001
From: Efy <35348263+Efnilite@users.noreply.github.com>
Date: Sat, 21 Sep 2024 21:52:29 +0200
Subject: [PATCH 04/18] Fix missing "and" warnings (#7036)

* init commit innit

* updates

* removed comma for only lists of two

* Remove changes from feature branch.

---------

Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
---
 .../pull-6586-effhealth item mutation.sk           |  2 +-
 .../tests/syntaxes/conditions/CondCompare.sk       | 14 +++++++-------
 .../tests/syntaxes/expressions/ExprRepeat.sk       |  6 +++---
 .../tests/syntaxes/expressions/ExprStringCase.sk   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/test/skript/tests/regressions/pull-6586-effhealth item mutation.sk b/src/test/skript/tests/regressions/pull-6586-effhealth item mutation.sk
index aa70a29ceda..a048155c588 100644
--- a/src/test/skript/tests/regressions/pull-6586-effhealth item mutation.sk	
+++ b/src/test/skript/tests/regressions/pull-6586-effhealth item mutation.sk	
@@ -9,6 +9,6 @@ test "EffHealth item mutation fix":
 
 	set {_item1} to diamond sword with damage 100
 	set {_item2} to diamond with damage 10
-	repair {_item1}, {_item2}
+	repair {_item1} and {_item2}
 	assert {_item1} is diamond sword with damage 0 with "{_item1} was incorrectly repaired"
 	assert {_item2} is diamond with "{_item2} was no longer a diamond"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondCompare.sk b/src/test/skript/tests/syntaxes/conditions/CondCompare.sk
index a182b0f4923..3f63431b737 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondCompare.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondCompare.sk
@@ -6,14 +6,14 @@ test "compare":
 	assert 1 is greater than or equal to 0 and 1 with "Number is not greater than or equal to two smaller/equal numbers"
 	assert 1 is less than or equal to 1 and 2 with "Number is not smaller than or equal to two greater/equal numbers"
 
-	assert 1, 2 is 1, 2 with "direct list comparison of equal numbers failed"
-	assert 1, 2, 3 is not 1, 2 with "direct list comparison of non-equal numbers succeeded"
-	assert 1, 2 is 1, 2, or 3 with "comparison between AND list of numbers and OR list of superset of numbers failed"
-	assert 1, 2, 3 is 1 or 2 to fail with "comparison between AND list of numbers and OR list of subset of numbers succeeded"
+	assert 1 and 2 is 1 and 2 with "direct list comparison of equal numbers failed"
+	assert 1, 2, and 3 is not 1 and 2 with "direct list comparison of non-equal numbers succeeded"
+	assert 1 and 2 is 1, 2, or 3 with "comparison between AND list of numbers and OR list of superset of numbers failed"
+	assert 1, 2, and 3 is 1 or 2 to fail with "comparison between AND list of numbers and OR list of subset of numbers succeeded"
 
-	assert 1, 2, 3 is greater than -1, -2, -3 with "Numbers are not larger than smaller numbers"
-	assert 1, 2, 3 is less than 5, 6, 7 with "Numbers are not smaller than larger numbers"
-	assert 1, 2, 3 is between -1, 1 and 3, 3.5 with "Numbers are not between smaller/equal numbers and larger/equal numbers"
+	assert 1, 2, and 3 is greater than -1, -2, and -3 with "Numbers are not larger than smaller numbers"
+	assert 1, 2, and 3 is less than 5, 6, and 7 with "Numbers are not smaller than larger numbers"
+	assert 1, 2, and 3 is between (-1 and 1) and (3 and 3.5) with "Numbers are not between smaller/equal numbers and larger/equal numbers"
 
 	assert 10 is between 5 and 15 with "Number isn't between smaller and larger"
 	assert 10 is between 9 and 11 with "Number isn't between smaller and larger"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprRepeat.sk b/src/test/skript/tests/syntaxes/expressions/ExprRepeat.sk
index fc2cbac598b..96dd6a1c100 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprRepeat.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprRepeat.sk
@@ -43,7 +43,7 @@ test "repeat expression":
 	then:
 		assert false is true with "ExprRepeat Multi - 1) 'aa' and 'b' repeated 3 times is not 'aaaaaa' and 'bbb'"
 
-	set {_strings::*} to "aa", "b"
+	set {_strings::*} to "aa" and "b"
 	set {_strings::*} to {_strings::*} repeated {_repeat} times
 	if any:
 		{_strings::1} is not "aaaaaa"
@@ -51,7 +51,7 @@ test "repeat expression":
 	then:
 		assert false is true with "ExprRepeat Multi - 2) 'aa' and 'b' repeated 3 times is not 'aaaaaa' and 'bbb'"
 
-	set {_strings::*} to "aa", "b"
+	set {_strings::*} to "aa" and "b"
 	set {_strings::*} to {_strings::*} repeated 3 times
 	if any:
 		{_strings::1} is not "aaaaaa"
@@ -59,7 +59,7 @@ test "repeat expression":
 	then:
 		assert false is true with "ExprRepeat Multi - 3) 'aa' and 'b' repeated 3 times is not 'aaaaaa' and 'bbb'"
 
-	set {_strings::*} to "aa", "b" repeated {_repeat} times
+	set {_strings::*} to "aa" and "b" repeated {_repeat} times
 	if any:
 		{_strings::1} is not "aaaaaa"
 		{_strings::2} is not "bbb"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprStringCase.sk b/src/test/skript/tests/syntaxes/expressions/ExprStringCase.sk
index acca046bad5..593cb9578b0 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprStringCase.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprStringCase.sk
@@ -1,7 +1,7 @@
 test "string cases":
 	assert caseEquals("Oops!" in lowercase, "oops!") is true with "lowercase failed"
 	assert caseEquals("Oops!" in uppercase, "OOPS!") is true with "uppercase failed"
-	assert caseEquals(capitalised "Oops!", "OOPS!") is true with "capitalised failed"
+	assert caseEquals((capitalised "Oops!"), "OOPS!") is true with "capitalised failed"
 	assert caseEquals("hellO i'm steve!" in proper case, "HellO I'm Steve!") is true with "lenient proper case failed"
 	assert caseEquals("hellO i'm steve!" in strict proper case, "Hello I'm Steve!") is true with "strict proper case failed"
 	assert caseEquals("spAwn neW boSs ()" in camel case, "spAwnNeWBoSs()") is true with "lenient camel case failed"

From 3e3f0a9d77e4e2655162ee2cb8beff11b1f31cdf Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Sat, 21 Sep 2024 17:55:48 -0400
Subject: [PATCH 05/18] bstats - Fix trying to compare enum value to string
 value for verbosity and event priority (#7027)

* Fix trying to compare enum value to string value for verbosity and event priority

* wrong polarity for var/command case sensitivity
---
 .../org/skriptlang/skript/bukkit/SkriptMetrics.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/skriptlang/skript/bukkit/SkriptMetrics.java b/src/main/java/org/skriptlang/skript/bukkit/SkriptMetrics.java
index e57c4ec7700..4fa2865378c 100644
--- a/src/main/java/org/skriptlang/skript/bukkit/SkriptMetrics.java
+++ b/src/main/java/org/skriptlang/skript/bukkit/SkriptMetrics.java
@@ -120,12 +120,14 @@ public static void setupMetrics(Metrics metrics) {
 
 		metrics.addCustomChart(new DrilldownPie("drilldownLogVerbosity", () -> {
 			String verbosity = SkriptConfig.verbosity.value().name().toLowerCase(Locale.ENGLISH).replace('_', ' ');
-			return isDefaultMap(verbosity, SkriptConfig.verbosity.defaultValue());
+			String defaultValue = SkriptConfig.verbosity.defaultValue().name().toLowerCase(Locale.ENGLISH).replace('_', ' ');
+			return isDefaultMap(verbosity, defaultValue);
 		}));
 
 		metrics.addCustomChart(new DrilldownPie("drilldownPluginPriority", () -> {
 			String priority = SkriptConfig.defaultEventPriority.value().name().toLowerCase(Locale.ENGLISH).replace('_', ' ');
-			return isDefaultMap(priority, SkriptConfig.defaultEventPriority.defaultValue());
+			String defaultValue = SkriptConfig.defaultEventPriority.defaultValue().name().toLowerCase(Locale.ENGLISH).replace('_', ' ');
+			return isDefaultMap(priority, defaultValue);
 		}));
 		metrics.addCustomChart(new SimplePie("cancelledByDefault", () ->
 			SkriptConfig.listenCancelledByDefault.value().toString()
@@ -143,10 +145,10 @@ public static void setupMetrics(Metrics metrics) {
 			SkriptConfig.caseSensitive.value().toString()
 		));
 		metrics.addCustomChart(new SimplePie("caseSensitiveVariables", () ->
-			SkriptConfig.caseInsensitiveVariables.value().toString()
+			String.valueOf(!SkriptConfig.caseInsensitiveVariables.value())
 		));
 		metrics.addCustomChart(new SimplePie("caseSensitiveCommands", () ->
-			SkriptConfig.caseInsensitiveCommands.value().toString()
+			String.valueOf(!SkriptConfig.caseInsensitiveCommands.value())
 		));
 
 		metrics.addCustomChart(new SimplePie("disableSaveWarnings", () ->

From 98013299019f9f7a32e3ab615e4a3a62ece4b95c Mon Sep 17 00:00:00 2001
From: TenFont <83959297+TenFont@users.noreply.github.com>
Date: Sun, 22 Sep 2024 05:32:43 +0500
Subject: [PATCH 06/18] Return isNegative() and not false, if CondIsWithin is
 invalid (#7038)

* Return isNegated() instead of false if check is invalid

* Add test for <1.17 as well

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
---
 src/main/java/ch/njol/skript/conditions/CondIsWithin.java | 4 ++--
 src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/njol/skript/conditions/CondIsWithin.java b/src/main/java/ch/njol/skript/conditions/CondIsWithin.java
index e6b88ed710a..7ec25401ae8 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsWithin.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsWithin.java
@@ -103,7 +103,7 @@ public boolean check(Event event) {
 			Location one = loc1.getSingle(event);
 			Location two = loc2.getSingle(event);
 			if (one == null || two == null || one.getWorld() != two.getWorld())
-				return false;
+				return isNegated();
 			AABB box = new AABB(one, two);
 			return locsToCheck.check(event, box::contains, isNegated());
 		}
@@ -111,7 +111,7 @@ public boolean check(Event event) {
 		// else, within an entity/block/chunk/world
 		Object area = this.area.getSingle(event);
 		if (area == null)
-			return false;
+			return isNegated();
 
 		// Entities
 		if (area instanceof Entity) {
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk b/src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk
index b432c72f0ff..757bfa49633 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk
@@ -4,6 +4,7 @@ test "within condition" when running minecraft "1.17":
 	set {_loc2} to location(20, 20, 20, "world")
 	assert location(10, 10, 10, "world") is within {_loc1} and {_loc2} with "failed within two locs"
 	assert location(10, -10, 10, "world") is not within {_loc1} and {_loc2} with "failed within two locs"
+	assert location(0, 0, 0, "world") is not within {_none} and {_none} with "failed within two locs"
 
 	# chunks
 	set {_chunk1} to chunk at {_loc1}
@@ -37,6 +38,7 @@ test "within condition" when running below minecraft "1.17":
 	set {_loc2} to location(20, 20, 20, "world")
 	assert location(10, 10, 10, "world") is within {_loc1} and {_loc2} with "failed within two locs"
 	assert location(10, -10, 10, "world") is not within {_loc1} and {_loc2} with "failed within two locs"
+	assert location(0, 0, 0, "world") is not within {_none} and {_none} with "failed within two locs"
 
 	# chunks
 	set {_chunk1} to chunk at {_loc1}

From 6dadbf078d366384eafd1e8099fb060e8ca69a38 Mon Sep 17 00:00:00 2001
From: mugu <collaluca2@gmail.com>
Date: Sun, 22 Sep 2024 03:05:16 +0200
Subject: [PATCH 07/18] Update config.sk (#7052)

Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
---
 src/main/resources/config.sk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/config.sk b/src/main/resources/config.sk
index eb0b295c288..2d7b5ee197f 100644
--- a/src/main/resources/config.sk
+++ b/src/main/resources/config.sk
@@ -31,7 +31,7 @@
 # ==== General Options ====
 
 language: english
-# Which language to use. Currently English, German, Korean, French, Polish, Russian, Japanese, Simplified Chinese and Turkish
+# Which language to use. Currently English, German, Korean, French, Polish, Russian, Japanese, Simplified Chinese, Turkish and Dutch
 # are included in the download, but custom languages can be created as well. Use the name in lowercase and no spaces as the value.
 # Please note that not everything can be translated yet, i.e. parts of Skript will still be english if you use another language.
 # If you want to translate Skript to your language please read the readme.txt located in the /lang/ folder in the jar

From 0a8bac337676ff9e63da685da8ca98a2f597c953 Mon Sep 17 00:00:00 2001
From: Efy <35348263+Efnilite@users.noreply.github.com>
Date: Sun, 22 Sep 2024 03:22:02 +0200
Subject: [PATCH 08/18] Fix ExprHoverList's remove (#7056)

* init commit

* remove pattern matching >:(

---------

Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
---
 .../ch/njol/skript/expressions/ExprHoverList.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/njol/skript/expressions/ExprHoverList.java b/src/main/java/ch/njol/skript/expressions/ExprHoverList.java
index a3b58b6b9d3..835319f3449 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHoverList.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHoverList.java
@@ -104,7 +104,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 
 		if (HAS_NEW_LISTED_PLAYER_INFO) {
 			List<PaperServerListPingEvent.ListedPlayerInfo> values = new ArrayList<>();
-			if (mode != ChangeMode.DELETE && mode != ChangeMode.RESET) {
+			if (mode != ChangeMode.DELETE && mode != ChangeMode.RESET && mode != ChangeMode.REMOVE) {
 				for (Object object : delta) {
 					if (object instanceof Player) {
 						Player player = (Player) object;
@@ -124,7 +124,9 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 					sample.addAll(values);
 					break;
 				case REMOVE:
-					sample.removeAll(values);
+					for (Object value : delta) {
+						sample.removeIf(profile -> profile.name().equals(value));
+					}
 					break;
 				case DELETE:
 				case RESET:
@@ -135,7 +137,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		}
 
 		List<PlayerProfile> values = new ArrayList<>();
-		if (mode != ChangeMode.DELETE && mode != ChangeMode.RESET) {
+		if (mode != ChangeMode.DELETE && mode != ChangeMode.RESET && mode != ChangeMode.REMOVE) {
 			for (Object object : delta) {
 				if (object instanceof Player) {
 					Player player = (Player) object;
@@ -150,13 +152,14 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		switch (mode) {
 			case SET:
 				sample.clear();
-				sample.addAll(values);
-				break;
+				// $FALL-THROUGH$
 			case ADD:
 				sample.addAll(values);
 				break;
 			case REMOVE:
-				sample.removeAll(values);
+				for (Object value : delta) {
+					sample.removeIf(profile -> profile.getName() != null && profile.getName().equals(value));
+				}
 				break;
 			case DELETE:
 			case RESET:

From 19985d98d1974a2c6de2b4e9476691b0129881e3 Mon Sep 17 00:00:00 2001
From: Efy <35348263+Efnilite@users.noreply.github.com>
Date: Sun, 22 Sep 2024 04:49:17 +0200
Subject: [PATCH 09/18] Update ExprTime (#7082)

* init commit

* update imports

* magic number

* space

* fixes

* up

* imports

* fix for registerDefault

* fix breaking changes

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
---
 .../ch/njol/skript/expressions/ExprTime.java  | 153 +++++++++---------
 .../tests/regressions/7081-time of worlds.sk  |  29 ++++
 2 files changed, 102 insertions(+), 80 deletions(-)
 create mode 100644 src/test/skript/tests/regressions/7081-time of worlds.sk

diff --git a/src/main/java/ch/njol/skript/expressions/ExprTime.java b/src/main/java/ch/njol/skript/expressions/ExprTime.java
index 4e769f6656d..e2199e18a80 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTime.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTime.java
@@ -1,27 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.World;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
@@ -32,42 +10,51 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.util.Getter;
 import ch.njol.skript.util.Time;
 import ch.njol.skript.util.Timeperiod;
 import ch.njol.skript.util.Timespan;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.World;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Time")
-@Description("The <a href='classes.html#time'>time</a> of a world.")
-@Examples({"time in world is between 18:00 and 6:00:",
-		"	broadcast \"It's night-time, watch out for monsters!\""})
+@Description({
+	"The <a href='classes.html#time'>time</a> of a world.",
+	"Use the \"minecraft <a href='classes.html#timespan'>timespan</a>\" syntax to change the time according " +
+	"to Minecraft's time intervals.",
+	"Since Minecraft uses discrete intervals for time (ticks), " +
+	"changing the time by real-world minutes or real-world seconds only changes it approximately.",
+	"Removing an amount of time from a world's time will move the clock forward a day."
+})
+@Examples({
+	"set time of world \"world\" to 2:00",
+	"add 2 minecraft hours to time of world \"world\"",
+	"add 54 real seconds to time of world \"world\" # approximately 1 minecraft hour"
+})
 @Since("1.0")
 public class ExprTime extends PropertyExpression<World, Time> {
+
+	// 18000 is the offset to allow for using "add 2:00" without going to a new day
+	// and causing unexpected behaviour
+	private static final int TIME_TO_TIMESPAN_OFFSET = 18000;
+
 	static {
-		Skript.registerExpression(ExprTime.class, Time.class, ExpressionType.PROPERTY, "[the] time[s] [([with]in|of) %worlds%]", "%worlds%'[s] time[s]");
+		Skript.registerExpression(ExprTime.class, Time.class, ExpressionType.PROPERTY,
+			"[the] time[s] [([with]in|of) %worlds%]", "%worlds%'[s] time[s]");
 	}
-	
-	@SuppressWarnings({"unchecked", "null"})
+
+	@SuppressWarnings("unchecked")
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parser) {
-		setExpr((Expression<World>) exprs[0]);
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
+		setExpr((Expression<World>) expressions[0]);
 		return true;
 	}
-	
+
 	@Override
-	protected Time[] get(final Event e, final World[] source) {
-		return get(source, new Getter<Time, World>() {
-			@Override
-			public Time get(final World w) {
-				return new Time((int) w.getTime());
-			}
-		});
+	protected Time[] get(Event event, World[] worlds) {
+		return get(worlds, world -> new Time((int) world.getTime()));
 	}
 
 	@Override
@@ -76,56 +63,62 @@ public Class<?>[] acceptChange(final ChangeMode mode) {
 		switch (mode) {
 			case ADD:
 			case REMOVE:
-				return CollectionUtils.array(Timespan.class);
+				// allow time to avoid conversion to timespan, which causes all sorts of headaches
+				return CollectionUtils.array(Time.class, Timespan.class);
 			case SET:
 				return CollectionUtils.array(Time.class, Timeperiod.class);
-			case DELETE:
-			case REMOVE_ALL:
-			case RESET:
 			default:
 				return null;
 		}
 	}
-	
+
 	@Override
-	public void change(final Event e, final @Nullable Object[] delta, final ChangeMode mode) {
-		final World[] worlds = getExpr().getArray(e);
-		int mod = 1;
-		switch (mode) {
-			case SET:
-				assert delta != null;
-				final int time = delta[0] instanceof Time ? ((Time) delta[0]).getTicks() : ((Timeperiod) delta[0]).start;
-				for (final World w : worlds) {
-					w.setTime(time);
-				}
-				break;
-			case REMOVE:
-				mod = -1;
-				//$FALL-THROUGH$
-			case ADD:
-				assert delta != null;
-				final Timespan ts = (Timespan) delta[0];
-				for (final World w : worlds) {
-					w.setTime(w.getTime() + mod * ts.getTicks());
-				}
-				break;
-			case DELETE:
-			case REMOVE_ALL:
-			case RESET:
-				assert false;
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (getExpr() == null || delta == null)
+			return;
+
+		Object time = delta[0];
+		if (time == null)
+			return;
+
+		World[] worlds = getExpr().getArray(event);
+
+		long ticks = 0;
+		if (time instanceof Time) {
+			if (mode != ChangeMode.SET) {
+				ticks = ((Time) time).getTicks() - TIME_TO_TIMESPAN_OFFSET;
+			} else {
+				ticks = ((Time) time).getTicks();
+			}
+		} else if (time instanceof Timespan) {
+			ticks = ((Timespan) time).getAs(Timespan.TimePeriod.TICK);
+		} else if (time instanceof Timeperiod) {
+			ticks = ((Timeperiod) time).start;
+		}
+
+		for (World world : worlds) {
+			switch (mode) {
+				case ADD:
+					world.setTime(world.getTime() + ticks);
+					break;
+				case REMOVE:
+					world.setTime(world.getTime() - ticks);
+					break;
+				case SET:
+					world.setTime(ticks);
+					break;
+			}
 		}
 	}
-	
+
 	@Override
 	public Class<Time> getReturnType() {
 		return Time.class;
 	}
-	
+
 	@Override
-	public String toString(final @Nullable Event event, final boolean debug) {
-		if (event == null)
-			return "the time in " + getExpr().toString(event, debug);
-		return Classes.getDebugMessage(getAll(event));
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the time in " + getExpr().toString(event, debug);
 	}
-	
+
 }
diff --git a/src/test/skript/tests/regressions/7081-time of worlds.sk b/src/test/skript/tests/regressions/7081-time of worlds.sk
new file mode 100644
index 00000000000..a6cf77402dc
--- /dev/null
+++ b/src/test/skript/tests/regressions/7081-time of worlds.sk	
@@ -0,0 +1,29 @@
+test "time of worlds":
+
+	set {_w} to world "world"
+	set {_startTime} to time of {_w}
+
+	set time of {_w} to 00:00
+	assert time of {_w} is 00:00 with "time in world should be 00:00"
+	add 1 hour and 20 minutes to time of {_w} # add 4 Minecraft days
+	assert time of {_w} is 00:00 with "time in world should be 00:00"
+	add 1 minecraft hour and 20 minecraft minutes to time of {_w}
+	assert time of {_w} is 01:20 with "time in world should be 01:20"
+	add 1 minecraft day to time of {_w}
+	assert time of {_w} is 01:20 with "time in world should be 01:20"
+
+	remove 1 hour and 20 minutes from time of {_w} # remove 4 Minecraft days
+	assert time of {_w} is 01:20 with "time in world should be 01:20"
+	remove 1 minecraft hour and 20 minecraft minutes from time of {_w}
+	assert time of {_w} is 00:00 with "time in world should be 00:00"
+
+	add 1 minecraft hour to time of {_w}
+	assert time of {_w} is 01:00 with "time in world should be 01:00"
+	add 01:01 to time of {_w}
+	assert time of {_w} is 02:01 with "time in world should be 02:01"
+	remove 01:01 from time of {_w}
+	assert time of {_w} is 01:00 with "time in world should be 01:00"
+	remove 1 minecraft hour from time of {_w}
+	assert time of {_w} is 00:00 with "time in world should be 00:00"
+
+	set time of {_w} to {_startTime}

From 03cd121e25a60ca736d18f52097fec3bde3dca5f Mon Sep 17 00:00:00 2001
From: Pesek <42549665+Pesekjak@users.noreply.github.com>
Date: Sun, 22 Sep 2024 18:25:39 +0200
Subject: [PATCH 10/18] Introduction of checkstyle (#7089)

* added checkstyle for Skript code conventions

* removed the check for short field names and required braces for code blocks

* added GitHub workflow for checkstyle
disabled checkstyle check running after `build` task
changed severity of code violations to warning

* added information about empty lines at the end of the java files to the code conventions

* added artifact upload for the checkstyle reports

* Update code-conventions.md

Co-authored-by: Efy <35348263+Efnilite@users.noreply.github.com>

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Efy <35348263+Efnilite@users.noreply.github.com>
---
 .github/workflows/checkstyle.yml |  37 ++++++++++++
 build.gradle                     |   6 ++
 checkstyle.xml                   | 100 +++++++++++++++++++++++++++++++
 code-conventions.md              |   1 +
 4 files changed, 144 insertions(+)
 create mode 100644 .github/workflows/checkstyle.yml
 create mode 100644 checkstyle.xml

diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
new file mode 100644
index 00000000000..409ca6b4fd7
--- /dev/null
+++ b/.github/workflows/checkstyle.yml
@@ -0,0 +1,37 @@
+name: checkstyle
+
+on:
+    push:
+        branches:
+            - master
+            - 'dev/**'
+    pull_request:
+
+jobs:
+    build:
+        if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+            - name: validate gradle wrapper
+              uses: gradle/wrapper-validation-action@v2
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '21'
+                  distribution: 'adopt'
+                  cache: gradle
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+            - name: Run checkstyle
+              run: ./gradlew clean checkstyleMain
+            - name: Upload checkstyle report
+              uses: actions/upload-artifact@v4
+              if: success()
+              with:
+                  name: checkstyle-report
+                  path: |
+                    build/reports/checkstyle/*.xml
+                    build/reports/checkstyle/*.html
diff --git a/build.gradle b/build.gradle
index cbd57863b39..23044477a27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ plugins {
 	id 'com.github.johnrengelman.shadow' version '8.1.1'
 	id 'maven-publish'
 	id 'java'
+	id 'checkstyle'
 }
 
 configurations {
@@ -42,6 +43,11 @@ dependencies {
 	testShadow group: 'org.easymock', name: 'easymock', version: '5.4.0'
 }
 
+checkstyle {
+	configFile = new File("checkstyle.xml")
+	sourceSets = [] // disables checkstyle after build task
+}
+
 task checkAliases {
 	description 'Checks for the existence of the aliases.'
 	doLast {
diff --git a/checkstyle.xml b/checkstyle.xml
new file mode 100644
index 00000000000..42794bbeccb
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+	"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+	"https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+
+	<!--Basic Settings-->
+	<!--Warning severity so the builds do not fail because of checkstyle, this is mainly for the GitHub workflow-->
+	<property name="severity" value="warning"/>
+	<property name="fileExtensions" value="java"/>
+	<module name="BeforeExecutionExclusionFileFilter">
+		<property name="fileNamePattern" value="module\-info\.java$"/>
+	</module>
+
+	<!--At most 120 characters per line-->
+	<module name="LineLength">
+		<property name="max" value="120"/>
+	</module>
+
+	<!--New line at the end of the file-->
+	<module name="NewlineAtEndOfFile"/>
+
+	<module name="TreeWalker">
+
+		<!--Tabs, no spaces-->
+		<module name="RegexpSinglelineJava">
+			<property name="format" value="^\t* "/>
+			<property name="message" value="Indent must use tab characters"/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+
+		<!--No trailing whitespace-->
+		<module name="NoWhitespaceAfter" />
+
+		<!--When statements consume multiple lines, all lines but the first have two tabs of additional indentation-->
+		<module name="Indentation">
+			<property name="arrayInitIndent" value="8" />
+			<property name="basicOffset" value="8" />
+			<property name="caseIndent" value="8" />
+			<property name="lineWrappingIndentation" value="8" />
+			<property name="throwsIndent" value="8" />
+		</module>
+
+		<!--Each class begins with an empty line-->
+		<module name="EmptyLineSeparator">
+			<property name="allowNoEmptyLineBetweenFields" value="true" />
+			<property name="tokens"
+					  value="IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF,
+					  		ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF,
+					  		CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF" />
+		</module>
+
+		<module name="OneStatementPerLine"/>
+
+		<!--Annotations for a structure go on the line before that structure-->
+		<module name="AnnotationLocation"/>
+
+		<!--When splitting Strings into multiple lines the last part of the string must be (space character included) " " +-->
+		<module name="OperatorWrap">
+			<property name="option" value="eol" />
+			<property name="tokens" value="PLUS" />
+		</module>
+
+		<!--Class names are written in UpperCamelCase-->
+		<module name="TypeName"/>
+
+		<!--Methods named in camelCase-->
+		<module name="MethodName"/>
+
+		<!--Static constant fields should be named in UPPER_SNAKE_CASE-->
+		<module name="ConstantName"/>
+
+		<!--We use JetBrains Annotations for specifying null-ness-->
+		<module name="IllegalImport">
+			<property name="illegalClasses"
+					  value="javax.annotation.Nonnull,
+							javax.annotation.Nullable,
+							org.eclipse.jdt.annotation.NonNull,
+							org.eclipse.jdt.annotation.Nullable,
+							org.eclipse.sisu.Nullable,
+							org.checkerframework.checker.nullness.qual.NonNull,
+							org.checkerframework.checker.nullness.qual.Nullable" />
+			<property name="illegalPkgs" value="" />
+		</module>
+
+		<!--Modules for code improvements-->
+		<module name="MissingOverride"/>
+		<module name="EmptyBlock"/>
+		<module name="HideUtilityClassConstructor"/>
+		<module name="EmptyStatement"/>
+		<module name="EqualsHashCode"/>
+		<module name="SimplifyBooleanExpression"/>
+		<module name="SimplifyBooleanReturn"/>
+		<module name="StringLiteralEquality"/>
+		<module name="UnusedLocalVariable"/>
+
+	</module>
+
+</module>
\ No newline at end of file
diff --git a/code-conventions.md b/code-conventions.md
index 3bcf17c6c9f..b6942221cdd 100644
--- a/code-conventions.md
+++ b/code-conventions.md
@@ -97,6 +97,7 @@ If we need to remove or alter contributed code due to a licensing issue we will
 	- The exception to this is breaking up conditional statements (e.g. `if (x || y)`) where the
     condition starts may be aligned
 * Each class begins with an empty line
+* Each Java file ends with an empty line
 * No squeezing of multiple lines of code on a single line
 * Separate method declarations with empty lines
   	- Empty line after last method in a class is *not* required

From 03b4ebbe3dc5570ccaef73429006a15bc9226d1e Mon Sep 17 00:00:00 2001
From: Asleepp <119438940+Asleeepp@users.noreply.github.com>
Date: Tue, 1 Oct 2024 13:37:37 -0300
Subject: [PATCH 11/18] Fix Message when reloading multiple scripts with an
 error. (#7031)

---
 src/main/java/ch/njol/skript/SkriptCommand.java | 6 +++++-
 src/main/resources/lang/english.lang            | 3 ++-
 src/main/resources/lang/french.lang             | 3 ++-
 src/main/resources/lang/german.lang             | 3 ++-
 src/main/resources/lang/japanese.lang           | 3 ++-
 src/main/resources/lang/korean.lang             | 3 ++-
 src/main/resources/lang/polish.lang             | 3 ++-
 src/main/resources/lang/russian.lang            | 3 ++-
 src/main/resources/lang/simplifiedchinese.lang  | 3 ++-
 src/main/resources/lang/turkish.lang            | 3 ++-
 10 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
index 5e5609e6c95..447c589ead6 100644
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -200,7 +200,11 @@ else if (args[1].equalsIgnoreCase("aliases")) {
 								if (scriptInfo.files == 0) {
 									info(sender, "reload.empty folder", fileName);
 								} else {
-									reloaded(sender, logHandler, timingLogHandler, "x scripts in folder", fileName, scriptInfo.files);
+									if (logHandler.numErrors() == 0) {
+										reloaded(sender, logHandler, timingLogHandler, "x scripts in folder success", fileName, scriptInfo.files);
+									} else {
+										reloaded(sender, logHandler, timingLogHandler, "x scripts in folder error", fileName, scriptInfo.files);
+									}
 								}
 							});
 					}
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index 43e417be1a9..edc760276d0 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -68,7 +68,8 @@ skript command:
 		aliases: the aliases
 		script: <gold>%s<reset>
 		scripts in folder: all scripts in <gold>%s<reset>
-		x scripts in folder: <gold>%2$s <lime>script¦¦s¦ in <gold>%1$s<reset>
+		x scripts in folder success: <gold>%2$s <lime>script¦¦s¦ in <gold>%1$s<reset>
+		x scripts in folder error: <gold>%2$s <light red>script¦¦s¦ in <gold>%1$s<reset>
 		empty folder: <gold>%s<reset> does not contain any enabled scripts.
 	enable:
 		all:
diff --git a/src/main/resources/lang/french.lang b/src/main/resources/lang/french.lang
index 242bd42ef30..43204c403d8 100644
--- a/src/main/resources/lang/french.lang
+++ b/src/main/resources/lang/french.lang
@@ -68,7 +68,8 @@ skript command:
 		aliases: les alias
 		script: <gold>%s<reset>
 		scripts in folder: tous les scripts dans <gold>%s<reset>
-		x scripts in folder: <gold>%2$s <lime>script¦¦s¦ dans <gold>%1$s<reset>
+		x scripts in folder success: <gold>%2$s <lime>script¦¦s¦ dans <gold>%1$s<reset>
+		x scripts in folder error: <gold>%2$s <light red>script¦¦s¦ dans <gold>%1$s<reset>
 		empty folder: <gold>%s<reset> ne contient aucun script activé.
 	enable:
 		all:
diff --git a/src/main/resources/lang/german.lang b/src/main/resources/lang/german.lang
index 38b25b80c27..adb84ece5d1 100644
--- a/src/main/resources/lang/german.lang
+++ b/src/main/resources/lang/german.lang
@@ -68,7 +68,8 @@ skript command:
 		aliases: die Itemnamen
 		script: <gold>%s<reset>
 		scripts in folder: alle Skripte in <gold>%s<reset>
-		x scripts in folder: <gold>%2$s <lime>Skript¦¦e¦ in <gold>%1$s<reset>
+		x scripts in folder success: <gold>%2$s <lime>Skript¦¦e¦ in <gold>%1$s<reset>
+		x scripts in folder error: <gold>%2$s <light red>Skript¦¦e¦ in <gold>%1$s<reset>
 		empty folder: <gold>%s<reset> enthält keine aktivierten Skripte.
 	enable:
 		all:
diff --git a/src/main/resources/lang/japanese.lang b/src/main/resources/lang/japanese.lang
index aa2081b17b2..8a7f1b907bc 100644
--- a/src/main/resources/lang/japanese.lang
+++ b/src/main/resources/lang/japanese.lang
@@ -68,7 +68,8 @@ skript command:
 		aliases: エイリアス
 		script: <gold>%s<reset>
 		scripts in folder: <gold>%s<reset>フォルダ内の全てのスクリプト
-		x scripts in folder: <gold>%1$s<lime>フォルダ内の<gold>%2$s<reset>個のスクリプト
+		x scripts in folder success: <gold>%1$s<lime>フォルダ内の<gold>%2$s<reset>個のスクリプト
+		x scripts in folder error: <gold>%1$s<light red>フォルダ内の<gold>%2$s<reset>個のスクリプト
 		empty folder: 有効化されたスクリプトが<gold>%s<reset>フォルダ内にありませんでした。
 	enable:
 		all:
diff --git a/src/main/resources/lang/korean.lang b/src/main/resources/lang/korean.lang
index fdbf38a32b3..dbbcb028af6 100644
--- a/src/main/resources/lang/korean.lang
+++ b/src/main/resources/lang/korean.lang
@@ -68,7 +68,8 @@ skript command:
 		aliases: 별칭(aliases)
 		script: <gold>%s<reset>
 		scripts in folder: <gold>%s<reset>폴더 속 모든 스크립트
-		x scripts in folder: <gold>%1$s<lime> 폴더 속 <gold>%2$s<reset>개의 스크립트
+		x scripts in folder success: <gold>%1$s<lime> 폴더 속 <gold>%2$s<reset>개의 스크립트
+		x scripts in folder error: <gold>%1$s<light red> 폴더 속 <gold>%2$s<reset>개의 스크립트
 		empty folder: <gold>%s<reset>에 활성화된 스크립트가 없습니다.
 	enable:
 		all:
diff --git a/src/main/resources/lang/polish.lang b/src/main/resources/lang/polish.lang
index 52ed35ec973..6c73f4f3742 100644
--- a/src/main/resources/lang/polish.lang
+++ b/src/main/resources/lang/polish.lang
@@ -68,7 +68,8 @@ skript command:
 		aliases: aliasy
 		script: <gold>%s<reset>
 		scripts in folder: wszystkie skrypty w <gold>%s<reset>
-		x scripts in folder: <gold>%2$s <lime>skrypt¦¦ów¦ w <gold>%1$s<reset>
+		x scripts in folder success: <gold>%2$s <lime>skrypt¦¦ów¦ w <gold>%1$s<reset>
+		x scripts in folder error: <gold>%2$s <light red>skrypt¦¦ów¦ w <gold>%1$s<reset>
 		empty folder: <gold>%s<reset> nie ma w sobie żadnych włączonych skryptów.
 	enable:
 		all:
diff --git a/src/main/resources/lang/russian.lang b/src/main/resources/lang/russian.lang
index 8986c2cf429..b45880da823 100644
--- a/src/main/resources/lang/russian.lang
+++ b/src/main/resources/lang/russian.lang
@@ -68,7 +68,8 @@ skript command:
 		aliases: алиасы
 		script: <gold>%s<reset>
 		scripts in folder: все скрипты в <gold>%s<reset>
-		x scripts in folder: <gold>%2$s <lime>скриптов в <gold>%1$s<reset>
+		x scripts in folder success: <gold>%2$s <lime>скриптов в <gold>%1$s<reset>
+		x scripts in folder error: <gold>%2$s <light red>скриптов в <gold>%1$s<reset>
 		empty folder: <gold>%s<reset> не содержит включенных скриптов.
 	enable:
 		all:
diff --git a/src/main/resources/lang/simplifiedchinese.lang b/src/main/resources/lang/simplifiedchinese.lang
index b502f9068aa..67edca415ba 100644
--- a/src/main/resources/lang/simplifiedchinese.lang
+++ b/src/main/resources/lang/simplifiedchinese.lang
@@ -68,7 +68,8 @@ skript command:
 		aliases: 其它配置
 		script: <gold>%s<reset>
 		scripts in folder: <gold>%s<reset>中的所有脚本
-		x scripts in folder: <gold>%1$s<reset>中的<gold>%2$s<reset>个脚本
+		x scripts in folder success: <gold>%1$s<reset>中的<gold>%2$s<lime>个脚本
+		x scripts in folder error: <gold>%1$s<reset>中的<gold>%2$s<light red>个脚本
 		empty folder: <gold>%s<reset>不包含任何已启用的脚本。
 	enable:
 		all:
diff --git a/src/main/resources/lang/turkish.lang b/src/main/resources/lang/turkish.lang
index ca8cad7b9c5..fc2ffdcaaca 100644
--- a/src/main/resources/lang/turkish.lang
+++ b/src/main/resources/lang/turkish.lang
@@ -66,7 +66,8 @@ skript command:
 		aliases: alias'lar
 		script: <gold>%s<reset>
 		scripts in folder: <gold>%s<reset> klasöründeki tüm script'ler
-		x scripts in folder: <gold>%1$s<reset> klasöründeki <gold>%2$s <lime>script
+		x scripts in folder success: <gold>%1$s<reset> klasöründeki <gold>%2$s <lime>script
+		x scripts in folder error: <gold>%1$s<reset> klasöründeki <gold>%2$s <light red>script
 		empty folder: <gold>%s<reset> aktif script içermiyor.
 	enable:
 		all:

From 6d4582ee0c8a67c1366fcc30dc59a8440a423147 Mon Sep 17 00:00:00 2001
From: Moderocky <admin@moderocky.com>
Date: Tue, 1 Oct 2024 17:41:02 +0100
Subject: [PATCH 12/18] Nicer description for EffSort. (#7058)

---
 .../java/ch/njol/skript/effects/EffSort.java  | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/main/java/ch/njol/skript/effects/EffSort.java b/src/main/java/ch/njol/skript/effects/EffSort.java
index d387fe7bae0..25f7fc840e0 100644
--- a/src/main/java/ch/njol/skript/effects/EffSort.java
+++ b/src/main/java/ch/njol/skript/effects/EffSort.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
@@ -48,10 +30,13 @@
 import java.util.Set;
 
 @Name("Sort")
-@Description({
-	"Sorts a list variable using either the natural ordering of the contents or the results of the given expression.",
-	"Be warned, this will overwrite the indices of the list variable."
-})
+@Description("""
+	Sorts a list variable using either the natural ordering of the contents or the results of the given expression.
+	Be warned, this will overwrite the indices of the list variable.
+	
+	When using the full <code>sort %~objects% (by|based on) &lt;expression&gt;</code> pattern,
+	the input expression can be used to refer to the current item being sorted.
+	(See input expression for more information.)""")
 @Examples({
 	"set {_words::*} to \"pineapple\", \"banana\", \"yoghurt\", and \"apple\"",
 	"sort {_words::*} # alphabetical sort",

From cb6d995206e5aab9fd493c59144339cc23f7ba2d Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Tue, 1 Oct 2024 12:45:48 -0400
Subject: [PATCH 13/18] Avoid legacy materials in aliases and expritems (#7087)

---
 .../java/ch/njol/skript/aliases/Aliases.java  |  6 +++---
 .../ch/njol/skript/expressions/ExprItems.java | 20 +------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/main/java/ch/njol/skript/aliases/Aliases.java b/src/main/java/ch/njol/skript/aliases/Aliases.java
index 19daed69359..3e67971698a 100644
--- a/src/main/java/ch/njol/skript/aliases/Aliases.java
+++ b/src/main/java/ch/njol/skript/aliases/Aliases.java
@@ -395,17 +395,17 @@ public static void load() {
 	}
 
 	/**
-	 * Temporarily create an alias for a material which may not have an alias yet.
+	 * Temporarily create an alias for materials which do not have aliases yet.
 	 */
 	private static void loadMissingAliases() {
 		if (!Skript.methodExists(Material.class, "getKey"))
 			return;
 		for (Material material : Material.values()) {
-			if (!provider.hasAliasForMaterial(material)) {
+			if (!material.isLegacy() && !provider.hasAliasForMaterial(material)) {
 				NamespacedKey key = material.getKey();
 				String name = key.getKey().replace("_", " ");
 				parser.loadAlias(name + "¦s", key.toString());
-				Skript.debug(ChatColor.YELLOW + "Creating temporary alias for: " + key.toString());
+				Skript.debug(ChatColor.YELLOW + "Creating temporary alias for: " + key);
 			}
 		}
 	}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItems.java b/src/main/java/ch/njol/skript/expressions/ExprItems.java
index 652cb3f6a72..4fb0c11d66a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprItems.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprItems.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -54,7 +36,7 @@
 public class ExprItems extends SimpleExpression<ItemType> {
 
 	private static final ItemType[] ALL_BLOCKS = Arrays.stream(Material.values())
-		.filter(Material::isBlock)
+		.filter(material -> !material.isLegacy() && material.isBlock())
 		.map(ItemType::new)
 		.toArray(ItemType[]::new);
 

From 875a39bd181b44b28ead8ae10eb852da1d9da993 Mon Sep 17 00:00:00 2001
From: Pesek <42549665+Pesekjak@users.noreply.github.com>
Date: Tue, 1 Oct 2024 18:58:06 +0200
Subject: [PATCH 14/18] Preventing NPE caused by creation of PlayerProfile from
 OfflinePlayer (#7091)

---
 .../java/ch/njol/skript/aliases/ItemType.java | 54 +++++++--------
 .../ch/njol/skript/bukkitutil/ItemUtils.java  | 29 ++++++++
 .../ch/njol/skript/expressions/ExprSkull.java | 67 ++++---------------
 .../skript/expressions/ExprSkullOwner.java    | 35 ++++------
 4 files changed, 81 insertions(+), 104 deletions(-)

diff --git a/src/main/java/ch/njol/skript/aliases/ItemType.java b/src/main/java/ch/njol/skript/aliases/ItemType.java
index 8b78d39229b..aa772d2b646 100644
--- a/src/main/java/ch/njol/skript/aliases/ItemType.java
+++ b/src/main/java/ch/njol/skript/aliases/ItemType.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 import ch.njol.skript.aliases.ItemData.OldItemData;
@@ -41,6 +23,7 @@
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Tag;
+import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Skull;
@@ -391,22 +374,35 @@ public boolean hasType() {
 	 */
 	public boolean setBlock(Block block, boolean applyPhysics) {
 		for (int i = random.nextInt(types.size()); i < types.size(); i++) {
-			ItemData d = types.get(i);
-			Material blockType = ItemUtils.asBlock(d.type);
+			ItemData data = types.get(i);
+			Material blockType = ItemUtils.asBlock(data.type);
+
 			if (blockType == null) // Ignore items which cannot be placed
 				continue;
-			if (BlockUtils.set(block, blockType, d.getBlockValues(), applyPhysics)) {
-				ItemMeta itemMeta = getItemMeta();
-				if (itemMeta instanceof SkullMeta) {
-					OfflinePlayer offlinePlayer = ((SkullMeta) itemMeta).getOwningPlayer();
-					if (offlinePlayer == null)
-						continue;
-					Skull skull = (Skull) block.getState();
+
+			if (!BlockUtils.set(block, blockType, data.getBlockValues(), applyPhysics))
+				continue;
+
+			ItemMeta itemMeta = getItemMeta();
+
+			if (itemMeta instanceof SkullMeta) {
+				OfflinePlayer offlinePlayer = ((SkullMeta) itemMeta).getOwningPlayer();
+				if (offlinePlayer == null)
+					continue;
+				Skull skull = (Skull) block.getState();
+				if (offlinePlayer.getName() != null) {
 					skull.setOwningPlayer(offlinePlayer);
-					skull.update(false, applyPhysics);
+				} else if (ItemUtils.CAN_CREATE_PLAYER_PROFILE) {
+					//noinspection deprecation
+					skull.setOwnerProfile(Bukkit.createPlayerProfile(offlinePlayer.getUniqueId(), ""));
+				} else {
+					//noinspection deprecation
+					skull.setOwner("");
 				}
-				return true;
+				skull.update(false, applyPhysics);
 			}
+
+			return true;
 		}
 		return false;
 	}
diff --git a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
index ced9f5a8367..a74a604664d 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
@@ -21,7 +21,9 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.util.slot.Slot;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.Tag;
 import org.bukkit.TreeType;
 import org.bukkit.block.Block;
@@ -32,9 +34,11 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SkullMeta;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
+import java.util.UUID;
 
 /**
  * Miscellaneous static utility methods related to items.
@@ -44,6 +48,7 @@ public class ItemUtils {
 	public static final boolean HAS_MAX_DAMAGE = Skript.methodExists(Damageable.class, "getMaxDamage");
 	// Introduced in Paper 1.21
 	public static final boolean HAS_RESET = Skript.methodExists(Damageable.class, "resetDamage");
+	public static final boolean CAN_CREATE_PLAYER_PROFILE = Skript.methodExists(Bukkit.class, "createPlayerProfile", UUID.class, String.class);
 
 	/**
 	 * Gets damage/durability of an item, or 0 if it does not have damage.
@@ -148,6 +153,30 @@ public static void setDamage(ItemType itemType, int damage) {
 		}
 	}
 
+	/**
+	 * Sets the owner of a player head.
+	 * @param skull player head item to modify
+	 * @param player owner of the head
+	 */
+	public static void setHeadOwner(ItemType skull, OfflinePlayer player) {
+		ItemMeta meta = skull.getItemMeta();
+		if (!(meta instanceof SkullMeta))
+			return;
+
+		SkullMeta skullMeta = (SkullMeta) meta;
+
+		if (player.getName() != null) {
+			skullMeta.setOwningPlayer(player);
+		} else if (CAN_CREATE_PLAYER_PROFILE) {
+			//noinspection deprecation
+			skullMeta.setOwnerProfile(Bukkit.createPlayerProfile(player.getUniqueId(), ""));
+		} else {
+			skullMeta.setOwningPlayer(null);
+		}
+
+		skull.setItemMeta(skullMeta);
+	}
+
 	/**
 	 * Gets a block material corresponding to given item material, which might
 	 * be the given material. If no block material is found, null is returned.
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSkull.java b/src/main/java/ch/njol/skript/expressions/ExprSkull.java
index bce8422a76d..8b8c0e0e19b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSkull.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSkull.java
@@ -1,86 +1,45 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.bukkitutil.ItemUtils;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.inventory.meta.SkullMeta;
 import org.jetbrains.annotations.Nullable;
 
-import ch.njol.skript.Skript;
-import ch.njol.skript.aliases.Aliases;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Kleenean;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Player Skull")
 @Description("Gets a skull item representing a player. Skulls for other entities are provided by the aliases.")
-@Examples({"give the victim's skull to the attacker",
-		"set the block at the entity to the entity's skull"})
+@Examples({
+	"give the victim's skull to the attacker",
+	"set the block at the entity to the entity's skull"
+})
 @Since("2.0")
-public class ExprSkull extends SimplePropertyExpression<Object, ItemType> {
-	
+public class ExprSkull extends SimplePropertyExpression<OfflinePlayer, ItemType> {
+
 	static {
 		register(ExprSkull.class, ItemType.class, "(head|skull)", "offlineplayers");
 	}
-	
-	/**
-	 * In 2017, SkullMeta finally got a method that takes OfflinePlayer.
-	 */
-	private static final boolean newSkullOwner = Skript.methodExists(SkullMeta.class, "setOwningPlayer", OfflinePlayer.class);
-	
-	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
-		return super.init(exprs, matchedPattern, isDelayed, parseResult);
-	}
-	
-	@SuppressWarnings("deprecation")
+
 	@Override
-	@Nullable
-	public ItemType convert(final Object o) {
+	public @Nullable ItemType convert(OfflinePlayer player) {
 		ItemType skull = new ItemType(Material.PLAYER_HEAD);
-		SkullMeta meta = (SkullMeta) skull.getItemMeta();
-		if (newSkullOwner)
-			meta.setOwningPlayer((OfflinePlayer) o);
-		else
-			meta.setOwner(((OfflinePlayer) o).getName());
-		skull.setItemMeta(meta);
+		ItemUtils.setHeadOwner(skull, player);
 		return skull;
 	}
-	
+
 	@Override
 	public Class<? extends ItemType> getReturnType() {
 		return ItemType.class;
 	}
-	
+
 	@Override
 	protected String getPropertyName() {
 		return "skull";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java b/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
index ec80ad70793..bc102126022 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
@@ -1,23 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.bukkitutil.ItemUtils;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -25,6 +8,7 @@
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
@@ -66,11 +50,20 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		OfflinePlayer offlinePlayer = (OfflinePlayer) delta[0];
 		for (Block block : getExpr().getArray(event)) {
 			BlockState state = block.getState();
-			if (state instanceof Skull) {
-				Skull skull = (Skull) state;
+			if (!(state instanceof Skull))
+				continue;
+
+			Skull skull = (Skull) state;
+			if (offlinePlayer.getName() != null) {
 				skull.setOwningPlayer(offlinePlayer);
-				skull.update(true, false);
+			} else if (ItemUtils.CAN_CREATE_PLAYER_PROFILE) {
+				//noinspection deprecation
+				skull.setOwnerProfile(Bukkit.createPlayerProfile(offlinePlayer.getUniqueId(), ""));
+			} else {
+				//noinspection deprecation
+				skull.setOwner("");
 			}
+			skull.update(true, false);
 		}
 	}
 

From c8ccc5b5bdf883a538ab5086fa0232f75fd21411 Mon Sep 17 00:00:00 2001
From: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com>
Date: Tue, 1 Oct 2024 16:10:52 -0600
Subject: [PATCH 15/18] Disallow delay within the testing system (#7095)

---
 .../ch/njol/skript/test/runner/EffAssert.java    |  5 +++++
 .../tests/syntaxes/expressions/ExprEntities.sk   | 16 ++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/njol/skript/test/runner/EffAssert.java b/src/main/java/ch/njol/skript/test/runner/EffAssert.java
index c7df3335de5..d414980e282 100644
--- a/src/main/java/ch/njol/skript/test/runner/EffAssert.java
+++ b/src/main/java/ch/njol/skript/test/runner/EffAssert.java
@@ -68,6 +68,11 @@ public class EffAssert extends Effect  {
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (isDelayed == Kleenean.TRUE && !TestMode.JUNIT && !TestMode.DEV_MODE) {
+			Skript.error("Assertions cannot be delayed");
+			return false;
+		}
+
 		String conditionString = parseResult.regexes.get(0).group();
 		errorMsg = (Expression<String>) exprs[0];
 		boolean canInit = true;
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprEntities.sk b/src/test/skript/tests/syntaxes/expressions/ExprEntities.sk
index 707bc3d593a..57f58f4df47 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprEntities.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprEntities.sk
@@ -1,11 +1,15 @@
 test "entities in chunk":
-	spawn 10 sheep at spawn of world "world"
-	wait 1 tick
+	clear all entities
+	spawn 10 sheep at spawn of world "world":
+		add event-entity to {_sheep::*}
+		add 1 to {_count}
+	assert {_count} and size of entities within {_sheep::*} is 10 with "Did not count 10 on the entities within {_sheep::*}: %{_sheep::*}%"
 	assert size of all entities in chunk at spawn of world "world" >= 10 with "Size of all entities in spawn chunk is not > 10: %size of all entities in chunk at spawn of world "world"%"
 
-	loop all entities in chunk at spawn of world "world":
+	loop all sheep in chunk at spawn of world "world":
 		add loop-entity to {_e::*}
-	assert size of {_e::*} >= 10 with "Size of all entities in spawn chunk is not > 10 (iterating): %size of {_e::*}%"
+	assert size of {_e::*} >= 10 with "Size of all sheep in spawn chunk is not >= 10 (iterating): %size of {_e::*}%"
 
-	delete all entities in chunk at spawn of world "world"
-	assert size of all entities in chunk at spawn of world "world" = 0 with "Size of all entities in spawn chunk != 0: %size of all entities in chunk at spawn of world "world"%"
+	clear entities within {_e::*}
+	assert entities within {_e::*} where [entity input is valid] is not set with "Not all the sheep were cleared"
+	clear all entities

From 92ba72d202af6b64205a6158f01568433db93c08 Mon Sep 17 00:00:00 2001
From: Efy <35348263+Efnilite@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:21:49 +0200
Subject: [PATCH 16/18] Prevent cancelling of Swim Toggle event (#7066)

---
 .../njol/skript/effects/EffCancelEvent.java   | 106 ++++++++----------
 .../syntaxes/effects/EffCancelEventTest.java  |  17 +++
 src/test/skript/junit/EffCancelEvent.sk       |  21 ++++
 .../7054-update event cancelling.sk           |  26 +++++
 4 files changed, 112 insertions(+), 58 deletions(-)
 create mode 100644 src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffCancelEventTest.java
 create mode 100644 src/test/skript/junit/EffCancelEvent.sk
 create mode 100644 src/test/skript/tests/regressions/7054-update event cancelling.sk

diff --git a/src/main/java/ch/njol/skript/effects/EffCancelEvent.java b/src/main/java/ch/njol/skript/effects/EffCancelEvent.java
index 317cdd3a9ee..3343f032cdf 100644
--- a/src/main/java/ch/njol/skript/effects/EffCancelEvent.java
+++ b/src/main/java/ch/njol/skript/effects/EffCancelEvent.java
@@ -1,34 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.Event.Result;
-import org.bukkit.event.block.BlockCanBuildEvent;
-import org.bukkit.event.inventory.InventoryInteractEvent;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.bukkitutil.PlayerUtils;
 import ch.njol.skript.doc.Description;
@@ -42,39 +13,58 @@
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.block.BlockCanBuildEvent;
+import org.bukkit.event.entity.EntityToggleSwimEvent;
+import org.bukkit.event.inventory.InventoryInteractEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Cancel Event")
 @Description("Cancels the event (e.g. prevent blocks from being placed, or damage being taken).")
-@Examples({"on damage:",
-		"	victim is a player",
-		"	victim has the permission \"skript.god\"",
-		"	cancel the event"})
+@Examples({
+	"on damage:",
+		"\tvictim is a player",
+		"\tvictim has the permission \"skript.god\"",
+		"\tcancel the event"
+})
 @Since("1.0")
 public class EffCancelEvent extends Effect {
+
 	static {
 		Skript.registerEffect(EffCancelEvent.class, "cancel [the] event", "uncancel [the] event");
 	}
 	
 	private boolean cancel;
-	
-	@SuppressWarnings("null")
+
 	@Override
-	public boolean init(final Expression<?>[] vars, final int matchedPattern, final Kleenean isDelayed, final ParseResult parser) {
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
 		if (isDelayed == Kleenean.TRUE) {
-			Skript.error("Can't cancel an event anymore after it has already passed", ErrorQuality.SEMANTIC_ERROR);
+			Skript.error("An event cannot be cancelled after it has already passed", ErrorQuality.SEMANTIC_ERROR);
 			return false;
 		}
+
 		cancel = matchedPattern == 0;
-		final Class<? extends Event>[] es = getParser().getCurrentEvents();
-		if (es == null)
+		Class<? extends Event>[] currentEvents = getParser().getCurrentEvents();
+
+		if (currentEvents == null)
+			return false;
+
+		if (cancel && getParser().isCurrentEvent(EntityToggleSwimEvent.class)) {
+			Skript.error("Cancelling a toggle swim event has no effect");
 			return false;
-		for (final Class<? extends Event> e : es) {
-			if (Cancellable.class.isAssignableFrom(e) || BlockCanBuildEvent.class.isAssignableFrom(e))
+		}
+
+		for (Class<? extends Event> event : currentEvents) {
+			if (Cancellable.class.isAssignableFrom(event) || BlockCanBuildEvent.class.isAssignableFrom(event))
 				return true; // TODO warning if some event(s) cannot be cancelled even though some can (needs a way to be suppressed)
 		}
+
 		if (getParser().isCurrentEvent(PlayerLoginEvent.class))
 			Skript.error("A connect event cannot be cancelled, but the player may be kicked ('kick player by reason of \"...\"')", ErrorQuality.SEMANTIC_ERROR);
 		else
@@ -83,24 +73,24 @@ public boolean init(final Expression<?>[] vars, final int matchedPattern, final
 	}
 	
 	@Override
-	public void execute(final Event e) {
-		if (e instanceof Cancellable)
-			((Cancellable) e).setCancelled(cancel);
-		if (e instanceof PlayerInteractEvent) {
-			EvtClick.interactTracker.eventModified((Cancellable) e);
-			((PlayerInteractEvent) e).setUseItemInHand(cancel ? Result.DENY : Result.DEFAULT);
-			((PlayerInteractEvent) e).setUseInteractedBlock(cancel ? Result.DENY : Result.DEFAULT);
-		} else if (e instanceof BlockCanBuildEvent) {
-			((BlockCanBuildEvent) e).setBuildable(!cancel);
-		} else if (e instanceof PlayerDropItemEvent) {
-			PlayerUtils.updateInventory(((PlayerDropItemEvent) e).getPlayer());
-		} else if (e instanceof InventoryInteractEvent) {
-			PlayerUtils.updateInventory(((Player) ((InventoryInteractEvent) e).getWhoClicked()));
+	public void execute(Event event) {
+		if (event instanceof Cancellable)
+			((Cancellable) event).setCancelled(cancel);
+		if (event instanceof PlayerInteractEvent) {
+			EvtClick.interactTracker.eventModified((Cancellable) event);
+			((PlayerInteractEvent) event).setUseItemInHand(cancel ? Event.Result.DENY : Event.Result.DEFAULT);
+			((PlayerInteractEvent) event).setUseInteractedBlock(cancel ? Event.Result.DENY : Event.Result.DEFAULT);
+		} else if (event instanceof BlockCanBuildEvent) {
+			((BlockCanBuildEvent) event).setBuildable(!cancel);
+		} else if (event instanceof PlayerDropItemEvent) {
+			PlayerUtils.updateInventory(((PlayerDropItemEvent) event).getPlayer());
+		} else if (event instanceof InventoryInteractEvent) {
+			PlayerUtils.updateInventory(((Player) ((InventoryInteractEvent) event).getWhoClicked()));
 		}
 	}
 	
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
+	public String toString(@Nullable Event event, boolean debug) {
 		return (cancel ? "" : "un") + "cancel event";
 	}
 	
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffCancelEventTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffCancelEventTest.java
new file mode 100644
index 00000000000..9b9320570c3
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffCancelEventTest.java
@@ -0,0 +1,17 @@
+package org.skriptlang.skript.test.tests.syntaxes.effects;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.junit.Test;
+
+public class EffCancelEventTest extends SkriptJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	@Test
+	public void test() {
+		spawnTestPig();
+	}
+
+}
diff --git a/src/test/skript/junit/EffCancelEvent.sk b/src/test/skript/junit/EffCancelEvent.sk
new file mode 100644
index 00000000000..db6e4c9edb5
--- /dev/null
+++ b/src/test/skript/junit/EffCancelEvent.sk
@@ -0,0 +1,21 @@
+test "EffCancelEventJUnit" when running JUnit:
+	set {_tests::1} to "event not cancelled by default"
+	set {_tests::2} to "cancel event"
+	set {_tests::3} to "uncancel event"
+
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.effects.EffCancelEventTest" completes {_tests::*}
+
+on spawn of pig:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.effects.EffCancelEventTest"
+	junit test is {_test}
+
+	if event is not cancelled:
+		complete objective "event not cancelled by default" for {_test}
+
+	cancel event
+	if event is cancelled:
+		complete objective "cancel event" for {_test}
+
+	uncancel event
+	if event is not cancelled:
+		complete objective "uncancel event" for {_test}
diff --git a/src/test/skript/tests/regressions/7054-update event cancelling.sk b/src/test/skript/tests/regressions/7054-update event cancelling.sk
new file mode 100644
index 00000000000..8a371308d8d
--- /dev/null
+++ b/src/test/skript/tests/regressions/7054-update event cancelling.sk	
@@ -0,0 +1,26 @@
+parse:
+	results: {PlayerLogin::parse::*}
+	code:
+		on connect:
+			cancel event
+
+parse:
+	results: {PlayerQuit::parse::*}
+	code:
+		on quit:
+			cancel event
+
+parse:
+	results: {SwimToggle::parse::*}
+	code:
+		on swim toggle:
+			cancel event
+
+test "cancelling swim toggle":
+	assert {SwimToggle::parse::*} contains "Cancelling a toggle swim event has no effect" with "cancelling swim toggle doesn't error"
+
+test "cancelling player login":
+	assert {PlayerLogin::parse::*} contains "A connect event cannot be cancelled, but the player may be kicked ('kick player by reason of ""...""')" with "cancelling player login doesn't error"
+
+test "cancelling regular event":
+	assert {PlayerQuit::parse::*} contains "An on quit event cannot be cancelled" with "cancelling regular event doesn't error"

From cd652078059ca1e0509971e9102b1dd31be956fe Mon Sep 17 00:00:00 2001
From: XPYEX <50171612+0XPYEX0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 06:29:40 +0800
Subject: [PATCH 17/18] Remove redundant material namespace check (#7121)

---
 src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java b/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
index 5a2912039fb..f47a3f5d8d7 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
@@ -70,11 +70,7 @@ public class BukkitUnsafe {
 
 	@Nullable
 	public static Material getMaterialFromMinecraftId(String id) {
-		// On 1.13, Vanilla and Spigot names are same
-		if (id.length() > 9)
-			return Material.matchMaterial(id.substring(10)); // Strip 'minecraft:' out
-		else // Malformed material name
-			return null;
+		return Material.matchMaterial(id);
 	}
 
 	public static void modifyItemStack(ItemStack stack, String arguments) {

From ba32d7ad48edb8e33d5f5d2e44d03bba94ffb2de Mon Sep 17 00:00:00 2001
From: APickledWalrus <apickledwalrus@gmail.com>
Date: Tue, 1 Oct 2024 18:40:08 -0400
Subject: [PATCH 18/18] Prepare For Release (2.9.3)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a620b360bd5..8fa041e0878 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.9.2
+version=2.9.3
 jarName=Skript.jar
 testEnv=java21/paper-1.21.0
 testEnvJavaVersion=21