Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

5
Content.Server/StationEvents/Events/MeteorSwarm.cs
View File

@@ -13,7 +13,6 @@ namespace Content.Server.StationEvents.Events
{
public sealed class MeteorSwarm : StationEvent
{
[Dependency] private readonly IComponentManager _compManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
@@ -90,7 +89,7 @@ namespace Content.Server.StationEvents.Events
foreach (var grid in _mapManager.GetAllGrids())
{
if (grid.ParentMapId != mapId || !_compManager.TryGetComponent(grid.GridEntityId, out PhysicsComponent? gridBody)) continue;
if (grid.ParentMapId != mapId || !_entityManager.TryGetComponent(grid.GridEntityId, out PhysicsComponent? gridBody)) continue;
var aabb = gridBody.GetWorldAABB();
playableArea = playableArea?.Union(aabb) ?? aabb;
}
@@ -112,7 +111,7 @@ namespace Content.Server.StationEvents.Events
var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * _robustRandom.NextFloat() + minimumDistance, 0));
var spawnPosition = new MapCoordinates(center + offset, mapId);
var meteor = _entityManager.SpawnEntity("MeteorLarge", spawnPosition);
var physics = _compManager.GetComponent<PhysicsComponent>(meteor.Uid);
var physics = _entityManager.GetComponent<PhysicsComponent>(meteor.Uid);
physics.BodyStatus = BodyStatus.InAir;
physics.ApplyLinearImpulse(-offset.Normalized * MeteorVelocity * physics.Mass);
physics.ApplyAngularImpulse(

4
Content.Server/StationEvents/Events/PowerGridCheck.cs
View File

@@ -38,9 +38,9 @@ namespace Content.Server.StationEvents.Events
public override void Startup()
{
var componentManager = IoCManager.Resolve<IComponentManager>();
var entityManager = IoCManager.Resolve<IEntityManager>();
foreach (var component in componentManager.EntityQuery<ApcPowerReceiverComponent>(true))
foreach (var component in entityManager.EntityQuery<ApcPowerReceiverComponent>(true))
{
component.PowerDisabled = true;
_powered.Add(component.Owner);