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

Gets rid of all ComponentManager usages. (#4707)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-09-28 13:35:29 +02:00
committed by GitHub
parent 7953e5b962
commit 0be5ff829b
158 changed files with 321 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
View File

@@ -68,11 +68,11 @@ namespace Content.Server.Chemistry.Components
var coords = Owner.Transform.Coordinates;
foreach (var neighbor in grid.GetInDir(coords, dir))
{
if (Owner.EntityManager.ComponentManager.TryGetComponent(neighbor,
if (Owner.EntityManager.TryGetComponent(neighbor,
out SolutionAreaEffectComponent? comp) && comp.Inception == Inception)
return;
if (Owner.EntityManager.ComponentManager.TryGetComponent(neighbor,
if (Owner.EntityManager.TryGetComponent(neighbor,
out AirtightComponent? airtight) && airtight.AirBlocked)
return;
}

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

@@ -10,7 +10,7 @@ namespace Content.Server.Chemistry.EntitySystems
{
public override void Update(float frameTime)
{
foreach (var inception in ComponentManager.EntityQuery<SolutionAreaEffectInceptionComponent>().ToArray())
foreach (var inception in EntityManager.EntityQuery<SolutionAreaEffectInceptionComponent>().ToArray())
{
inception.InceptionUpdate(frameTime);
}

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

@@ -32,7 +32,7 @@ namespace Content.Server.Chemistry.EntitySystems
private void HandleCollide(EntityUid uid, VaporComponent component, StartCollideEvent args)
{
if (!ComponentManager.TryGetComponent(uid, out SolutionContainerManagerComponent? contents)) return;
if (!EntityManager.TryGetComponent(uid, out SolutionContainerManagerComponent? contents)) return;
foreach (var (_, value) in contents.Solutions)
{
@@ -77,7 +77,7 @@ namespace Content.Server.Chemistry.EntitySystems
public override void Update(float frameTime)
{
foreach (var (vaporComp, solution) in ComponentManager
foreach (var (vaporComp, solution) in EntityManager
.EntityQuery<VaporComponent, SolutionContainerManagerComponent>(true))
{
foreach (var (_, value) in solution.Solutions)