diff options
| author | Michael <[email protected]> | 2017-02-12 10:56:24 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-02-12 10:56:24 -0500 |
| commit | 177c22a24b419144af7a00d5970d04dc1618e0d7 (patch) | |
| tree | 22f0c0298af408ebfcd68157f308470312ec6464 /ShiftOS.Server/ShopBackend.cs | |
| parent | 110438929c855aec8fe1a4cc0b01ccad7ee3807d (diff) | |
| download | shiftos_thereturn-177c22a24b419144af7a00d5970d04dc1618e0d7.tar.gz shiftos_thereturn-177c22a24b419144af7a00d5970d04dc1618e0d7.tar.bz2 shiftos_thereturn-177c22a24b419144af7a00d5970d04dc1618e0d7.zip | |
I'm drunk.
Diffstat (limited to 'ShiftOS.Server/ShopBackend.cs')
| -rw-r--r-- | ShiftOS.Server/ShopBackend.cs | 9 |
1 files changed, 5 insertions, 4 deletions
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<List<Shop>>(File.ReadAllText("shops.json")); var username = args["username"] as string; - var updateShop = JsonConvert.DeserializeObject<Shop>(msg.Contents); + var updateShop = JsonConvert.DeserializeObject<Shop>(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<List<Shop>>(File.ReadAllText("shops.json")); - var newShop = JsonConvert.DeserializeObject<Shop>(msg.Contents); + var newShop = JsonConvert.DeserializeObject<Shop>(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", |