Refactor minds to be entities with components, make roles components (#19591)

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
DrSmugleaf
2023-08-28 16:53:24 -07:00
committed by GitHub
parent e0ee397af7
commit 15c0211fb2
119 changed files with 1445 additions and 1289 deletions

View File

@@ -1,7 +1,7 @@
using Content.Server.Mind;
using Content.Server.Objectives.Interfaces;
using Content.Server.Roles;
using JetBrains.Annotations;
using TraitorRole = Content.Server.Roles.TraitorRole;
namespace Content.Server.Objectives.Requirements
{
@@ -9,11 +9,10 @@ namespace Content.Server.Objectives.Requirements
[DataDefinition]
public sealed partial class TraitorRequirement : IObjectiveRequirement
{
public bool CanBeAssigned(Mind.Mind mind)
public bool CanBeAssigned(EntityUid mindId, MindComponent mind)
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var mindSystem = entityManager.System<MindSystem>();
return mindSystem.HasRole<TraitorRole>(mind);
var roleSystem = IoCManager.Resolve<IEntityManager>().System<RoleSystem>();
return roleSystem.MindHasRole<TraitorRoleComponent>(mindId);
}
}
}