From 410b97823ab610fbf5a036a1f9ea930882922c9f Mon Sep 17 00:00:00 2001
From: RoosterDragon <RoosterDragon@outlook.com>
Date: Wed, 26 Aug 2015 20:04:51 +0100
Subject: [PATCH] Ensure our array handling only accepts single dimensional
 arrays.

---
 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 52273e288a..d93089c1aa 100644
--- a/OpenRA.Game/FieldLoader.cs
+++ b/OpenRA.Game/FieldLoader.cs
@@ -417,7 +417,7 @@ namespace OpenRA
 			}
 			else if (fieldType == typeof(bool))
 				return ParseYesNo(value, fieldType, fieldName);
-			else if (fieldType.IsArray)
+			else if (fieldType.IsArray && fieldType.GetArrayRank() == 1)
 			{
 				if (value == null)
 					return Array.CreateInstance(fieldType.GetElementType(), 0);
diff --git a/OpenRA.Game/FieldSaver.cs b/OpenRA.Game/FieldSaver.cs
index 68642475e2..b1facbbe36 100644
--- a/OpenRA.Game/FieldSaver.cs
+++ b/OpenRA.Game/FieldSaver.cs
@@ -89,7 +89,7 @@ namespace OpenRA
 				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
 			}
 
-			if (t.IsArray)
+			if (t.IsArray && t.GetArrayRank() == 1)
 			{
 				var elems = ((Array)v).OfType<object>();
 				return elems.JoinWith(", ");