Skip to content

Commit 1c99504

Browse files
authored
Allowed Sub Types in EntryDataExpression (#8132)
Replace usages of generic parameter T with ? extends T in ExpressionEntryData
1 parent 6cf49b3 commit 1c99504

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/main/java/org/skriptlang/skript/lang/entry/util/ExpressionEntryData.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public class ExpressionEntryData<T> extends KeyValueEntryData<Expression<? exten
1818

1919
private static final Message M_IS = new Message("is");
2020

21-
private final Class<T>[] returnTypes;
21+
private final Class<? extends T>[] returnTypes;
2222

2323
private final int flags;
2424

2525
/**
2626
* @param returnType The expected return type of the matched expression.
2727
*/
2828
public ExpressionEntryData(
29-
String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T> returnType
29+
String key, @Nullable Expression<? extends T> defaultValue, boolean optional, Class<? extends T> returnType
3030
) {
3131
this(key, defaultValue, optional, SkriptParser.ALL_FLAGS, returnType);
3232
}
@@ -37,7 +37,7 @@ public ExpressionEntryData(
3737
* javadoc for more details.
3838
*/
3939
public ExpressionEntryData(
40-
String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T> returnType, int flags
40+
String key, @Nullable Expression<? extends T> defaultValue, boolean optional, Class<? extends T> returnType, int flags
4141
) {
4242
this(key, defaultValue, optional, flags, returnType);
4343
}
@@ -47,7 +47,7 @@ public ExpressionEntryData(
4747
*/
4848
@SafeVarargs
4949
public ExpressionEntryData(
50-
String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T>... returnTypes
50+
String key, @Nullable Expression<? extends T> defaultValue, boolean optional, Class<? extends T>... returnTypes
5151
) {
5252
this(key, defaultValue, optional, SkriptParser.ALL_FLAGS, returnTypes);
5353
}
@@ -59,7 +59,7 @@ public ExpressionEntryData(
5959
*/
6060
@SafeVarargs
6161
public ExpressionEntryData(
62-
String key, @Nullable Expression<T> defaultValue, boolean optional, int flags, Class<T>... returnTypes
62+
String key, @Nullable Expression<? extends T> defaultValue, boolean optional, int flags, Class<? extends T>... returnTypes
6363
) {
6464
super(key, defaultValue, optional);
6565
this.returnTypes = returnTypes;
@@ -68,7 +68,6 @@ public ExpressionEntryData(
6868

6969
@Override
7070
@Nullable
71-
@SuppressWarnings("unchecked")
7271
protected Expression<? extends T> getValue(String value) {
7372
Expression<? extends T> expression;
7473
try (ParseLogHandler log = new ParseLogHandler().start()) {

0 commit comments

Comments
 (0)