mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 482ec24d923b8dc78080d5edcfe1422087035346 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Mon, 31 Jul 2017 02:08:55 -0500
|
|
Subject: [PATCH] Make /plugins list alphabetical
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
|
|
index 6f95bf3c..d4e74d29 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
|
|
@@ -3,6 +3,8 @@ package org.bukkit.command.defaults;
|
|
import java.util.Arrays;
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
+import java.util.Map;
|
|
+import java.util.TreeMap;
|
|
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.ChatColor;
|
|
@@ -35,19 +37,24 @@ public class PluginsCommand extends BukkitCommand {
|
|
|
|
@NotNull
|
|
private String getPluginList() {
|
|
- StringBuilder pluginList = new StringBuilder();
|
|
- Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
|
|
+ // Paper start
|
|
+ TreeMap<String, ChatColor> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
|
|
+
|
|
+ for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
|
|
+ plugins.put(plugin.getDescription().getName(), plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
|
|
+ }
|
|
|
|
- for (Plugin plugin : plugins) {
|
|
+ StringBuilder pluginList = new StringBuilder();
|
|
+ for (Map.Entry<String, ChatColor> entry : plugins.entrySet()) {
|
|
if (pluginList.length() > 0) {
|
|
pluginList.append(ChatColor.WHITE);
|
|
pluginList.append(", ");
|
|
}
|
|
-
|
|
- pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
|
|
- pluginList.append(plugin.getDescription().getName());
|
|
+ pluginList.append(entry.getValue());
|
|
+ pluginList.append(entry.getKey());
|
|
}
|
|
|
|
- return "(" + plugins.length + "): " + pluginList.toString();
|
|
+ return "(" + plugins.size() + "): " + pluginList.toString();
|
|
+ // Paper end
|
|
}
|
|
}
|
|
--
|
|
2.21.0
|
|
|