fix: Fixes duplicate command listed. (#1677)

modernuo · Feb 12, 2024 · 48e47f9 · 48e47f9
1 parent 4479555
commit 48e47f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Projects/UOContent/Commands/HelpInfo.cs b/Projects/UOContent/Commands/HelpInfo.cs
@@ -96,15 +96,15 @@ public static void FillTable()
                 .ReplaceOrdinal("<", "(")
                 .ReplaceOrdinal(">", ")");
 
-            if (e.Handler.Target == null && usage == null && desc == null)
+            if (e.Handler.Target != null && usage == null && desc == null)
             {
                 continue;
             }
 
             var aliasesAttr = mi.GetCustomAttribute(typeof(AliasesAttribute), false) as AliasesAttribute;
             var aliases = aliasesAttr?.Aliases;
 
-            list.Add(new CommandInfo(e.AccessLevel, e.Command, aliases, usage, null, desc));
+            list.Add(new CommandInfo(e.AccessLevel, e.Command, aliases, usage ?? e.Command, null, desc ?? "No description available."));
         }
 
         for (var i = 0; i < TargetCommands.AllCommands.Count; ++i)
@@ -130,7 +130,7 @@ public static void FillTable()
 
             desc = desc
                 .ReplaceOrdinal("<", "(")
-                .ReplaceOrdinal(">", ")");
+                .ReplaceOrdinal(">", ")") ?? "No description available.";
 
             List<string> modsList = [];
 

diff --git a/Projects/UOContent/Engines/Factions/Core/Faction.cs b/Projects/UOContent/Engines/Factions/Core/Faction.cs
@@ -846,6 +846,8 @@ public static void FactionItemReset_OnCommand(CommandEventArgs e)
             e.Mobile.SendMessage($"{count} items reset");
         }
 
+        [Usage("FactionCommander")]
+        [Description("Sets the targeted player as the faction commander.")]
         public static void FactionCommander_OnCommand(CommandEventArgs e)
         {
             e.Mobile.SendMessage("Target a player to make them the faction commander.");

diff --git a/docs/commands/commands.7z b/docs/commands/commands.7z