🛠 Fix Duplicated Spaces in StructCommand (SkriptLang#5416)

AyhamAl-Ali · Aug 21, 2023 · 3fa5cef · 3fa5cef
1 parent d6cabe1
commit 3fa5cef
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/ch/njol/skript/structures/StructCommand.java b/src/main/java/ch/njol/skript/structures/StructCommand.java
@@ -82,10 +82,9 @@ public class StructCommand extends Structure {
 
 	public static final Priority PRIORITY = new Priority(500);
 
-	private static final Pattern
-		COMMAND_PATTERN = Pattern.compile("(?i)^command /?(\\S+)\\s*(\\s+(.+))?$"),
-		ARGUMENT_PATTERN = Pattern.compile("<\\s*(?:([^>]+?)\\s*:\\s*)?(.+?)\\s*(?:=\\s*(" + SkriptParser.wildcard + "))?\\s*>"),
-		DESCRIPTION_PATTERN = Pattern.compile("(?<!\\\\)%-?(.+?)%");
+	private static final Pattern COMMAND_PATTERN = Pattern.compile("(?i)^command\\s+/?(\\S+)\\s*(\\s+(.+))?$");
+	private static final Pattern ARGUMENT_PATTERN = Pattern.compile("<\\s*(?:([^>]+?)\\s*:\\s*)?(.+?)\\s*(?:=\\s*(" + SkriptParser.wildcard + "))?\\s*>");
+	private static final Pattern DESCRIPTION_PATTERN = Pattern.compile("(?<!\\\\)%-?(.+?)%");
 
 	private static final AtomicBoolean SYNC_COMMANDS = new AtomicBoolean();
 
@@ -184,7 +183,10 @@ public boolean load() {
 
 		Matcher matcher = COMMAND_PATTERN.matcher(fullCommand);
 		boolean matches = matcher.matches();
-		assert matches;
+		if (!matches) {
+			Skript.error("Invalid command structure pattern");
+			return false;
+		}
 
 		String command = matcher.group(1).toLowerCase();
 		ScriptCommand existingCommand = Commands.getScriptCommand(command);