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

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Singularity/Components/ContainmentFieldComponent.cs
View File

@@ -1,6 +1,7 @@
using Content.Shared.Singularity.Components;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
namespace Content.Client.Singularity.Components
@@ -17,7 +18,7 @@ namespace Content.Client.Singularity.Components
{
base.Initialize();
if (!Owner.TryGetComponent(out _spriteComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out _spriteComponent))
{
Logger.Error($"{nameof(ContainmentFieldComponent)} created without {nameof(SpriteComponent)}");
}

2
Content.Client/Singularity/SingularityOverlay.cs
View File

@@ -95,7 +95,7 @@ namespace Content.Client.Singularity
}
else
{
if (!singuloEntity.TryGetComponent<SingularityDistortionComponent>(out var distortion))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SingularityDistortionComponent?>(singuloEntity.Uid, out var distortion))
{
_singularities.Remove(activeSinguloUid);
}