Skip to content

Allowed Sub Types in EntryDataExpression #8132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2025
Merged

Allowed Sub Types in EntryDataExpression #8132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
502e67d
Replace usages of generic parameter T with ? extends T in ExpressionE…
JakeGBLP Aug 16, 2025
ae1c260
Merge branch 'dev/patch' into entrydatagenericsfix
sovdeeth Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/main/java/org/skriptlang/skript/lang/entry/util/ExpressionEntryData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public class ExpressionEntryData<T> extends KeyValueEntryData<Expression<? exten

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

private final Class<T>[] returnTypes;
private final Class<? extends T>[] returnTypes;

private final int flags;

/**
* @param returnType The expected return type of the matched expression.
*/
public ExpressionEntryData(
String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T> returnType
String key, @Nullable Expression<? extends T> defaultValue, boolean optional, Class<? extends T> returnType
) {
this(key, defaultValue, optional, SkriptParser.ALL_FLAGS, returnType);
}
Expand All @@ -37,7 +37,7 @@ public ExpressionEntryData(
* javadoc for more details.
*/
public ExpressionEntryData(
String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T> returnType, int flags
String key, @Nullable Expression<? extends T> defaultValue, boolean optional, Class<? extends T> returnType, int flags
) {
this(key, defaultValue, optional, flags, returnType);
}
Expand All @@ -47,7 +47,7 @@ public ExpressionEntryData(
*/
@SafeVarargs
public ExpressionEntryData(
String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T>... returnTypes
String key, @Nullable Expression<? extends T> defaultValue, boolean optional, Class<? extends T>... returnTypes
) {
this(key, defaultValue, optional, SkriptParser.ALL_FLAGS, returnTypes);
}
Expand All @@ -59,7 +59,7 @@ public ExpressionEntryData(
*/
@SafeVarargs
public ExpressionEntryData(
String key, @Nullable Expression<T> defaultValue, boolean optional, int flags, Class<T>... returnTypes
String key, @Nullable Expression<? extends T> defaultValue, boolean optional, int flags, Class<? extends T>... returnTypes
) {
super(key, defaultValue, optional);
this.returnTypes = returnTypes;
Expand All @@ -68,7 +68,6 @@ public ExpressionEntryData(

@Override
@Nullable
@SuppressWarnings("unchecked")
protected Expression<? extends T> getValue(String value) {
Expression<? extends T> expression;
try (ParseLogHandler log = new ParseLogHandler().start()) {
Expand Down