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

Removes all dependencies on engine component events. (#4199)

Browse Source
This commit is contained in:
Acruid
2021-06-18 01:49:18 -07:00
committed by GitHub
parent 9fea68707c
commit e1e54e9cb1
27 changed files with 235 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Content.Shared.GameTicking;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
namespace Content.Server.Suspicion.EntitySystems
@@ -12,6 +13,28 @@ namespace Content.Server.Suspicion.EntitySystems
public IReadOnlyCollection<SuspicionRoleComponent> Traitors => _traitors;
#region Overrides of EntitySystem
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<SuspicionRoleComponent, PlayerAttachedEvent>((HandlePlayerAttached));
SubscribeLocalEvent<SuspicionRoleComponent, PlayerDetachedEvent>((HandlePlayerDetached));
}
private void HandlePlayerDetached(EntityUid uid, SuspicionRoleComponent component, PlayerDetachedEvent args)
{
component.SyncRoles();
}
private void HandlePlayerAttached(EntityUid uid, SuspicionRoleComponent component, PlayerAttachedEvent args)
{
component.SyncRoles();
}
#endregion
public void AddTraitor(SuspicionRoleComponent role)
{
if (!_traitors.Add(role))

6
Content.Server/Suspicion/SuspicionRoleComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
@@ -168,10 +168,6 @@ namespace Content.Server.Suspicion
switch (message)
{
case PlayerAttachedMsg:
case PlayerDetachedMsg:
SyncRoles();
break;
case RoleAddedMessage {Role: SuspicionRole role}:
Role = role;
break;