Upstream/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI.git synced 2024-12-28 11:59:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix possible NPE for findExpansionsOnDisk

Browse Source
This commit is contained in:
Andre601 2021-12-01 19:09:02 +01:00
parent e969f37405
commit 3ba29f1147
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java
View File

@ -370,7 +370,12 @@ public final class LocalExpansionManager implements Listener {
@NotNull @NotNull
public CompletableFuture<@NotNull List<@Nullable Class<? extends PlaceholderExpansion>>> findExpansionsOnDisk() { public CompletableFuture<@NotNull List<@Nullable Class<? extends PlaceholderExpansion>>> findExpansionsOnDisk() {
return Arrays.stream(folder.listFiles((dir, name) -> name.endsWith(".jar"))) File[] files = folder.listFiles((dir, name) -> name.endsWith(".jar"));
if(files == null){
return CompletableFuture.supplyAsync(Collections::emptyList);
}
return Arrays.stream(files)
.map(this::findExpansionInFile) .map(this::findExpansionInFile)
.collect(Futures.collector()); .collect(Futures.collector());
} }