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:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user