diff options
| author | Michael <[email protected]> | 2017-05-29 16:08:59 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-05-29 16:08:59 -0400 |
| commit | ff47625d2547deed441a853569f9fe84197e23b6 (patch) | |
| tree | b243f3c0cd0202f98e59e4b69ac9f318af95ded3 /ShiftOS_TheReturn | |
| parent | 505073b6938fc8be8b91807a69bd67e45ed4382f (diff) | |
| download | shiftos_thereturn-ff47625d2547deed441a853569f9fe84197e23b6.tar.gz shiftos_thereturn-ff47625d2547deed441a853569f9fe84197e23b6.tar.bz2 shiftos_thereturn-ff47625d2547deed441a853569f9fe84197e23b6.zip | |
fix some clientside save softlocks
Diffstat (limited to 'ShiftOS_TheReturn')
| -rw-r--r-- | ShiftOS_TheReturn/SaveSystem.cs | 15 |
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(); } }; |