Remove Utils.GetPlayers().
This is a public method that only has two uses in TShock and both of them are listing players to a player. A foreach isn't rocket science and this method was originally created just because there was no good object to iterate on (e.g., a TSPlayer array).
This commit is contained in:
parent
48393d60c7
commit
f06d1fd238
3 changed files with 31 additions and 29 deletions
|
|
@ -74,6 +74,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
|
||||||
* Removed `Utils.GetPlayerIP()`. (@hakusaro)
|
* Removed `Utils.GetPlayerIP()`. (@hakusaro)
|
||||||
* Moved `Utils.Ban()` to `TSPlayer.Ban()`. (@hakusaro)
|
* Moved `Utils.Ban()` to `TSPlayer.Ban()`. (@hakusaro)
|
||||||
* Moved `Utils.SendMultipleMatchError()` to `TSPlayer.SendMultipleMatchError`. (@hakusaro)
|
* Moved `Utils.SendMultipleMatchError()` to `TSPlayer.SendMultipleMatchError`. (@hakusaro)
|
||||||
|
* Removed `Utils.GetPlayers()`. Iterate over the TSPlayers on the server and make your own list.
|
||||||
|
|
||||||
## TShock 4.3.25
|
## TShock 4.3.25
|
||||||
* Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6.
|
* Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6.
|
||||||
|
|
|
||||||
|
|
@ -4820,8 +4820,26 @@ namespace TShockAPI
|
||||||
}
|
}
|
||||||
|
|
||||||
args.Player.SendSuccessMessage("Online Players ({0}/{1})", TShock.Players.Length, TShock.Config.MaxSlots);
|
args.Player.SendSuccessMessage("Online Players ({0}/{1})", TShock.Players.Length, TShock.Config.MaxSlots);
|
||||||
|
|
||||||
|
var players = new List<string>();
|
||||||
|
|
||||||
|
foreach (TSPlayer ply in TShock.Players)
|
||||||
|
{
|
||||||
|
if (ply != null && ply.Active)
|
||||||
|
{
|
||||||
|
if (displayIdsRequested)
|
||||||
|
{
|
||||||
|
players.Add(String.Format("{0} (ID: {1}{2})", ply.Name, ply.Index, ply.Account != null ? ", ID: " + ply.Account.ID : ""));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
players.Add(ply.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
PaginationTools.SendPage(
|
PaginationTools.SendPage(
|
||||||
args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(TShock.Utils.GetPlayers(displayIdsRequested)),
|
args.Player, pageNumber, PaginationTools.BuildLinesFromTerms(players),
|
||||||
new PaginationTools.Settings
|
new PaginationTools.Settings
|
||||||
{
|
{
|
||||||
IncludeHeader = false,
|
IncludeHeader = false,
|
||||||
|
|
|
||||||
|
|
@ -69,33 +69,6 @@ namespace TShockAPI
|
||||||
return mess.Split(':')[0];
|
return mess.Split(':')[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a list of current players on the server
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="includeIDs">bool includeIDs - whether or not the string of each player name should include ID data</param>
|
|
||||||
/// <returns>List of strings with names</returns>
|
|
||||||
public List<string> GetPlayers(bool includeIDs)
|
|
||||||
{
|
|
||||||
var players = new List<string>();
|
|
||||||
|
|
||||||
foreach (TSPlayer ply in TShock.Players)
|
|
||||||
{
|
|
||||||
if (ply != null && ply.Active)
|
|
||||||
{
|
|
||||||
if (includeIDs)
|
|
||||||
{
|
|
||||||
players.Add(String.Format("{0} (IX: {1}{2})", ply.Name, ply.Index, ply.Account != null ? ", ID: " + ply.Account.ID : ""));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
players.Add(ply.Name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return players;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// It's a clamp function
|
/// It's a clamp function
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -549,8 +522,18 @@ namespace TShockAPI
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var players = new List<string>();
|
||||||
|
|
||||||
|
foreach (TSPlayer ply in TShock.Players)
|
||||||
|
{
|
||||||
|
if (ply != null && ply.Active)
|
||||||
|
{
|
||||||
|
players.Add(ply.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
foo = foo.Replace("%map%", (TShock.Config.UseServerName ? TShock.Config.ServerName : Main.worldName));
|
foo = foo.Replace("%map%", (TShock.Config.UseServerName ? TShock.Config.ServerName : Main.worldName));
|
||||||
foo = foo.Replace("%players%", String.Join(",", GetPlayers(false)));
|
foo = foo.Replace("%players%", String.Join(",", players));
|
||||||
|
|
||||||
player.SendMessage(foo, lineColor);
|
player.SendMessage(foo, lineColor);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue