From 76eae1dcdc1790cd13793ad2d7b6be5a94eb1f0b Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Tue, 28 Jan 2025 23:33:24 -0500
Subject: [PATCH 1/2] remove no keyword pattern

---
 .../java/ch/njol/skript/expressions/ExprNewBannerPattern.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java b/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java
index cbbf8cf83d9..3446534f1e1 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java
@@ -32,8 +32,7 @@ public class ExprNewBannerPattern extends SimpleExpression<Pattern> {
 
 	static {
 		Skript.registerExpression(ExprNewBannerPattern.class, Pattern.class, ExpressionType.PATTERN_MATCHES_EVERYTHING,
-			"[a] %bannerpatterntype% colo[u]red %color%",
-			"[a] %*color% %bannerpatterntype%");
+			"[a] %bannerpatterntype% colo[u]red %color%");
 	}
 
 	private Expression<PatternType> selectedPattern;

From d18fc59113c7861c783b28990812e7e5f2787e97 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Tue, 28 Jan 2025 23:43:13 -0500
Subject: [PATCH 2/2] Strip logic

It was decided not to attempt to reimplement the pattern as no safe and reasonable pattern was found.
---
 .../expressions/ExprNewBannerPattern.java      | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java b/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java
index 3446534f1e1..b4d4f39ea62 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java
@@ -24,14 +24,12 @@
 	"remove {_pattern} from banner patterns of {_banneritem}",
 	"set the 1st banner pattern of block at location(0,0,0) to {_pattern}",
 	"clear the 1st banner pattern of block at location(0,0,0)",
-	"",
-	"set {_pattern} to a red mojang banner pattern"
 })
 @Since("2.10")
 public class ExprNewBannerPattern extends SimpleExpression<Pattern> {
 
 	static {
-		Skript.registerExpression(ExprNewBannerPattern.class, Pattern.class, ExpressionType.PATTERN_MATCHES_EVERYTHING,
+		Skript.registerExpression(ExprNewBannerPattern.class, Pattern.class, ExpressionType.COMBINED,
 			"[a] %bannerpatterntype% colo[u]red %color%");
 	}
 
@@ -39,18 +37,10 @@ public class ExprNewBannerPattern extends SimpleExpression<Pattern> {
 	private Expression<Color> selectedColor;
 
 	@Override
+	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		if (matchedPattern == 0) {
-			//noinspection unchecked
-			selectedPattern = (Expression<PatternType>) exprs[0];
-			//noinspection unchecked
-			selectedColor = (Expression<Color>) exprs[1];
-		} else {
-			//noinspection unchecked
-			selectedPattern = (Expression<PatternType>) exprs[1];
-			//noinspection unchecked
-			selectedColor = (Expression<Color>) exprs[0];
-		}
+		selectedPattern = (Expression<PatternType>) exprs[0];
+		selectedColor = (Expression<Color>) exprs[1];
 		return true;
 	}