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

Merge commit '65a7998b16' into general-devel

Browse source 
Conflicts:
	TShockAPI/Commands.cs
This commit is contained in:
Deathmax 2011-07-04 17:08:40 +08:00
commit 2d53001197
3 changed files with 8 additions and 8 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)
@ -151,8 +153,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"));
@ -190,10 +192,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;

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.2.0702")]
[assembly: AssemblyFileVersion("2.3.2.0702")]
[assembly: AssemblyVersion("2.3.2.0704")]
[assembly: AssemblyFileVersion("2.3.2.0704")]

2
TShockAPI/TShock.cs
View file

@ -627,7 +627,7 @@ namespace TShockAPI
public void OnConfigRead(ConfigFile file)
{
NPC.maxSpawns = file.DefaultMaximumSpawns;
NPC.defaultMaxSpawns = file.DefaultMaximumSpawns;
NPC.defaultSpawnRate = file.DefaultSpawnRate;
Main.autoSave = file.AutoSave;