Properly check for UnparsedLiterals in Shuffle and Sort expressions

SkriptLang · Jul 11, 2018 · e521140 · e521140
1 parent cba6552
commit e521140
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/ch/njol/skript/expressions/ExprShuffledList.java b/src/main/java/ch/njol/skript/expressions/ExprShuffledList.java
@@ -37,7 +37,7 @@
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.util.LiteralUtils;
 import ch.njol.util.Kleenean;
 
 @Name("Shuffled List")
@@ -56,8 +56,8 @@ public class ExprShuffledList extends SimpleExpression<Object> {
 	@SuppressWarnings({"null", "unchecked"})
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		list = (Expression<Object>) exprs[0];
-		return true;
+		list = LiteralUtils.defendExpression(exprs[0]);
+		return LiteralUtils.canInitSafely(list);
 	}
 
 	@Override

diff --git a/src/main/java/ch/njol/skript/expressions/ExprSortedList.java b/src/main/java/ch/njol/skript/expressions/ExprSortedList.java
@@ -34,6 +34,7 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.util.LiteralUtils;
 import ch.njol.util.Kleenean;
 
 @Name("Sorted List")
@@ -57,8 +58,8 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 			Skript.error("List of type " + Classes.toString(type) + " does not support sorting.");
 			return false;
 		}
-		list = (Expression<Object>) exprs[0];
-		return true;
+		list = LiteralUtils.defendExpression(exprs[0]);
+		return LiteralUtils.canInitSafely(list);
 	}
 
 	@Override