diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index b7920c16..629945b6 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -251,12 +251,10 @@ namespace TShockAPI
             if (playerTeam != 0)
             {
                 string msg = string.Format("<{0}> {1}", args.Player.Name, args.Message.Remove(0, 2));
-                for (int i = 0; i < TShock.Players.Length; i++)
+                foreach (TSPlayer player in TShock.Players)
                 {
-                    if (TShock.Players[i] != null && TShock.Players[i].Active && TShock.Players[i].Team == playerTeam)
-                    {
-                       TShock.Players[i].SendMessage(msg, Main.teamColor[playerTeam].R, Main.teamColor[playerTeam].G, Main.teamColor[playerTeam].B);
-                    }
+                    if (player != null && player.Active && player.Team == playerTeam)
+                        player.SendMessage(msg, Main.teamColor[playerTeam].R, Main.teamColor[playerTeam].G, Main.teamColor[playerTeam].B);
                 }
             }
             else
diff --git a/TShockAPI/Tools.cs b/TShockAPI/Tools.cs
index 74bf668d..a3d8d613 100755
--- a/TShockAPI/Tools.cs
+++ b/TShockAPI/Tools.cs
@@ -158,16 +158,16 @@ namespace TShockAPI
         {
             var found = new List<TSPlayer>();
             ply = ply.ToLower();
-            for (int i = 0; i < TShock.Players.Length; i++)
+            foreach (TSPlayer player in TShock.Players)
             {
-                if (TShock.Players[i] == null)
+                if (player == null)
                     continue;
 
-                string name = TShock.Players[i].Name.ToLower();
+                string name = player.Name.ToLower();
                 if (name.Equals(ply))
-                    return new List<TSPlayer> { TShock.Players[i] };
+                    return new List<TSPlayer> { player };
                 if (name.Contains(ply))
-                    found.Add(TShock.Players[i]);
+                    found.Add(player);
             }
             return found;
         }