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

Traitor can no longer get multiple objectives to save/help/kill the same person (#33704)

Browse Source 
* Deduplicate traitor objectives

* Remove redundant check
This commit is contained in:
psykana
2024-12-28 15:49:03 +01:00
committed by GitHub
parent b24ab38992
commit 616d34102b
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
View File

@@ -6,6 +6,7 @@ using Content.Shared.Mind;
using Content.Shared.Objectives.Components;
using Robust.Shared.Configuration;
using Robust.Shared.Random;
using System.Linq;
namespace Content.Server.Objectives.Systems;
@@ -52,8 +53,18 @@ public sealed class KillPersonConditionSystem : EntitySystem
if (target.Target != null)
return;
// no other humans to kill
var allHumans = _mind.GetAliveHumans(args.MindId);
// Can't have multiple objectives to kill the same person
foreach (var objective in args.Mind.Objectives)
{
if (HasComp<KillPersonConditionComponent>(objective) && TryComp<TargetObjectiveComponent>(objective, out var kill))
{
allHumans.RemoveWhere(x => x.Owner == kill.Target);
}
}
// no other humans to kill
if (allHumans.Count == 0)
{
args.Cancelled = true;