aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS_TheReturn
diff options
context:
space:
mode:
Diffstat (limited to 'ShiftOS_TheReturn')
-rw-r--r--ShiftOS_TheReturn/SaveSystem.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index c8996d4..d1b92fd 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -214,13 +214,22 @@ namespace ShiftOS.Engine
savehandshake = (msg) =>
{
- ServerManager.MessageReceived -= savehandshake;
if (msg.Name == "mud_savefile")
{
- CurrentSave = JsonConvert.DeserializeObject<Save>(msg.Contents);
- }
+ ServerManager.MessageReceived -= savehandshake;
+ try
+ {
+ CurrentSave = JsonConvert.DeserializeObject<Save>(msg.Contents);
+ }
+ catch
+ {
+ Console.WriteLine("[system] [SEVERE] Cannot parse configuration file.");
+ oobe.PromptForLogin();
+ }
+ }
else if (msg.Name == "mud_login_denied")
{
+ ServerManager.MessageReceived -= savehandshake;
oobe.PromptForLogin();
}
};