diff --git a/Content.Client/Damage/DamageVisualizer.cs b/Content.Client/Damage/DamageVisualizer.cs index d2ef691bab..8ac706777b 100644 --- a/Content.Client/Damage/DamageVisualizer.cs +++ b/Content.Client/Damage/DamageVisualizer.cs @@ -195,15 +195,12 @@ namespace Content.Client.Damage public readonly string? Color; } - public DamageVisualizer() - { - IoCManager.InjectDependencies(this); - } - public override void InitializeEntity(EntityUid entity) { base.InitializeEntity(entity); + IoCManager.InjectDependencies(this); + var damageData = _entityManager.EnsureComponent(entity); VerifyVisualizerSetup(entity, damageData); if (damageData.Valid) diff --git a/Content.Client/Doors/AirlockVisualizer.cs b/Content.Client/Doors/AirlockVisualizer.cs index 235058f539..1ff5311f05 100644 --- a/Content.Client/Doors/AirlockVisualizer.cs +++ b/Content.Client/Doors/AirlockVisualizer.cs @@ -48,13 +48,10 @@ namespace Content.Client.Doors private Animation OpenAnimation = default!; private Animation DenyAnimation = default!; - public AirlockVisualizer() - { - IoCManager.InjectDependencies(this); - } - void ISerializationHooks.AfterDeserialization() { + IoCManager.InjectDependencies(this); + CloseAnimation = new Animation {Length = TimeSpan.FromSeconds(_delay)}; { var flick = new AnimationTrackSpriteFlick(); diff --git a/Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs b/Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs index 0f71faff27..7932ef539f 100644 --- a/Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs +++ b/Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs @@ -25,7 +25,6 @@ namespace Content.Client.Lathe.Visualizers public AutolatheVisualizer() { - IoCManager.InjectDependencies(this); _buildingAnimation = PopulateAnimation("building", "building_unlit", 0.5f); _insertingMetalAnimation = PopulateAnimation("inserting_metal", "inserting_unlit", 0.5f); _insertingGlassAnimation = PopulateAnimation("inserting_glass", "inserting_unlit", 0.5f); @@ -53,10 +52,9 @@ namespace Content.Client.Lathe.Visualizers public override void InitializeEntity(EntityUid entity) { - if (!_entMan.HasComponent(entity)) - { - _entMan.AddComponent(entity); - } + IoCManager.InjectDependencies(this); + + _entMan.EnsureComponent(entity); } public override void OnChangeData(AppearanceComponent component) diff --git a/Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs b/Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs index 99cc80ffc5..ccce03886b 100644 --- a/Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs +++ b/Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs @@ -25,8 +25,6 @@ namespace Content.Client.Lathe.Visualizers public ProtolatheVisualizer() { - IoCManager.InjectDependencies(this); - _buildingAnimation = PopulateAnimation("building", "building_unlit", 0.8f); _insertingMetalAnimation = PopulateAnimation("inserting_metal", "inserting_unlit", 0.8f); _insertingGlassAnimation = PopulateAnimation("inserting_glass", "inserting_unlit", 0.8f); @@ -54,10 +52,9 @@ namespace Content.Client.Lathe.Visualizers public override void InitializeEntity(EntityUid entity) { - if (!_entMan.HasComponent(entity)) - { - _entMan.AddComponent(entity); - } + IoCManager.InjectDependencies(this); + + _entMan.EnsureComponent(entity); } public override void OnChangeData(AppearanceComponent component)