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

2
Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
View File

@@ -294,7 +294,7 @@ namespace Content.Server.Chemistry.EntitySystems
{
var reagentQuantity = FixedPoint2.New(0);
if (EntityManager.TryGetEntity(ownerUid, out var owner)
&& owner.TryGetComponent(out SolutionContainerManagerComponent? managerComponent))
&& IoCManager.Resolve<IEntityManager>().TryGetComponent(owner.Uid, out SolutionContainerManagerComponent? managerComponent))
{
foreach (var solution in managerComponent.Solutions.Values)
{

2
Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.Chemistry.EntitySystems
private void HandleInjection(EntityUid uid, SolutionInjectOnCollideComponent component, StartCollideEvent args)
{
if (!args.OtherFixture.Body.Owner.TryGetComponent<BloodstreamComponent>(out var bloodstream) ||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<BloodstreamComponent?>(args.OtherFixture.Body.Owner.Uid, out var bloodstream) ||
!_solutionsSystem.TryGetInjectableSolution(component.Owner.Uid, out var solution)) return;
var solRemoved = solution.SplitSolution(component.TransferAmount);

4
Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
View File

@@ -51,7 +51,7 @@ namespace Content.Server.Chemistry.EntitySystems
new SpriteSpecifier.Rsi(
new ResourcePath("Objects/Consumable/Drinks/" + proto.SpriteReplacementPath), "icon");
var ownerEntity = EntityManager.GetEntity(uid);
if (ownerEntity.TryGetComponent(out SpriteComponent? sprite))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(ownerEntity.Uid, out SpriteComponent? sprite))
{
sprite?.LayerSetSprite(0, spriteSpec);
}
@@ -68,7 +68,7 @@ namespace Content.Server.Chemistry.EntitySystems
component.CurrentReagent = null;
component.Transformed = false;
if (component.Owner.TryGetComponent(out SpriteComponent? sprite) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner.Uid, out SpriteComponent? sprite) &&
component.InitialSprite != null)
{
sprite.LayerSetSprite(0, component.InitialSprite);

2
Content.Server/Chemistry/EntitySystems/VaporSystem.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.Chemistry.EntitySystems
vapor.Target = target;
vapor.AliveTime = aliveTime;
// Set Move
if (vapor.Owner.TryGetComponent(out PhysicsComponent? physics))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(vapor.Owner.Uid, out PhysicsComponent? physics))
{
physics.BodyStatus = BodyStatus.InAir;
physics.ApplyLinearImpulse(dir * speed);