Implementing #93 (#94)

Testing required before PR.
PlaceholderAPI · Apr 13, 2019 · 29c6137 · 29c6137
1 parent e53cad2
commit 29c6137
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/me/clip/placeholderapi/commands/ExpansionCloudCommands.java b/src/main/java/me/clip/placeholderapi/commands/ExpansionCloudCommands.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -319,7 +320,7 @@ public boolean onCommand(CommandSender s, Command c, String label, String[] args
 
       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) {
                 continue;
             }

diff --git a/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java b/src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands;
 
 import java.util.Set;
+import java.util.stream.Collectors;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -237,7 +238,7 @@ public boolean onCommand(CommandSender s, Command c, String label, String[] args
           return true;
         }
         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")) {
 
         if (s instanceof Player) {