Inline TryGetComponent completely, for real

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

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;
}