themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' of github.com:TShock/TShock

Browse source
This commit is contained in:
Steven French 2011-07-04 21:45:45 +12:00
commit 35eae48dfe
5 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/Commands.cs
View file

@ -56,6 +56,7 @@ namespace TShockAPI
{
public string Name { get { return Names[0]; } }
public List<string> Names { get; protected set; }
public bool DoLog { get; set; }
private string permission;
private CommandDelegate command;
@ -71,6 +72,7 @@ namespace TShockAPI
permission = null;
Names = new List<string>(names);
command = cmd;
DoLog = true;
}
public bool Run(string msg, TSPlayer ply, List<string> parms)
@ -152,8 +154,8 @@ namespace TShockAPI
ChatCommands.Add(new Command(PartyChat, "p"));
ChatCommands.Add(new Command(Rules, "rules"));
ChatCommands.Add(new Command("logs", Rules, "displaylogs"));
ChatCommands.Add(new Command("manageusers", ManageUsers, "user"));
ChatCommands.Add(new Command(AttemptLogin, "login"));
ChatCommands.Add(new Command("manageusers", ManageUsers, "user") { DoLog = false });
ChatCommands.Add(new Command(AttemptLogin, "login") { DoLog = false });
ChatCommands.Add(new Command("cfg", Broadcast, "broadcast", "bc"));
ChatCommands.Add(new Command("whisper", Whisper, "whisper", "w", "tell"));
ChatCommands.Add(new Command("whisper", Reply, "reply", "r"));
@ -191,10 +193,8 @@ namespace TShockAPI
}
else
{
if (!cmdText.Contains("login") && !cmdText.Contains("user"))
{
if (cmd.DoLog)
Tools.SendLogs(string.Format("{0} executed: /{1}", player.Name, cmdText), Color.Red);
}
cmd.Run(cmdText, player, args);
}
return true;