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

Remove deprecated GetUsers() and IDs method

Browse source 
Thanks @Enerdy
This commit is contained in:
Lucas Nicodemus 2015-03-14 13:38:22 -06:00
parent e5de43de36
commit eda5ba312e
1 changed files with 1 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

48
TShockAPI/Utils.cs
View file

@ -63,28 +63,6 @@ namespace TShockAPI
return mess.Split(':')[0]; return mess.Split(':')[0];
} }
/// <summary>
/// Used for some places where a list of players might be used.
/// </summary>
/// <returns>String of players seperated by commas.</returns>
[Obsolete("Use GetPlayers and manually create strings. This should never have been kept as far as actual functions go.")]
public string GetPlayers()
{
var sb = new StringBuilder();
foreach (TSPlayer player in TShock.Players)
{
if (player != null && player.Active)
{
if (sb.Length != 0)
{
sb.Append(", ");
}
sb.Append(player.Name);
}
}
return sb.ToString();
}
/// <summary> /// <summary>
/// Returns a list of current players on the server /// Returns a list of current players on the server
/// </summary> /// </summary>
@ -112,30 +90,6 @@ namespace TShockAPI
return players; return players;
} }
/// <summary>
/// Used for some places where a list of players might be used.
/// </summary>
/// <returns>String of players and their id seperated by commas.</returns>
[Obsolete("Use GetPlayers and manually create strings. This should never have been kept as far as actual functions go.")]
public string GetPlayersWithIds()
{
var sb = new StringBuilder();
foreach (TSPlayer player in TShock.Players)
{
if (player != null && player.Active)
{
if (sb.Length != 0)
{
sb.Append(", ");
}
sb.Append(player.Name);
string id = "(ID: " + Convert.ToString(TShock.Users.GetUserID(player.UserAccountName)) + ", IX:" + player.Index + ")";
sb.Append(id);
}
}
return sb.ToString();
}
/// <summary> /// <summary>
/// Finds a player and gets IP as string /// Finds a player and gets IP as string
/// </summary> /// </summary>
@ -697,7 +651,7 @@ namespace TShockAPI
} }
foo = foo.Replace("%map%", Main.worldName); foo = foo.Replace("%map%", Main.worldName);
foo = foo.Replace("%players%", GetPlayers()); foo = foo.Replace("%players%", String.Join(",", GetPlayers(false)));
Regex reg = new Regex("%\\s*(?<r>\\d{1,3})\\s*,\\s*(?<g>\\d{1,3})\\s*,\\s*(?<b>\\d{1,3})\\s*%"); Regex reg = new Regex("%\\s*(?<r>\\d{1,3})\\s*,\\s*(?<g>\\d{1,3})\\s*,\\s*(?<b>\\d{1,3})\\s*%");
var matches = reg.Matches(foo); var matches = reg.Matches(foo);
Color c = Color.White; Color c = Color.White;