DreamValue json serialization for null

Hinaichigo · Jul 5, 2021 · ebde35b · ebde35b
1 parent 43e68a2
commit ebde35b
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/OpenDreamRuntime/DreamValue.cs b/OpenDreamRuntime/DreamValue.cs
@@ -314,6 +314,7 @@ public override void Write(Utf8JsonWriter writer, DreamValue value, JsonSerializ
             switch (value.Type) {
                 case DreamValue.DreamValueType.String: writer.WriteString("Value", (string)value.Value); break;
                 case DreamValue.DreamValueType.Float: writer.WriteNumber("Value", (float)value.Value); break;
+                case DreamValue.DreamValueType.DreamObject when value == DreamValue.Null: writer.WriteNull("Value"); break;
                 default: throw new NotImplementedException("Json serialization for " + value + " is not implemented");
             }
 
@@ -336,6 +337,15 @@ public override DreamValue Read(ref Utf8JsonReader reader, Type typeToConvert, J
             switch (type) {
                 case DreamValue.DreamValueType.String: value = new DreamValue(reader.GetString()); break;
                 case DreamValue.DreamValueType.Float: value = new DreamValue((float)reader.GetSingle()); break;
+                case DreamValue.DreamValueType.DreamObject when reader.TokenType == JsonTokenType.Null: {
+                    if (reader.TokenType == JsonTokenType.Null) {
+                        value = DreamValue.Null;
+                    } else {
+                        throw new NotImplementedException("Json deserialization for DreamObjects are not implemented");
+                    }
+
+                    break;
+                }
                 default: throw new NotImplementedException("Json deserialization for type " + type + " is not implemented");
             }
             reader.Read();