|
24 | 24 | "remove {_pattern} from banner patterns of {_banneritem}",
|
25 | 25 | "set the 1st banner pattern of block at location(0,0,0) to {_pattern}",
|
26 | 26 | "clear the 1st banner pattern of block at location(0,0,0)",
|
27 |
| - "", |
28 |
| - "set {_pattern} to a red mojang banner pattern" |
29 | 27 | })
|
30 | 28 | @Since("2.10")
|
31 | 29 | public class ExprNewBannerPattern extends SimpleExpression<Pattern> {
|
32 | 30 |
|
33 | 31 | static {
|
34 |
| - Skript.registerExpression(ExprNewBannerPattern.class, Pattern.class, ExpressionType.PATTERN_MATCHES_EVERYTHING, |
35 |
| - "[a] %bannerpatterntype% colo[u]red %color%", |
36 |
| - "[a] %*color% %bannerpatterntype%"); |
| 32 | + Skript.registerExpression(ExprNewBannerPattern.class, Pattern.class, ExpressionType.COMBINED, |
| 33 | + "[a] %bannerpatterntype% colo[u]red %color%"); |
37 | 34 | }
|
38 | 35 |
|
39 | 36 | private Expression<PatternType> selectedPattern;
|
40 | 37 | private Expression<Color> selectedColor;
|
41 | 38 |
|
42 | 39 | @Override
|
| 40 | + @SuppressWarnings("unchecked") |
43 | 41 | public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
|
44 |
| - if (matchedPattern == 0) { |
45 |
| - //noinspection unchecked |
46 |
| - selectedPattern = (Expression<PatternType>) exprs[0]; |
47 |
| - //noinspection unchecked |
48 |
| - selectedColor = (Expression<Color>) exprs[1]; |
49 |
| - } else { |
50 |
| - //noinspection unchecked |
51 |
| - selectedPattern = (Expression<PatternType>) exprs[1]; |
52 |
| - //noinspection unchecked |
53 |
| - selectedColor = (Expression<Color>) exprs[0]; |
54 |
| - } |
| 42 | + selectedPattern = (Expression<PatternType>) exprs[0]; |
| 43 | + selectedColor = (Expression<Color>) exprs[1]; |
55 | 44 | return true;
|
56 | 45 | }
|
57 | 46 |
|
|
0 commit comments