From 177c22a24b419144af7a00d5970d04dc1618e0d7 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 12 Feb 2017 10:56:24 -0500 Subject: I'm drunk. --- ShiftOS.Server/ShopBackend.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ShiftOS.Server/ShopBackend.cs') diff --git a/ShiftOS.Server/ShopBackend.cs b/ShiftOS.Server/ShopBackend.cs index b59da39..071417a 100644 --- a/ShiftOS.Server/ShopBackend.cs +++ b/ShiftOS.Server/ShopBackend.cs @@ -7,6 +7,7 @@ using Newtonsoft.Json; using ShiftOS.Objects; using System.IO; using static ShiftOS.Server.Program; +using NetSockets; namespace ShiftOS.Server { @@ -21,7 +22,7 @@ namespace ShiftOS.Server shopList = JsonConvert.DeserializeObject>(File.ReadAllText("shops.json")); var username = args["username"] as string; - var updateShop = JsonConvert.DeserializeObject(msg.Contents); + var updateShop = JsonConvert.DeserializeObject(contents as string); for (int i = 0; i < shopList.Count; i++) { @@ -44,7 +45,7 @@ namespace ShiftOS.Server if (File.Exists("shops.json")) shopFile = JsonConvert.DeserializeObject>(File.ReadAllText("shops.json")); - var newShop = JsonConvert.DeserializeObject(msg.Contents); + var newShop = JsonConvert.DeserializeObject(contents as string); foreach (var shop in shopFile) { @@ -137,7 +138,7 @@ namespace ShiftOS.Server { if (shop.Owner == shopOwner) { - server.DispatchTo(new Guid(msg.GUID), new NetObject("ruecuodaL", new ServerMessage + server.DispatchTo(new Guid(guid), new NetObject("ruecuodaL", new ServerMessage { Name = "user_shop", GUID = "server", @@ -147,7 +148,7 @@ namespace ShiftOS.Server } } - server.DispatchTo(new Guid(msg.GUID), new NetObject("ruecuodaL", new ServerMessage + server.DispatchTo(new Guid(guid), new NetObject("ruecuodaL", new ServerMessage { Name = "user_noshop", GUID = "server", -- cgit v1.2.3