Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Change some data definitions to not do IoC resolve in their constructors.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2021-09-01 13:23:52 +02:00
parent bf9d60ae0f
commit a3fc00dc29
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Light/Components/LightBehaviourComponent.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.Light.Components
[ImplicitDataDefinitionForInheritors]
public abstract class LightBehaviourAnimationTrack : AnimationTrackProperty
{
protected readonly IRobustRandom _random = IoCManager.Resolve<IRobustRandom>();
protected IRobustRandom _random = default!;
[DataField("id")] [ViewVariables] public string ID { get; set; } = string.Empty;
@@ -53,8 +53,9 @@ namespace Content.Client.Light.Components
private float _maxTime = default;
private IEntity _parent = default!;
public void Initialize(IEntity parent)
public void Initialize(IEntity parent, IRobustRandom random)
{
_random = random;
_parent = parent;
if (Enabled && _parent.TryGetComponent(out PointLightComponent? light))
@@ -399,7 +400,7 @@ namespace Content.Client.Light.Components
foreach (var container in _animations)
{
container.LightBehaviour.Initialize(Owner);
container.LightBehaviour.Initialize(Owner, IoCManager.Resolve<IRobustRandom>());
}
// we need to initialize all behaviours before starting any
@@ -541,7 +542,7 @@ namespace Content.Client.Light.Components
AnimationTracks = {behaviour}
};
behaviour.Initialize(Owner);
behaviour.Initialize(Owner, IoCManager.Resolve<IRobustRandom>());
var container = new AnimationContainer(key, animation, behaviour);
_animations.Add(container);