don't simplify lists into single literals

Author: sovdeeth

src/main/java/ch/njol/skript/lang/ExpressionList.java

@@ -3,7 +3,6 @@
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.conditions.CondCompare;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.util.SimpleLiteral;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
@@ -299,21 +298,13 @@ public List<Expression<? extends T>> getAllExpressions() {
 	@SuppressWarnings("unchecked")
 	public Expression<T> simplify() {
 		boolean isLiteralList = true;
-		boolean isSimpleList = true;
 		for (int i = 0; i < expressions.length; i++) {
 			expressions[i] = expressions[i].simplify();
 			isLiteralList &= expressions[i] instanceof Literal;
-			isSimpleList &= expressions[i].isSingle();
-		}
-		if (isLiteralList && isSimpleList) {
-			T[] values = (T[]) Array.newInstance(returnType, expressions.length);
-			for (int i = 0; i < values.length; i++)
-				values[i] = ((Literal<? extends T>) expressions[i]).getSingle();
-			return new SimpleLiteral<>(values, returnType, and, this);
 		}
 		if (isLiteralList) {
 			Literal<? extends T>[] ls = Arrays.copyOf(expressions, expressions.length, Literal[].class);
-			return new LiteralList<>(ls, returnType, and, this);
+			return new LiteralList<>(ls, returnType, and);
 		}
 		return this;
 	}

src/main/java/ch/njol/skript/lang/LiteralList.java

@@ -1,11 +1,8 @@
 package ch.njol.skript.lang;
 
-import ch.njol.skript.lang.util.SimpleLiteral;
 import ch.njol.skript.registrations.Classes;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Array;
-
 /**
  * A list of literals. Can contain {@link UnparsedLiteral}s.
  *
@@ -21,11 +18,11 @@ public LiteralList(Literal<? extends T>[] literals, Class<T> returnType, Class<?
 		super(literals, returnType, possibleReturnTypes, and);
 	}
 
-	public LiteralList(Literal<? extends T>[] literals, Class<T> returnType, boolean and, ExpressionList<?> source) {
+	public LiteralList(Literal<? extends T>[] literals, Class<T> returnType, boolean and, LiteralList<?> source) {
 		super(literals, returnType, and, source);
 	}
 
-	public LiteralList(Literal<? extends T>[] literals, Class<T> returnType, Class<?>[] possibleReturnTypes, boolean and, ExpressionList<?> source) {
+	public LiteralList(Literal<? extends T>[] literals, Class<T> returnType, Class<?>[] possibleReturnTypes, boolean and, LiteralList<?> source) {
 		super(literals, returnType, possibleReturnTypes, and, source);
 	}
 
@@ -63,17 +60,7 @@ public Literal<? extends T>[] getExpressions() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public Expression<T> simplify() {
-		boolean isSimpleList = true;
-		for (Expression<? extends T> expression : expressions)
-			isSimpleList &= expression.isSingle();
-		if (isSimpleList) {
-			T[] values = (T[]) Array.newInstance(getReturnType(), expressions.length);
-			for (int i = 0; i < values.length; i++)
-				values[i] = ((Literal<? extends T>) expressions[i]).getSingle();
-			return new SimpleLiteral<>(values, getReturnType(), and, this);
-		}
 		return this;
 	}