aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Server
diff options
context:
space:
mode:
Diffstat (limited to 'ShiftOS.Server')
-rw-r--r--ShiftOS.Server/Program.cs4
-rw-r--r--ShiftOS.Server/SaveManager.cs24
2 files changed, 20 insertions, 8 deletions
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
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 { }
}
}