From a05cebba57403f326ec868378fc15053e62948eb Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Sun, 26 Feb 2017 18:09:59 +0000 Subject: more fixes --- ShiftOS.Server/SaveManager.cs | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'ShiftOS.Server') diff --git a/ShiftOS.Server/SaveManager.cs b/ShiftOS.Server/SaveManager.cs index 58634d1..cef8b37 100644 --- a/ShiftOS.Server/SaveManager.cs +++ b/ShiftOS.Server/SaveManager.cs @@ -85,19 +85,27 @@ namespace ShiftOS.Server } catch { } } - Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + try { - Name = "mud_login_denied", - GUID = "server" - })); + Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + { + Name = "mud_login_denied", + GUID = "server" + })); + } + catch { } } else { - Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + try { - Name = "mud_login_denied", - GUID = "server" - })); + Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + { + Name = "mud_login_denied", + GUID = "server" + })); + } + catch { } } } -- cgit v1.2.3 From 0e3362e8e3c635150d92fd5acc9d69473ec588fc Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Sun, 26 Feb 2017 20:09:32 +0000 Subject: fix bug with string messages --- ShiftOS.Server/Program.cs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ShiftOS.Server') diff --git a/ShiftOS.Server/Program.cs b/ShiftOS.Server/Program.cs index 016e1bf..04d7b2e 100644 --- a/ShiftOS.Server/Program.cs +++ b/ShiftOS.Server/Program.cs @@ -331,6 +331,10 @@ namespace ShiftOS.Server { throwOnNull = false; } + else if(mAttrib.ExpectedType == typeof(string)) + { + contents = msg.Contents; + } else { //object type -- cgit v1.2.3