okay

space-sunrise · Nov 17, 2024 · 795dcce · 795dcce
1 parent fb79ffa
commit 795dcce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -12,7 +12,6 @@
 using Content.Server.Roles;
 using Content.Server.Roles.Jobs;
 using Content.Server.Shuttles.Components;
-using Content.Server.Bible.Components;  // Sunrise-Vampire
 using Content.Shared.Antag;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
@@ -507,11 +506,6 @@ public bool IsEntityValid(EntityUid? entity, AntagSelectionDefinition def)
         if (entity == null)
             return true;
 
-        // Sunrise-Vampire-Start
-        if (def.PrefRoles.Any(role => role == "Vampire") && HasComp<BibleUserComponent>(entity.Value))
-            return false;
-        // Sunrise-Vampire-End
-
         if (HasComp<PendingClockInComponent>(entity))
             return false;
 

diff --git a/Content.Server/GameTicking/Rules/VampireRuleSystem.cs b/Content.Server/GameTicking/Rules/VampireRuleSystem.cs
@@ -5,6 +5,7 @@
 using Content.Server.Objectives;
 using Content.Server.Roles;
 using Content.Server.Vampire;
+using Content.Server.Bible.Components; 
 using Content.Shared.Alert;
 using Content.Shared.Vampire.Components;
 using Content.Shared.NPC.Prototypes;
@@ -48,14 +49,17 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<VampireRuleComponent, GetBriefingEvent>(OnGetBriefing);
-
         SubscribeLocalEvent<VampireRuleComponent, AfterAntagEntitySelectedEvent>(OnSelectAntag);
         SubscribeLocalEvent<VampireRuleComponent, ObjectivesTextPrependEvent>(OnTextPrepend);
     }
 
     private void OnSelectAntag(EntityUid mindId, VampireRuleComponent comp, ref AfterAntagEntitySelectedEvent args)
     {
         var ent = args.EntityUid;
+
+        if (HasComp<BibleUserComponent>(ent))
+            return;
+
         _antag.SendBriefing(ent, MakeBriefing(ent), Color.Yellow, BriefingSound);
         MakeVampire(ent, comp);
     }