tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

4
Content.Shared/Examine/ExamineSystemShared.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Shared.Examine
[Pure]
public virtual bool CanExamine(IEntity examiner, MapCoordinates target, Ignored? predicate = null)
{
if (!examiner.TryGetComponent(out ExaminerComponent? examinerComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(examiner.Uid, out ExaminerComponent? examinerComponent))
return false;
if (!examinerComponent.DoRangeCheck)
@@ -128,7 +128,7 @@ namespace Content.Shared.Examine
foreach (var result in rayResults)
{
if (!result.HitEntity.TryGetComponent(out OccluderComponent? o))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(result.HitEntity.Uid, out OccluderComponent? o))
{
continue;
}