From b5b9ea2af7a1fc058bd30d28caa445850147a091 Mon Sep 17 00:00:00 2001
From: TheLimeGlass <seantgrover@gmail.com>
Date: Sun, 10 Aug 2025 11:54:04 -0600
Subject: [PATCH 1/2] Allow Direction.combine to be nullable

---
 src/main/java/ch/njol/skript/util/Direction.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/njol/skript/util/Direction.java b/src/main/java/ch/njol/skript/util/Direction.java
index 6a4bbfb8406..388fe3b60ab 100644
--- a/src/main/java/ch/njol/skript/util/Direction.java
+++ b/src/main/java/ch/njol/skript/util/Direction.java
@@ -357,8 +357,15 @@ public static Direction deserialize(final String s) {
 			}
 		}
 	}
-	
-	public static Expression<Location> combine(final Expression<? extends Direction> dirs, final Expression<? extends Location> locs) {
+
+	/*
+	 * Combines direction and location expressions.
+	 * Useful for syntaxes to allow Skripters to have more control over their locations.
+	 */
+	public static @Nullable Expression<Location> combine(final Expression<? extends Direction> dirs, final Expression<? extends Location> locs) {
+		if (dirs == null || locs == null)
+			return null;
+
 		return new SimpleExpression<Location>() {
 			@SuppressWarnings("null")
 			@Override

From ce1f5be63a9a47cfa56398ae8a90812e5f4f2d6b Mon Sep 17 00:00:00 2001
From: TheLimeGlass <seantgrover@gmail.com>
Date: Mon, 11 Aug 2025 08:00:46 -0600
Subject: [PATCH 2/2] requested changes

---
 src/main/java/ch/njol/skript/util/Direction.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/njol/skript/util/Direction.java b/src/main/java/ch/njol/skript/util/Direction.java
index 388fe3b60ab..f2b09d9267a 100644
--- a/src/main/java/ch/njol/skript/util/Direction.java
+++ b/src/main/java/ch/njol/skript/util/Direction.java
@@ -361,8 +361,11 @@ public static Direction deserialize(final String s) {
 	/*
 	 * Combines direction and location expressions.
 	 * Useful for syntaxes to allow Skripters to have more control over their locations.
+	 * @param dirs The direction expressions to combine.
+	 * @param locs The location expressions to combine.
+	 * @return A combined expression or null if any of the inputs are null.
 	 */
-	public static @Nullable Expression<Location> combine(final Expression<? extends Direction> dirs, final Expression<? extends Location> locs) {
+	public static @Nullable Expression<Location> combine(@Nullable Expression<? extends Direction> dirs, @Nullable Expression<? extends Location> locs) {
 		if (dirs == null || locs == null)
 			return null;