From cd353f930436f08c0fb1f31a366fca79eb86f620 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 17 Nov 2017 14:37:41 -0500
Subject: [PATCH 1/2] Fixes chat command JSON parsing

---
 TGS.Server/Instance/Interop.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/TGS.Server/Instance/Interop.cs b/TGS.Server/Instance/Interop.cs
index 3d934d4322..9f9531c6a5 100644
--- a/TGS.Server/Instance/Interop.cs
+++ b/TGS.Server/Instance/Interop.cs
@@ -74,8 +74,14 @@ namespace TGS.Server
 			List<Command> tmp = new List<Command>();
 			try
 			{
-				foreach(var I in JsonConvert.DeserializeObject<IDictionary<string, IDictionary<string, object>>>(json))
-					tmp.Add(new ServerChatCommand(I.Key, (string)I.Value[CCPHelpText], ((int)I.Value[CCPAdminOnly]) == 1, (int)I.Value[CCPRequiredParameters]));
+				foreach (var I in JsonConvert.DeserializeObject<IDictionary<string, object>>(json))
+				{
+					var innerDick = ((JObject)I.Value).ToObject<IDictionary<string, object>>();
+					var helpText = (string)innerDick[CCPHelpText];
+					var adminOnly = ((long)innerDick[CCPAdminOnly]) == 1;
+					var requiredParams = (int)((long)innerDick[CCPRequiredParameters]);
+					tmp.Add(new ServerChatCommand(I.Key, helpText, adminOnly, requiredParams));
+				}
 				ServerChatCommands = tmp;
 			}
 			catch { }

From 1754e3aac318d13b2e3e6611f20f58edef6091cb Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 17 Nov 2017 14:41:54 -0500
Subject: [PATCH 2/2] Add missing reference to Newtonsoft.Json.Linq

---
 TGS.Server/Instance/Interop.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/TGS.Server/Instance/Interop.cs b/TGS.Server/Instance/Interop.cs
index 9f9531c6a5..f24f3101f1 100644
--- a/TGS.Server/Instance/Interop.cs
+++ b/TGS.Server/Instance/Interop.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Net;