Implementing #93 (#94)

Testing required before PR.
This commit is contained in:
Mitchell Cook 2019-04-14 06:34:03 +10:00 committed by Ryan
parent e53cad219e
commit 29c61373b0
2 changed files with 4 additions and 2 deletions

View File

@ -26,6 +26,7 @@ import static me.clip.placeholderapi.util.Msg.msg;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.stream.Collectors;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.PlaceholderAPIPlugin;
import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@ -319,7 +320,7 @@ public class ExpansionCloudCommands implements CommandExecutor {
if (!(s instanceof Player)) { if (!(s instanceof Player)) {
for (Entry<Integer, CloudExpansion> expansion : ex.entrySet()) { for (Entry<Integer, CloudExpansion> expansion : ex.entrySet().stream().sorted().collect(Collectors.toList())) {
if (expansion == null || expansion.getValue() == null) { if (expansion == null || expansion.getValue() == null) {
continue; continue;
} }

View File

@ -21,6 +21,7 @@
package me.clip.placeholderapi.commands; package me.clip.placeholderapi.commands;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.PlaceholderAPIPlugin;
import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@ -237,7 +238,7 @@ public class PlaceholderAPICommands implements CommandExecutor {
return true; return true;
} }
Msg.msg(s, registered.size() + " &7Placeholder hooks registered:"); Msg.msg(s, registered.size() + " &7Placeholder hooks registered:");
Msg.msg(s, registered.toString()); Msg.msg(s, registered.stream().sorted().collect(Collectors.joining(", ")));
} else if (args.length > 1 && args[0].equalsIgnoreCase("register")) { } else if (args.length > 1 && args[0].equalsIgnoreCase("register")) {
if (s instanceof Player) { if (s instanceof Player) {