tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

6
Content.Server/Tabletop/TabletopSystem.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Server.Tabletop
private void OnTabletopActivate(EntityUid uid, TabletopGameComponent component, ActivateInWorldEvent args)
{
// Check that a player is attached to the entity.
if (!ComponentManager.TryGetComponent(args.User.Uid, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User.Uid, out ActorComponent? actor))
return;
// Check that the entity can interact with the game board.
@@ -62,7 +62,7 @@ namespace Content.Server.Tabletop
private void OnGamerShutdown(EntityUid uid, TabletopGamerComponent component, ComponentShutdown args)
{
if (!ComponentManager.TryGetComponent(uid, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(uid, out ActorComponent? actor))
return;
if(component.Tabletop.IsValid())
@@ -73,7 +73,7 @@ namespace Content.Server.Tabletop
{
base.Update(frameTime);
foreach (var gamer in ComponentManager.EntityQuery<TabletopGamerComponent>(true))
foreach (var gamer in EntityManager.EntityQuery<TabletopGamerComponent>(true))
{
if (!EntityManager.TryGetEntity(gamer.Tabletop, out var table))
continue;