Skip to content

Commit bf84d72

Browse files
Add missing ConvertedKeyProviderExpression safety check
1 parent f05c5a3 commit bf84d72

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/main/java/ch/njol/skript/lang/util/ConvertedKeyProviderExpression.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,17 @@ public ConvertedKeyProviderExpression(KeyProviderExpression<? extends F> source,
3838

3939
@Override
4040
public T[] getArray(Event event) {
41+
if (!canReturnKeys()) {
42+
return super.getArray(event);
43+
}
4144
return get(getSource().getArray(event), getSource().getArrayKeys(event), keys -> arrayKeysCache.put(event, keys));
4245
}
4346

4447
@Override
4548
public T[] getAll(Event event) {
49+
if (!canReturnKeys()) {
50+
return super.getAll(event);
51+
}
4652
return get(getSource().getAll(event), getSource().getAllKeys(event), keys -> allKeysCache.put(event, keys));
4753
}
4854

0 commit comments

Comments
 (0)