diff options
| author | Michael <[email protected]> | 2017-02-09 20:32:53 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-02-09 20:32:53 -0500 |
| commit | de14574800ed21765e1ac6bba1d19b774f477c29 (patch) | |
| tree | b9d5ce4ce01e4e930e546ff23fc70a7ad32356bf /ShiftOS.WinForms/Applications/MUDControlCentre.cs | |
| parent | d6b2b155264e7a4b576c956530915f66d97b3eac (diff) | |
| download | shiftos_thereturn-de14574800ed21765e1ac6bba1d19b774f477c29.tar.gz shiftos_thereturn-de14574800ed21765e1ac6bba1d19b774f477c29.tar.bz2 shiftos_thereturn-de14574800ed21765e1ac6bba1d19b774f477c29.zip | |
Compress shop items on server-side.
Diffstat (limited to 'ShiftOS.WinForms/Applications/MUDControlCentre.cs')
| -rw-r--r-- | ShiftOS.WinForms/Applications/MUDControlCentre.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs index 67c6c17..6336718 100644 --- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs +++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs @@ -142,10 +142,10 @@ namespace ShiftOS.WinForms.Applications } else if(msg.Name == "shop_additem") { - var contents = JsonConvert.DeserializeObject<Dictionary<string, object>>(msg.Contents); + var contents = JsonConvert.DeserializeObject<Dictionary<string, string>>(msg.Contents); if((string)contents["shop"] == CurrentShop.Name) { - CurrentShop.Items.Add(JsonConvert.DeserializeObject<ShopItem>(JsonConvert.SerializeObject(contents["itemdata"]))); + CurrentShop.Items.Add(JsonConvert.DeserializeObject<ShopItem>(DownloadManager.Decompress(DownloadManager.Decompress(contents["itemdata"] as string)))); this.Invoke(new Action(PopulateShopView)); } } |
