diff --git a/src/main/java/ch/njol/skript/expressions/ExprShuffledList.java b/src/main/java/ch/njol/skript/expressions/ExprShuffledList.java index 9cb50ece3ad..0ed028ff715 100644 --- 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 { @SuppressWarnings({"null", "unchecked"}) @Override public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { - list = (Expression) 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 index 728b39fadf8..ce2dd81bc70 100644 --- 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) exprs[0]; - return true; + list = LiteralUtils.defendExpression(exprs[0]); + return LiteralUtils.canInitSafely(list); } @Override