Merge pull request #5985 from RoosterDragon/random-try-collection

Improve Exts.Random
2014-07-23 09:57:23 +12:00
parent f68de0bbd8 c672ac5bad
commit 58ac641578
1 changed files with 5 additions and 2 deletions
--- a/OpenRA.Game/Exts.cs
+++ b/OpenRA.Game/Exts.cs
@@ -108,8 +108,11 @@ namespace OpenRA

 		public static T Random<T>(this IEnumerable<T> ts, MersenneTwister r)
 		{
-			var xs = ts.ToArray();
-			return xs[r.Next(xs.Length)];
+			var xs = ts as ICollection<T>;
+			if (xs != null)
+				return xs.ElementAt(r.Next(xs.Count));
+			var ys = ts.ToList();
+			return ys[r.Next(ys.Count)];
 		}

 		public static T RandomOrDefault<T>(this IEnumerable<T> ts, MersenneTwister r)