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

/who will list player ids only when the -i parameter is added.

Browse source
This commit is contained in:
CoderCow 2013-06-29 23:35:10 +02:00
parent 75d3be63e7
commit ee5a7dd7b8
1 changed files with 31 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

75
TShockAPI/Commands.cs
View file

@ -3085,59 +3085,46 @@ namespace TShockAPI
private static void ListConnectedPlayers(CommandArgs args) private static void ListConnectedPlayers(CommandArgs args)
{ {
//How many players per page bool invalidUsage = (args.Parameters.Count > 2);
const int pagelimit = 15;
//How many players per line
const int perline = 5;
//Pages start at 0 but are displayed and parsed at 1
int page = 0;
bool displayIdsRequested = false;
if (args.Parameters.Count > 0) int pageNumber = 1;
if (!invalidUsage)
{ {
if (!int.TryParse(args.Parameters[0], out page) || page < 1) foreach (string parameter in args.Parameters)
{ {
args.Player.SendErrorMessage(string.Format("Invalid page number ({0})", page)); if (parameter.Equals("-i", StringComparison.InvariantCultureIgnoreCase))
return; {
displayIdsRequested = true;
continue;
}
if (!int.TryParse(parameter, out pageNumber))
{
invalidUsage = true;
break;
}
} }
page--; //Substract 1 as pages are parsed starting at 1 and not 0
} }
if (invalidUsage)
var playerList = args.Player.Group.HasPermission(Permissions.seeids)
? TShock.Utils.GetPlayers(true)
: TShock.Utils.GetPlayers(false);
//Check if they are trying to access a page that doesn't exist.
int pagecount = playerList.Count / pagelimit;
if (page > pagecount)
{ {
args.Player.SendErrorMessage(string.Format("Page number exceeds pages ({0}/{1})", page + 1, pagecount + 1)); args.Player.SendErrorMessage("Invalid usage, proper usage: /who [-i] [pagenumber]");
return;
}
if (displayIdsRequested && !args.Player.Group.HasPermission(Permissions.seeids))
{
args.Player.SendErrorMessage("You don't have the required permission to list player ids.");
return; return;
} }
//Display the current page and the number of pages. args.Player.SendSuccessMessage("Online Players ({0}/{1})", TShock.Utils.ActivePlayers(), TShock.Config.MaxSlots);
args.Player.SendSuccessMessage(string.Format("Players: {0}/{1}", PaginationTools.SendPage(
TShock.Utils.ActivePlayers(), TShock.Config.MaxSlots)); args.Player, pageNumber, TShock.Utils.GetPlayers(displayIdsRequested), new PaginationTools.Settings
args.Player.SendSuccessMessage(string.Format("Current players page {0}/{1}:", page + 1, pagecount + 1)); {
IncludeHeader = false,
//Add up to pagelimit names to a list FooterFormat = string.Format("Type /who {0}{{0}} for more.", displayIdsRequested ? "-i " : string.Empty)
var nameslist = new List<string>(); }
for (int i = (page * pagelimit); (i < ((page * pagelimit) + pagelimit)) && i < playerList.Count; i++) );
{
nameslist.Add(playerList[i]);
}
//convert the list to an array for joining
var names = nameslist.ToArray();
for (int i = 0; i < names.Length; i += perline)
{
args.Player.SendInfoMessage(string.Join(", ", names, i, Math.Min(names.Length - i, perline)));
}
if (page < pagecount)
{
args.Player.SendInfoMessage(string.Format("Type /who {0} for more players.", (page + 2)));
}
} }
private static void AuthToken(CommandArgs args) private static void AuthToken(CommandArgs args)