AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 04:32:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix /help (am major idiot)

Browse Source
This commit is contained in:
UnknownShadow200 2018-12-24 23:47:55 +11:00
parent 0265c9b910
commit 5c0402d8b3
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MCGalaxy/Commands/Information/CmdCommands.cs
View File

@ -112,6 +112,7 @@ namespace MCGalaxy.Commands.Info {
p.Message("Type %T/Help <command> %Sfor more help on a command."); p.Message("Type %T/Help <command> %Sfor more help on a command.");
} }
// common shortcuts people tend to use
static string GetCategory(string type) { static string GetCategory(string type) {
if (type.CaselessEq("building")) return CommandTypes.Building; if (type.CaselessEq("building")) return CommandTypes.Building;
if (type.CaselessEq("eco")) return CommandTypes.Economy; if (type.CaselessEq("eco")) return CommandTypes.Economy;
@ -126,21 +127,22 @@ namespace MCGalaxy.Commands.Info {
static bool PrintCategoryCommands(Player p, string sort, string modifier, string type) { static bool PrintCategoryCommands(Player p, string sort, string modifier, string type) {
List<Command> cmds = new List<Command>(); List<Command> cmds = new List<Command>();
string category = GetCategory(type); string category = GetCategory(type);
bool any = false; bool foundAny = false;
foreach (Command c in Command.allCmds) { foreach (Command c in Command.allCmds) {
string disabled = Command.GetDisabledReason(c.Enabled); string disabled = Command.GetDisabledReason(c.Enabled);
if (!c.type.CaselessContains(category)) continue; if (!c.type.CaselessEq(category)) continue;
if (disabled == null && p.CanUse(c)) cmds.Add(c); if (disabled == null && p.CanUse(c)) cmds.Add(c);
any = true; foundAny = true;
} }
if (!foundAny) return false;
if (cmds.Count == 0) { if (cmds.Count == 0) {
p.Message("You cannot use any of the " + category + " commands."); return any; p.Message("You cannot use any of the " + category + " commands."); return true;
} }
SortCommands(cmds, sort); SortCommands(cmds, sort);
p.Message(category + " commands you may use:"); p.Message(category.Capitalize() + " commands you may use:");
type = "Commands " + type; type = "Commands " + type;
if (sort.Length > 0) type += " " + sort; if (sort.Length > 0) type += " " + sort;
@ -149,7 +151,7 @@ namespace MCGalaxy.Commands.Info {
type, "commands", modifier, false); type, "commands", modifier, false);
p.Message("Type %T/Help <command> %Sfor more help on a command."); p.Message("Type %T/Help <command> %Sfor more help on a command.");
return any; return true;
} }
static void SortCommands(List<Command> cmds, string sort) { static void SortCommands(List<Command> cmds, string sort) {

2
MCGalaxy/Commands/Information/CmdHelp.cs
View File

@ -37,7 +37,7 @@ namespace MCGalaxy.Commands.Info {
PrintColors(p); PrintColors(p);
} else if (message.CaselessEq("emotes") || message.CaselessStarts("emotes ")) { } else if (message.CaselessEq("emotes") || message.CaselessStarts("emotes ")) {
PrintEmotes(p, message); PrintEmotes(p, message);
} else { } else {
if (CmdCommands.ListCommands(p, message)) return; if (CmdCommands.ListCommands(p, message)) return;
if (ParseCommand(p, message) || ParseBlock(p, message) || ParsePlugin(p, message)) return; if (ParseCommand(p, message) || ParseBlock(p, message) || ParsePlugin(p, message)) return;
p.Message("Could not find command, plugin or block specified."); p.Message("Could not find command, plugin or block specified.");