Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Replace IEntityManager resolves in systems for cached EntityManager

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 13:00:43 +01:00
parent 2699540526
commit c8b65be747
98 changed files with 338 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Movement/EntitySystems/SharedMobMoverSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Shared.Movement.EntitySystems
if (otherBody.BodyType != BodyType.Dynamic || !otherFixture.Hard) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(ourFixture.Body.Owner, out IMobMoverComponent? mobMover) || worldNormal == Vector2.Zero) return;
if (!EntityManager.TryGetComponent(ourFixture.Body.Owner, out IMobMoverComponent? mobMover) || worldNormal == Vector2.Zero) return;
otherBody.ApplyLinearImpulse(-worldNormal * mobMover.PushStrength * frameTime);
}

4
Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs
View File

@@ -82,10 +82,10 @@ namespace Content.Shared.Movement.EntitySystems
var ent = session?.AttachedEntity;
if (ent == null || !IoCManager.Resolve<IEntityManager>().EntityExists(ent.Value))
if (ent == null || !EntityManager.EntityExists(ent.Value))
return false;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(ent.Value, out T? comp))
if (!EntityManager.TryGetComponent(ent.Value, out T? comp))
return false;
component = comp;