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 into general-devel

Browse source 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
high 2011-09-24 18:31:05 -04:00
commit c4b2d6f438
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Commands.cs
View file

@ -165,6 +165,7 @@ namespace TShockAPI
add(null, AuthToken, "auth");
add(null, ThirdPerson, "me");
add(null, PartyChat, "p");
add(null, Motd, "motd");
add(null, Rules, "rules");
add(Permissions.logs, DisplayLogs, "displaylogs");
ChatCommands.Add(new Command(PasswordUser, "password") { DoLog = false });
@ -2154,6 +2155,11 @@ namespace TShockAPI
args.Player.SendMessage("You are not in a party!", 255, 240, 20);
}
}
private static void Motd(CommandArgs args)
{
Tools.ShowFileToUser(args.Player, "motd.txt");
}
private static void Rules(CommandArgs args)
{