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

Merge pull request #620 from MarioE/general-devel

Browse source 
Commands
This commit is contained in:
Lucas Nicodemus 2013-10-05 19:38:28 -07:00
commit 1388e9bcb3
6 changed files with 1204 additions and 1056 deletions
Download patch file Download diff file Expand all files Collapse all files

2141
TShockAPI/Commands.cs
View file

File diff suppressed because it is too large Load diff

14
TShockAPI/Log.cs
View file

@ -78,7 +78,7 @@ namespace TShockAPI
/// </summary>
/// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param>
public static void Data(String format, params String[] args)
public static void Data(string format, params object[] args)
{
Data(String.Format(format, args));
}
@ -97,7 +97,7 @@ namespace TShockAPI
/// </summary>
/// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param>
public static void Error(String format, params String[] args)
public static void Error(string format, params object[] args)
{
Error(String.Format(format, args));
}
@ -119,7 +119,7 @@ namespace TShockAPI
/// </summary>
/// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param>
public static void ConsoleError(String format, params String[] args)
public static void ConsoleError(string format, params object[] args)
{
ConsoleError(String.Format(format, args));
}
@ -138,7 +138,7 @@ namespace TShockAPI
/// </summary>
/// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param>
public static void Warn(String format, params String[] args)
public static void Warn(string format, params object[] args)
{
Warn(String.Format(format, args));
}
@ -157,7 +157,7 @@ namespace TShockAPI
/// </summary>
/// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param>
public static void Info(String format, params String[] args)
public static void Info(string format, params object[] args)
{
Info(String.Format(format, args));
}
@ -179,7 +179,7 @@ namespace TShockAPI
/// </summary>
/// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param>
public static void ConsoleInfo(String format, params String[] args)
public static void ConsoleInfo(string format, params object[] args)
{
ConsoleInfo(String.Format(format, args));
}
@ -198,7 +198,7 @@ namespace TShockAPI
/// </summary>
/// <param name="format">The format of the message to be written.</param>
/// <param name="args">The format arguments.</param>
public static void Debug(String format, params String[] args)
public static void Debug(string format, params object[] args)
{
Debug(String.Format(format, args));
}

8
TShockAPI/Permissions.cs
View file

@ -74,7 +74,7 @@ namespace TShockAPI
public static readonly string seeids = "tshock.admin.seeplayerids";
[Description("User can save all the players SSI state.")]
public static readonly string savessi = "tshock.admin.savessi";
public static readonly string savessc = "tshock.admin.savessi";
[Description("User can elevate other users' groups temporarily.")]
public static readonly string settempgroup = "tshock.admin.tempgroup";
@ -156,9 +156,6 @@ namespace TShockAPI
[Description("User can spawn items.")]
public static readonly string item = "tshock.item.spawn";
[Description("User can clear items.")]
public static readonly string clearitems = "tshock.item.clear";
[Description("Allows you to use banned items.")]
public static readonly string usebanneditem = "tshock.item.usebanned";
@ -256,6 +253,9 @@ namespace TShockAPI
// Non-grouped
[Description("User can clear items or projectiles.")]
public static readonly string clear = "tshock.clear";
[Description("User can kill others.")]
public static readonly string kill = "tshock.kill";

9
TShockAPI/TShock.cs
View file

@ -1121,11 +1121,6 @@ namespace TShockAPI
}
}
if (player.Group.HasPermission(Permissions.causeevents) && Config.InfiniteInvasion)
{
StartInvasion();
}
player.LastNetPosition = new Vector2(Main.spawnTileX*16f, Main.spawnTileY*16f);
if (Config.RememberLeavePos && (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero))
@ -1327,9 +1322,9 @@ namespace TShockAPI
* Useful stuff:
* */
public static void StartInvasion()
public static void StartInvasion(int type)
{
Main.invasionType = 1;
Main.invasionType = type;
if (Config.InfiniteInvasion)
{
Main.invasionSize = 20000000;