From f1ce3ae037ee060d4073619b8b422caeccfffd83 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Mon, 10 Dec 2012 01:10:39 -0600 Subject: [PATCH] Only display help aliases when there are aliases. Fixes BUKKIT-1621 By: feildmaster --- .../java/org/bukkit/craftbukkit/help/SimpleHelpMap.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java b/paper-server/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java index 12c9dd7b8..d286b1c23 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java @@ -80,7 +80,7 @@ public class SimpleHelpMap implements HelpMap { for (HelpTopic topic : yaml.getGeneralTopics()) { addTopic(topic); } - + // Initialize index help topics from the help.yml file for (HelpTopic topic : yaml.getIndexTopics()) { if (topic.getName().equals("Default")) { @@ -97,7 +97,7 @@ public class SimpleHelpMap implements HelpMap { public synchronized void initializeCommands() { // ** Load topics from highest to lowest priority order ** Set ignoredPlugins = new HashSet(yaml.getIgnoredPlugins()); - + // Don't load any automatic help topics if All is ignored if (ignoredPlugins.contains("All")) { return; @@ -145,7 +145,10 @@ public class SimpleHelpMap implements HelpMap { } // Add alias sub-index - addTopic(new IndexHelpTopic("Aliases", "Lists command aliases", null, Collections2.filter(helpTopics.values(), Predicates.instanceOf(CommandAliasHelpTopic.class)))); + Collection filteredTopics = Collections2.filter(helpTopics.values(), Predicates.instanceOf(CommandAliasHelpTopic.class)); + if (!filteredTopics.isEmpty()) { + addTopic(new IndexHelpTopic("Aliases", "Lists command aliases", null, filteredTopics)); + } // Initialize plugin-level sub-topics Map> pluginIndexes = new HashMap>();