Merge remote-tracking branch 'origin/general-devel' into fragments

This commit is contained in:
Lucas Nicodemus 2017-12-09 08:44:49 -07:00
commit 031398591a
13 changed files with 354 additions and 346 deletions

View file

@ -90,7 +90,7 @@ namespace TShockAPI
{
if (includeIDs)
{
players.Add(String.Format("{0} (IX: {1}{2})", ply.Name, ply.Index, ply.User != null ? ", ID: " + ply.User.ID : ""));
players.Add(String.Format("{0} (IX: {1}{2})", ply.Name, ply.Index, ply.Account != null ? ", ID: " + ply.Account.ID : ""));
}
else
{