From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Date: Fri, 9 May 2025 15:46:10 +0000 (+0300)
Subject: Fix: Make ``IdBindComponent`` change ID card on ``MapInitEvent`` (#37300)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=239c71d7b8babcedcf013706ef5a634cd39a47b1;p=space-station-14.git

Fix: Make ``IdBindComponent`` change ID card on ``MapInitEvent`` (#37300)

Fix
---

diff --git a/Content.Server/Access/Systems/IdBindSystem.cs b/Content.Server/Access/Systems/IdBindSystem.cs
index 275a96f4f3..aadd97676f 100644
--- a/Content.Server/Access/Systems/IdBindSystem.cs
+++ b/Content.Server/Access/Systems/IdBindSystem.cs
@@ -1,9 +1,8 @@
 using Content.Server.Access.Components;
+using Content.Server.Humanoid.Systems;
 using Content.Server.PDA;
 using Content.Shared.Inventory;
-using Content.Shared.Mind.Components;
 using Content.Shared.PDA;
-using Content.Shared.Roles;
 
 namespace Content.Server.Access.Systems;
 
@@ -17,10 +16,10 @@ public sealed class IdBindSystem : EntitySystem
     {
         base.Initialize();
         //Activate on mind being added
-        SubscribeLocalEvent<IdBindComponent, MindAddedMessage>(TryBind);
+        SubscribeLocalEvent<IdBindComponent, MapInitEvent>(TryBind, after: [typeof(RandomHumanoidSystem)]);
     }
 
-    private void TryBind(Entity<IdBindComponent> ent, ref MindAddedMessage args)
+    private void TryBind(Entity<IdBindComponent> ent, ref MapInitEvent args)
     {
         if (!_cardSystem.TryFindIdCard(ent, out var cardId))
             return;
@@ -31,9 +30,9 @@ public sealed class IdBindSystem : EntitySystem
 
         if (!ent.Comp.BindPDAOwner)
         {
-			//Remove after running once
-			RemCompDeferred<IdBindComponent>(ent);
-			return;
+            //Remove after running once
+            RemCompDeferred<IdBindComponent>(ent);
+            return;
         }
 
         //Get PDA from main slot and set us as owner