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

Rename Utils.ActivePlayers to something better.

Browse source 
Issues related to ICollections being null led to reverting migrating
this to TSPlayer until a better solution is uncovered.
This commit is contained in:
Lucas Nicodemus 2017-12-31 01:30:13 -07:00
parent a5cad284a8
commit df4da817b6
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Utils.cs
View file

@ -153,7 +153,7 @@ namespace TShockAPI
/// Gets the number of active players on the server.
/// </summary>
/// <returns>The number of active players on the server.</returns>
public int ActivePlayers()
public int GetActivePlayerCount()
{
return Main.player.Where(p => null != p && p.active).Count();
}
@ -1117,7 +1117,7 @@ namespace TShockAPI
}
else
{
invasionSize = 100 + (TShock.Config.InvasionMultiplier * ActivePlayers());
invasionSize = 100 + (TShock.Config.InvasionMultiplier * GetActivePlayerCount());
}
// Order matters
@ -1151,12 +1151,12 @@ namespace TShockAPI
}
/// <summary>Updates the console title with some pertinent information.</summary>
/// <param name="empty">If the server is empty; determines if we should use Utils.ActivePlayers() for player count or 0.</param>
/// <param name="empty">If the server is empty; determines if we should use Utils.GetActivePlayerCount() for player count or 0.</param>
internal void SetConsoleTitle(bool empty)
{
Console.Title = string.Format("{0}{1}/{2} on {3} @ {4}:{5} (TShock for Terraria v{6})",
!string.IsNullOrWhiteSpace(TShock.Config.ServerName) ? TShock.Config.ServerName + " - " : "",
empty ? 0 : ActivePlayers(),
empty ? 0 : GetActivePlayerCount(),
TShock.Config.MaxSlots, Main.worldName, Netplay.ServerIP.ToString(), Netplay.ListenPort, TShock.VersionNum);
}