mirror of
https://github.com/PlaceholderAPI/PlaceholderAPI
synced 2024-10-31 19:44:03 +01:00
Merge 545f7f0bbdf1e2179d194f831b09ee0a07562f47 into 604fed36a44cc71bd2334b2401fba4bb4d49dce8
This commit is contained in:
commit
90a0f0bb38
@ -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())) {
|
||||
|
Loading…
Reference in New Issue
Block a user