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

Merge commit '9a68676392' into general-devel-2

Browse source
This commit is contained in:
Deathmax 2011-06-05 17:27:33 +08:00
commit c85dca933f
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Commands.cs
View file

@ -48,14 +48,15 @@ namespace TShockAPI
TShock.admincommandList.Add("maxspawns", new CommandDelegate(MaxSpawns)); TShock.admincommandList.Add("maxspawns", new CommandDelegate(MaxSpawns));
TShock.admincommandList.Add("spawnrate", new CommandDelegate(SpawnRate)); TShock.admincommandList.Add("spawnrate", new CommandDelegate(SpawnRate));
TShock.admincommandList.Add("time", new CommandDelegate(Time)); TShock.admincommandList.Add("time", new CommandDelegate(Time));
TShock.admincommandList.Add("help", new CommandDelegate(Help)); TShock.admincommandList.Add("help", new CommandDelegate(Help));
TShock.admincommandList.Add("slap", new CommandDelegate(Slap)); TShock.admincommandList.Add("slap", new CommandDelegate(Slap));
TShock.admincommandList.Add("off-nosave", new CommandDelegate(OffNoSave)); TShock.admincommandList.Add("off-nosave", new CommandDelegate(OffNoSave));
TShock.admincommandList.Add("protectspawn", new CommandDelegate(ProtectSpawn)); TShock.admincommandList.Add("protectspawn", new CommandDelegate(ProtectSpawn));
TShock.admincommandList.Add("debug-config", new CommandDelegate(DebugConfiguration)); TShock.admincommandList.Add("debug-config", new CommandDelegate(DebugConfiguration));
TShock.admincommandList.Add("playing", new CommandDelegate(Playing));
TShock.commandList.Add("help", new CommandDelegate(Help)); TShock.commandList.Add("help", new CommandDelegate(Help));
TShock.commandList.Add("kill", new CommandDelegate(Kill)); TShock.commandList.Add("kill", new CommandDelegate(Kill));
TShock.commandList.Add("playing", new CommandDelegate(Playing));
if (ConfigurationManager.distributationAgent != "terraria-online") if (ConfigurationManager.distributationAgent != "terraria-online")
{ {
TShock.admincommandList.Add("kill", new CommandDelegate(Kill)); TShock.admincommandList.Add("kill", new CommandDelegate(Kill));
@ -68,6 +69,11 @@ namespace TShockAPI
#region Command Methods #region Command Methods
public static void Playing(CommandArgs args)
{
Tools.SendMessage(args.PlayerID, Tools.GetPlayers());
}
public static void DebugConfiguration(CommandArgs args) public static void DebugConfiguration(CommandArgs args)
{ {
int ply = args.PlayerID; int ply = args.PlayerID;

2
TShockAPI/TShock.cs
View file

@ -17,7 +17,7 @@ namespace TShockAPI
public static Version VersionNum = new Version(1, 7, 0, 0); public static Version VersionNum = new Version(1, 7, 0, 0);
public static string VersionCodename = "Bugless Beast"; public static string VersionCodename = "Facepunch";
public static bool shownVersion = false; public static bool shownVersion = false;