diff --git a/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java b/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java index cbbf8cf83d9..b4d4f39ea62 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java +++ b/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java @@ -24,34 +24,23 @@ "remove {_pattern} from banner patterns of {_banneritem}", "set the 1st banner pattern of block at location(0,0,0) to {_pattern}", "clear the 1st banner pattern of block at location(0,0,0)", - "", - "set {_pattern} to a red mojang banner pattern" }) @Since("2.10") public class ExprNewBannerPattern extends SimpleExpression { static { - Skript.registerExpression(ExprNewBannerPattern.class, Pattern.class, ExpressionType.PATTERN_MATCHES_EVERYTHING, - "[a] %bannerpatterntype% colo[u]red %color%", - "[a] %*color% %bannerpatterntype%"); + Skript.registerExpression(ExprNewBannerPattern.class, Pattern.class, ExpressionType.COMBINED, + "[a] %bannerpatterntype% colo[u]red %color%"); } private Expression selectedPattern; private Expression selectedColor; @Override + @SuppressWarnings("unchecked") public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { - if (matchedPattern == 0) { - //noinspection unchecked - selectedPattern = (Expression) exprs[0]; - //noinspection unchecked - selectedColor = (Expression) exprs[1]; - } else { - //noinspection unchecked - selectedPattern = (Expression) exprs[1]; - //noinspection unchecked - selectedColor = (Expression) exprs[0]; - } + selectedPattern = (Expression) exprs[0]; + selectedColor = (Expression) exprs[1]; return true; }