From 30259e7234decc0d43ccb1c45042432590b2b36f Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 16 Sep 2023 22:25:56 +0100
Subject: [PATCH] make objective blacklist work (#20256)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../Systems/ObjectiveBlacklistRequirementSystem.cs     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
index 5318b2e454..56b245ce84 100644
--- a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
+++ b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
@@ -20,7 +20,13 @@ public sealed class ObjectiveBlacklistRequirementSystem : EntitySystem
         if (args.Cancelled)
             return;
 
-        if (comp.Blacklist.IsValid(uid, EntityManager))
-            args.Cancelled = true;
+        foreach (var objective in args.Mind.AllObjectives)
+        {
+            if (comp.Blacklist.IsValid(objective, EntityManager))
+            {
+                args.Cancelled = true;
+                return;
+            }
+        }
     }
 }
-- 
2.51.2