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/Shuttles/EntitySystems/ShuttleConsoleSystem.cs
View File

@@ -133,7 +133,7 @@ namespace Content.Server.Shuttles.EntitySystems
public void AddPilot(IEntity entity, ShuttleConsoleComponent component)
{
if (!_blocker.CanInteract(entity.Uid) ||
!entity.TryGetComponent(out PilotComponent? pilotComponent) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out PilotComponent? pilotComponent) ||
component.SubscribedPilots.Contains(pilotComponent))
{
return;
@@ -141,7 +141,7 @@ namespace Content.Server.Shuttles.EntitySystems
component.SubscribedPilots.Add(pilotComponent);
if (entity.TryGetComponent(out ServerAlertsComponent? alertsComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ServerAlertsComponent? alertsComponent))
{
alertsComponent.ShowAlert(AlertType.PilotingShuttle);
}
@@ -163,7 +163,7 @@ namespace Content.Server.Shuttles.EntitySystems
if (!helmsman.SubscribedPilots.Remove(pilotComponent)) return;
if (pilotComponent.Owner.TryGetComponent(out ServerAlertsComponent? alertsComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(pilotComponent.Owner.Uid, out ServerAlertsComponent? alertsComponent))
{
alertsComponent.ClearAlert(AlertType.PilotingShuttle);
}
@@ -176,7 +176,7 @@ namespace Content.Server.Shuttles.EntitySystems
public void RemovePilot(IEntity entity)
{
if (!entity.TryGetComponent(out PilotComponent? pilotComponent)) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out PilotComponent? pilotComponent)) return;
RemovePilot(pilotComponent);
}

6
Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
View File

@@ -62,7 +62,7 @@ namespace Content.Server.Shuttles.EntitySystems
return;
}
if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner.Uid, out PhysicsComponent? physicsComponent))
{
return;
}
@@ -75,7 +75,7 @@ namespace Content.Server.Shuttles.EntitySystems
public void Toggle(ShuttleComponent component)
{
if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent)) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner.Uid, out PhysicsComponent? physicsComponent)) return;
component.Enabled = !component.Enabled;
@@ -111,7 +111,7 @@ namespace Content.Server.Shuttles.EntitySystems
// None of the below is necessary for any cleanup if we're just deleting.
if (EntityManager.GetComponent<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating) return;
if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner.Uid, out PhysicsComponent? physicsComponent))
{
return;
}