From 9e1d707c06e19cc7f1e0511e7e3f9a47ac65654e Mon Sep 17 00:00:00 2001
From: Lucas Nicodemus <shank@shanked.me>
Date: Tue, 24 Apr 2012 13:35:30 -0600
Subject: [PATCH] Implemented kicking by player index. /who now displays player
 index as (IX: ) if you have the correct permission. FindPlayer now finds by
 ID & name

---
 TShockAPI/Utils.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs
index dbe50c9f..2a215a3e 100644
--- a/TShockAPI/Utils.cs
+++ b/TShockAPI/Utils.cs
@@ -86,7 +86,7 @@ namespace TShockAPI
                         sb.Append(", ");
                     }
                     sb.Append(player.Name);
-                    string id = "( " + Convert.ToString(TShock.Users.GetUserID(player.UserAccountName)) + " )";
+                    string id = "(ID: " + Convert.ToString(TShock.Users.GetUserID(player.UserAccountName)) + ", IX:" + player.Index + ")";
                     sb.Append(id);
                 }
             }
@@ -187,7 +187,7 @@ namespace TShockAPI
 		}
 
 		/// <summary>
-		/// Finds a player ID based on name
+		/// Finds a TSPlayer based on name or id
 		/// </summary>
 		/// <param name="ply">Player name</param>
 		/// <returns></returns>
@@ -203,6 +203,18 @@ namespace TShockAPI
 				if (player == null)
 					continue;
 
+                try
+                {
+                    if (Convert.ToInt32(ply) == player.Index && player.Active)
+                    {
+                        return new List<TSPlayer> { player };
+                    }
+                }
+                catch (Exception e)
+                {
+                    // Conversion failed
+                }
+
 				string name = player.Name.ToLower();
 				if (name.Equals(ply))
 					return new List<TSPlayer> {player};