Fix getArray mistake in CondIsTagged, add runtime error for bad namespace keys in ExprTag (#7474)

Author: sovdeeth

src/main/java/org/skriptlang/skript/bukkit/tags/elements/CondIsTagged.java

@@ -53,7 +53,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 
 	@Override
 	public boolean check(Event event) {
-		Tag<Keyed>[] tags = this.tags.getArray(event);
+		Tag<Keyed>[] tags = this.tags.getAll(event);
 		if (tags.length == 0)
 			return isNegated();
 		boolean and = this.tags.getAnd();

src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTag.java

@@ -1,6 +1,7 @@
 package org.skriptlang.skript.bukkit.tags.elements;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.config.Node;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Keywords;
@@ -22,6 +23,7 @@
 import org.skriptlang.skript.bukkit.tags.TagModule;
 import org.skriptlang.skript.bukkit.tags.TagType;
 import org.skriptlang.skript.bukkit.tags.sources.TagOrigin;
+import org.skriptlang.skript.log.runtime.SyntaxRuntimeErrorProducer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,7 +53,7 @@
 @Since("2.10")
 @RequiredPlugins("Paper (paper tags)")
 @Keywords({"blocks", "minecraft tag", "type", "category"})
-public class ExprTag extends SimpleExpression<Tag> {
+public class ExprTag extends SimpleExpression<Tag> implements SyntaxRuntimeErrorProducer {
 
 	static {
 		Skript.registerExpression(ExprTag.class, Tag.class, ExpressionType.COMBINED,
@@ -63,13 +65,16 @@ public class ExprTag extends SimpleExpression<Tag> {
 	private TagOrigin origin;
 	private boolean datapackOnly;
 
+	private Node node;
+
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		//noinspection unchecked
 		names = (Expression<String>) expressions[0];
 		types = TagType.fromParseMark(parseResult.mark);
 		origin = TagOrigin.fromParseTags(parseResult.tags);
 		datapackOnly = origin == TagOrigin.BUKKIT && parseResult.hasTag("datapack");
+		node = getParser().getNode();
 		return true;
 	}
 
@@ -87,14 +92,20 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 		nextName: for (String name : names) {
 			// get key
 			NamespacedKey key;
-			if (name.contains(":")) {
-				key = NamespacedKey.fromString(name);
-			} else {
-				// populate namespace if not provided
-				key = new NamespacedKey(namespace, name);
+			try {
+				if (name.contains(":")) {
+					key = NamespacedKey.fromString(name);
+				} else {
+					// populate namespace if not provided
+					key = new NamespacedKey(namespace, name);
+				}
+			} catch (IllegalArgumentException e) {
+				key = null;
 			}
-			if (key == null)
+			if (key == null) {
+				error("Invalid tag key: '" + name + "'. Tags may only contain a-z, 0-9, _, ., /, or - characters.");
 				continue;
+			}
 
 			Tag<?> tag;
 			for (TagType<?> type : types) {
@@ -122,6 +133,11 @@ public Class<? extends Tag> getReturnType() {
 		return Tag.class;
 	}
 
+	@Override
+	public Node getNode() {
+		return node;
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		String registry = types.length > 1 ? "" : " " + types[0].toString();

src/test/skript/tests/regressions/7471-is tagged or list.sk

@@ -0,0 +1,6 @@
+test "is tagged or list":
+	register a custom item tag named "or_list_tag_1" using oak log
+	register a custom item tag named "or_list_tag_2" using spruce log
+
+	loop 10 times:
+		assert oak log is tagged as custom tag "or_list_tag_1" or custom tag "or_list_tag_2"