Upstream
/
PlaceholderAPI
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 545f7f0bbd into 68f467ab29

This commit is contained in:
wxip 2024-04-30 10:36:13 -05:00 committed by GitHub
parent 68f467ab29 545f7f0bbd
commit ad0cfbab4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,7 @@ import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -352,6 +353,9 @@ public final class LocalExpansionManager implements Listener {
private void registerAll(@NotNull final CommandSender sender) {
Msg.info("Placeholder expansion registration initializing...");
new BukkitRunnable() {
@Override
public void run() {
Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
if (exception != null) {
Msg.severe("Failed to load class files of expansion.", exception);
@ -360,7 +364,7 @@ public final class LocalExpansionManager implements Listener {
final List<PlaceholderExpansion> registered = classes.stream()
.filter(Objects::nonNull)
.map(this::register)
.map(LocalExpansionManager.this::register)
.filter(Optional::isPresent)
.map(Optional::get)
.collect(Collectors.toList());
@ -390,6 +394,8 @@ public final class LocalExpansionManager implements Listener {
Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
});
}
}.runTaskLater(plugin, 1L);
}
private void unregisterAll() {
for (final PlaceholderExpansion expansion : Sets.newHashSet(expansions.values())) {