ExpressionList specificity

Author: Absolutionism

src/main/java/ch/njol/skript/expressions/ExprExcept.java

@@ -1,8 +1,12 @@
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.doc.*;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Example;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionList;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.SyntaxStringBuilder;
@@ -14,6 +18,8 @@
 import org.skriptlang.skript.lang.comparator.Comparators;
 import org.skriptlang.skript.lang.comparator.Relation;
 
+import java.util.Iterator;
+
 @Name("Except")
 @Description("Filter a list by providing objects to be excluded.")
 @Example("""
@@ -29,18 +35,22 @@ public class ExprExcept extends SimpleExpression<Object> {
 
 	static {
 		Skript.registerExpression(ExprExcept.class, Object.class, ExpressionType.COMBINED,
-				"%~objects% (except|excluding|not including) %objects%");
+				"%objects% (except|excluding|not including) %objects%");
 	}
 
 	private Expression<?> source;
 	private Expression<?> exclude;
+	private boolean isOrList = false;
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		source = LiteralUtils.defendExpression(exprs[0]);
 		if (source.isSingle()) {
-			Skript.error("Must provide a list containing more than one object to exclude objects from.");
-			return false;
+			if (!(source instanceof ExpressionList<?>)) {
+				Skript.error("Must provide a list containing more than one object to exclude objects from.");
+				return false;
+			}
+			isOrList = true;
 		}
 		exclude = LiteralUtils.defendExpression(exprs[1]);
 		return LiteralUtils.canInitSafely(source, exclude);
@@ -50,7 +60,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	protected Object @Nullable [] get(Event event) {
 		Object[] exclude = this.exclude.getArray(event);
 		if (exclude == null || exclude.length == 0)
-			return source.getArray(event);
+			return isOrList ? source.getArray(event) : source.getAll(event);
 
 		return source.streamAll(event)
 			.filter(sourceObject -> {
@@ -62,9 +72,24 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 			.toArray();
 	}
 
+	@Override
+	public @Nullable Iterator<?> iterator(Event event) {
+		Object[] exclude = this.exclude.getArray(event);
+		if (exclude == null || exclude.length == 0)
+			return source.iterator(event);
+
+		return source.streamAll(event)
+			.filter(sourceObject -> {
+				for (Object excludeObject : exclude)
+					if (sourceObject.equals(excludeObject) || Comparators.compare(sourceObject, excludeObject) == Relation.EQUAL)
+						return false;
+				return true;
+			}).iterator();
+	}
+
 	@Override
 	public boolean isSingle() {
-		return false;
+		return isOrList;
 	}
 
 	@Override

src/test/skript/tests/syntaxes/expressions/ExprExcept.sk

@@ -35,3 +35,9 @@ test "except entities":
 	assert size of all entities not including {_exclude::*} is 12 with "Failed to exclude list (zombie, skeleton, villager)"
 
 	clear all entities
+
+test "except 'or' objects":
+	assert (1 or 2) except 2 is 1 with "Failed to exclude '2' from an 'or' list"
+
+	set {_item} to (a diamond or an iron ingot or an emerald) excluding a diamond
+	assert {_item} is (an iron ingot or an emerald) with "Failed to exclude 'diamond' from an 'or' item list"