tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] move ninja objectives into NinjaRole (#15490)

Browse Source 
Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-04-17 22:32:05 +00:00
committed by GitHub
parent 60559ad1c1
commit 251f429fb3
15 changed files with 276 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Objectives/Conditions/TerrorCondition.cs
View File

@@ -1,5 +1,5 @@
using Content.Server.Ninja.Systems;
using Content.Server.Objectives.Interfaces;
using Content.Shared.Ninja.Components;
using Robust.Shared.Utility;
namespace Content.Server.Objectives.Conditions;
@@ -24,12 +24,10 @@ public sealed class TerrorCondition : IObjectiveCondition
{
get
{
var entMan = IoCManager.Resolve<IEntityManager>();
if (_mind?.OwnedEntity == null
|| !entMan.TryGetComponent<NinjaComponent>(_mind.OwnedEntity, out var ninja))
if (!NinjaSystem.GetNinjaRole(_mind, out var role))
return 0f;
return ninja.CalledInThreat ? 1f : 0f;
return role.CalledInThreat ? 1f : 0f;
}
}