Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

8
Content.Server/Conveyor/ConveyorSystem.cs
View File

@@ -42,9 +42,9 @@ namespace Content.Server.Conveyor
private void UpdateAppearance(ConveyorComponent component)
{
if (component.Owner.TryGetComponent<AppearanceComponent>(out var appearance))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<AppearanceComponent?>(component.Owner.Uid, out var appearance))
{
if (component.Owner.TryGetComponent<ApcPowerReceiverComponent>(out var receiver) && receiver.Powered)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ApcPowerReceiverComponent?>(component.Owner.Uid, out var receiver) && receiver.Powered)
{
appearance.SetData(ConveyorVisuals.State, component.State);
}
@@ -100,7 +100,7 @@ namespace Content.Server.Conveyor
return false;
}
if (component.Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner.Uid, out ApcPowerReceiverComponent? receiver) &&
!receiver.Powered)
{
return false;
@@ -144,7 +144,7 @@ namespace Content.Server.Conveyor
continue;
}
if (!entity.TryGetComponent(out IPhysBody? physics) ||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IPhysBody? physics) ||
physics.BodyType == BodyType.Static || physics.BodyStatus == BodyStatus.InAir || entity.IsWeightless())
{
continue;