Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

This commit is contained in:
lempamo 2017-02-26 15:15:38 -05:00
commit 705d1daefa

View file

@ -331,6 +331,10 @@ namespace ShiftOS.Server
{
throwOnNull = false;
}
else if(mAttrib.ExpectedType == typeof(string))
{
contents = msg.Contents;
}
else
{
//object type