mirror of
https://github.com/space-wizards/RobustToolbox.git
synced 2026-02-15 03:30:53 +01:00
Decimal reagents requirements (#1018)
This commit is contained in:
@@ -166,11 +166,11 @@ namespace Robust.Shared.IoC
|
||||
/// Thrown if a dependency field on the object is not registered.
|
||||
/// </exception>
|
||||
/// <seealso cref="BuildGraph"/>
|
||||
public static void InjectDependencies(object obj)
|
||||
public static T InjectDependencies<T>(T obj)
|
||||
{
|
||||
DebugTools.Assert(_container.IsValueCreated, NoContextAssert);
|
||||
|
||||
_container.Value.InjectDependencies(obj);
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -467,7 +467,7 @@ namespace Robust.Shared.Serialization
|
||||
return node.ToString();
|
||||
|
||||
// val primitives
|
||||
if (type.IsPrimitive)
|
||||
if (type.IsPrimitive || type == typeof(decimal))
|
||||
return StringToType(type, node.ToString());
|
||||
|
||||
// val enum
|
||||
|
||||
Reference in New Issue
Block a user