space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes struct instantiation (#3129)

Browse Source
This commit is contained in:
Paul Ritter
2022-08-14 01:34:51 +02:00
committed by GitHub
parent f16d41704b
commit bbabee3949
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Robust.Shared/Serialization/Manager/SerializationManager.Instantiation.cs
View File

@@ -22,40 +22,26 @@ namespace Robust.Shared.Serialization.Manager
var generator = method.GetILGenerator();
if (type.IsValueType)
var constructor = type.GetConstructor(Type.EmptyTypes);
if (constructor == null)
{
if (!type.IsValueType) return null;
generator.DeclareLocal(type);
generator.DeclareLocal(typeof(object));
generator.Emit(OpCodes.Ldloca_S, 0);
generator.Emit(OpCodes.Initobj, type);
generator.Emit(OpCodes.Ldloc_0);
generator.Emit(OpCodes.Box, type);
generator.Emit(OpCodes.Stloc_1);
generator.Emit(OpCodes.Ldloc_1);
generator.Emit(OpCodes.Ret);
}
else
{
generator.DeclareLocal(typeof(object));
var constructor = type.GetConstructor(Type.EmptyTypes);
if (constructor == null)
{
return null;
}
generator.Emit(OpCodes.Newobj, constructor);
generator.Emit(OpCodes.Stloc_0);
generator.Emit(OpCodes.Ldloc_0);
generator.Emit(OpCodes.Ret);
}
if (type.IsValueType)
generator.Emit(OpCodes.Box, type);
generator.Emit(OpCodes.Ret);
return method.CreateDelegate<InstantiationDelegate<object>>();
});
}

3
Robust.Shared/Serialization/Manager/SerializationManager.Reading.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Runtime.CompilerServices;
using Robust.Shared.Serialization.Manager.Definition;
@@ -25,7 +26,7 @@ namespace Robust.Shared.Serialization.Manager
public T Read<T>(DataNode node, ISerializationContext? context = null, bool skipHook = false, T? value = default) //todo paul this default should be null
{
return (T)Read(typeof(T), node, context, skipHook, value)!;
return (T)Read(typeof(T), node, context, skipHook, EqualityComparer<T>.Default.Equals(value, default) ? null : value)!;
}
public object? Read(Type type, DataNode node, ISerializationContext? context = null, bool skipHook = false, object? value = null)