aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Server/Program.cs
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-02-26 15:15:38 -0500
committerlempamo <[email protected]>2017-02-26 15:15:38 -0500
commit705d1daefa607d3d3a23da5590c262d8f6f69d70 (patch)
tree3f21e05f0567ada272674df753abd85bd2160400 /ShiftOS.Server/Program.cs
parentc49c7ac9c68a1815910a80afc45b43e05009137f (diff)
parent0e3362e8e3c635150d92fd5acc9d69473ec588fc (diff)
downloadshiftos_thereturn-705d1daefa607d3d3a23da5590c262d8f6f69d70.tar.gz
shiftos_thereturn-705d1daefa607d3d3a23da5590c262d8f6f69d70.tar.bz2
shiftos_thereturn-705d1daefa607d3d3a23da5590c262d8f6f69d70.zip
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS.Server/Program.cs')
-rw-r--r--ShiftOS.Server/Program.cs4
1 files changed, 4 insertions, 0 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