Merge 545f7f0bbd into 882b7c5965

Add Plugin Authors to /papi dump

src/main/java/me/clip/placeholderapi/PlaceholderHook.java

@@ -29,7 +29,7 @@ public abstract class PlaceholderHook {
   @Nullable
   public String onRequest(final OfflinePlayer player, @NotNull final String params) {
     if (player != null && player.isOnline()) {
-      return onPlaceholderRequest((Player) player, params);
+      return onPlaceholderRequest(player.getPlayer(), params);
     }
 
     return onPlaceholderRequest(null, params);

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java

@@ -200,7 +200,9 @@ public final class CommandDump extends PlaceholderCommand {
     for (final Plugin other : plugins) {
       builder.append("  ")
           .append(String.format("%-" + size + "s", other.getName()))
-          .append(" [Version: ")
+          .append(" [Authors: [")
+          .append(String.join(", ", other.getDescription().getAuthors()))
+          .append("], Version: ")
           .append(other.getDescription().getVersion())
           .append("]")
           .append("\n");

src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java

@@ -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,43 +353,48 @@ public final class LocalExpansionManager implements Listener {
   private void registerAll(@NotNull final CommandSender sender) {
     Msg.info("Placeholder expansion registration initializing...");
 
-    Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
-      if (exception != null) {
-        Msg.severe("Failed to load class files of expansion.", exception);
-        return;
+    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);
+            return;
+          }
+
+          final List<PlaceholderExpansion> registered = classes.stream()
+                  .filter(Objects::nonNull)
+                  .map(LocalExpansionManager.this::register)
+                  .filter(Optional::isPresent)
+                  .map(Optional::get)
+                  .collect(Collectors.toList());
+
+          final long needsUpdate = registered.stream()
+                  .map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
+                  .filter(Objects::nonNull)
+                  .filter(CloudExpansion::shouldUpdate)
+                  .count();
+
+          StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
+                  .append(registered.size())
+                  .append(' ')
+                  .append("placeholder hook(s) registered!");
+
+          if (needsUpdate > 0) {
+            message.append(' ')
+                    .append("&6")
+                    .append(needsUpdate)
+                    .append(' ')
+                    .append("placeholder hook(s) have an update available.");
+          }
+
+
+          Msg.msg(sender, message.toString());
+
+          Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
+        });
       }
-      
-      final List<PlaceholderExpansion> registered = classes.stream()
-          .filter(Objects::nonNull)
-          .map(this::register)
-          .filter(Optional::isPresent)
-          .map(Optional::get)
-          .collect(Collectors.toList());
-
-      final long needsUpdate = registered.stream()
-          .map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
-          .filter(Objects::nonNull)
-          .filter(CloudExpansion::shouldUpdate)
-          .count();
-
-      StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
-          .append(registered.size())
-          .append(' ')
-          .append("placeholder hook(s) registered!");
-      
-      if (needsUpdate > 0) {
-        message.append(' ')
-            .append("&6")
-            .append(needsUpdate)
-            .append(' ')
-            .append("placeholder hook(s) have an update available.");
-      }
-      
-      
-      Msg.msg(sender, message.toString());
-
-      Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
-    });
+    }.runTaskLater(plugin, 1L);
   }
 
   private void unregisterAll() {