@@ -20,8 +20,8 @@ public class CondChange extends Condition {
20
20
private static final Patterns <ChangeMode > PATTERNS = new Patterns <>(new Object [][] {
21
21
{"%classinfo% can be added to %expressions%" , ChangeMode .ADD },
22
22
{"%classinfo% (can't|cannot) be added to %expressions%" , ChangeMode .ADD },
23
- {"%expressions% can be set to %* classinfo%" , ChangeMode .SET },
24
- {"%expressions% (can't|cannot) be set to %* classinfo%" , ChangeMode .SET },
23
+ {"%expressions% can be set to %classinfo%" , ChangeMode .SET },
24
+ {"%expressions% (can't|cannot) be set to %classinfo%" , ChangeMode .SET },
25
25
{"%classinfo% can be removed from %expressions%" , ChangeMode .REMOVE },
26
26
{"%classinfo% (can't|cannot) be removed from %expressions%" , ChangeMode .REMOVE },
27
27
{"all %classinfo% can be removed from %expressions%" , ChangeMode .REMOVE_ALL },
@@ -37,7 +37,7 @@ public class CondChange extends Condition {
37
37
}
38
38
39
39
private ChangeMode desiredChangeMode ;
40
- private boolean typeIsPlural ;
40
+ private boolean desiredTypeIsPlural ;
41
41
private Expression <ClassInfo <?>> desiredType ;
42
42
private Expression <Expression <?>> expressions ;
43
43
private String rawForm ;
@@ -65,15 +65,15 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
65
65
case DELETE :
66
66
expressions = (Expression <Expression <?>>) exprs [0 ];
67
67
}
68
- if (desiredType instanceof UnparsedLiteral ) {
69
- wasUnparsed = true ;
70
- UnparsedLiteral unparsedDesiredType = (UnparsedLiteral ) desiredType ;
71
- desiredType = unparsedDesiredType .getConvertedExpression (ClassInfo .class );
72
- if (desiredType == null )
73
- return false ;
74
- typeIsPlural = Utils .getEnglishPlural (unparsedDesiredType .getData ()).getSecond ();
68
+ if (desiredType != null ) {
69
+ Expression <?> desiredTypeSource = desiredType .getSource ();
70
+ if (desiredTypeSource instanceof UnparsedLiteral ) {
71
+ wasUnparsed = true ;
72
+ UnparsedLiteral unparsedDesiredType = (UnparsedLiteral ) desiredTypeSource ;
73
+ desiredTypeIsPlural = Utils .getEnglishPlural (unparsedDesiredType .getData ()).getSecond ();
74
+ }
75
+ this .desiredType = (Expression <ClassInfo <?>>) desiredType ;
75
76
}
76
- this .desiredType = (Expression <ClassInfo <?>>) desiredType ;
77
77
return true ;
78
78
}
79
79
@@ -88,10 +88,10 @@ public boolean check(Event event) {
88
88
Bukkit .getConsoleSender ().sendMessage (toString (event , true ));
89
89
Bukkit .getConsoleSender ().sendMessage ("- raw: " + rawForm );
90
90
Bukkit .getConsoleSender ().sendMessage ("- was unparsed: " + wasUnparsed );
91
- Bukkit .getConsoleSender ().sendMessage ("- plural: " + typeIsPlural );
91
+ Bukkit .getConsoleSender ().sendMessage ("- plural: " + desiredTypeIsPlural );
92
92
Bukkit .getConsoleSender ().sendMessage ("- change mode: " + desiredChangeMode .name ());
93
93
Bukkit .getConsoleSender ().sendMessage ("- desired type: " + desiredType .getC ().getCanonicalName ());
94
- return expressions .check (event , expression -> acceptsChange (expression , desiredChangeMode , desiredType .getC (), typeIsPlural ), isNegated ());
94
+ return expressions .check (event , expression -> acceptsChange (expression , desiredChangeMode , desiredType .getC (), desiredTypeIsPlural ), isNegated ());
95
95
}
96
96
97
97
@ Override
0 commit comments