From 6f32196f89e61214ead00f97cd31880a71c165ec Mon Sep 17 00:00:00 2001
From: Trevor Nichols <trevor@theredfox.group>
Date: Sun, 4 Oct 2020 13:44:15 +1100
Subject: [PATCH] Support List<> for FieldSaver/FieldLoader

---
 OpenRA.Game/FieldLoader.cs | 2 +-
 OpenRA.Game/FieldSaver.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Game/FieldLoader.cs b/OpenRA.Game/FieldLoader.cs
index f30c228250..a1d18603bc 100644
--- a/OpenRA.Game/FieldLoader.cs
+++ b/OpenRA.Game/FieldLoader.cs
@@ -435,7 +435,7 @@ namespace OpenRA
 					ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
 				return ret;
 			}
-			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(HashSet<>))
+			else if (fieldType.IsGenericType && (fieldType.GetGenericTypeDefinition() == typeof(HashSet<>) || fieldType.GetGenericTypeDefinition() == typeof(List<>)))
 			{
 				var set = Activator.CreateInstance(fieldType);
 				if (value == null)
diff --git a/OpenRA.Game/FieldSaver.cs b/OpenRA.Game/FieldSaver.cs
index bdd9826f1e..ddf4d1686b 100644
--- a/OpenRA.Game/FieldSaver.cs
+++ b/OpenRA.Game/FieldSaver.cs
@@ -94,7 +94,7 @@ namespace OpenRA
 				return ((Array)v).Cast<object>().Select(FormatValue).JoinWith(", ");
 			}
 
-			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(HashSet<>))
+			if (t.IsGenericType && (t.GetGenericTypeDefinition() == typeof(HashSet<>) || t.GetGenericTypeDefinition() == typeof(List<>)))
 			{
 				return ((System.Collections.IEnumerable)v).Cast<object>().Select(FormatValue).JoinWith(", ");
 			}