fix

space-syndicate · Nov 22, 2023 · b1abfbe · b1abfbe
1 parent 18551d3
commit b1abfbe
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Content.Server/Corvax/EvilTwin/EvilTwinSystem.cs b/Content.Server/Corvax/EvilTwin/EvilTwinSystem.cs
@@ -12,6 +12,7 @@
 using Content.Server.Roles.Jobs;
 using Content.Server.Station.Systems;
 using Content.Shared.Humanoid;
+using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Objectives.Components;
 using Content.Shared.Objectives.Systems;
@@ -64,12 +65,11 @@ private void OnPlayerAttached(EntityUid uid, EvilTwinSpawnerComponent component,
             if (spawnedTwin != null &&
                 _mindSystem.TryGetMind(args.Player, out var mindId, out var mind))
             {
+                Del(uid);
                 mind.CharacterName = MetaData(spawnedTwin.Value).EntityName;
                 _mindSystem.TransferTo(mindId, spawnedTwin);
             }
         }
-
-        QueueDel(uid);
     }
 
     private void OnMindAdded(EntityUid uid, EvilTwinComponent component, MindAddedMessage args)
@@ -85,8 +85,8 @@ private void OnMindAdded(EntityUid uid, EvilTwinComponent component, MindAddedMe
         _roleSystem.MindAddRole(mindId, role, mind);
         _mindSystem.TryAddObjective(mindId, mind, EscapeObjective);
         _mindSystem.TryAddObjective(mindId, mind, KillObjective);
-        if (TryComp<TargetObjectiveComponent>(uid, out var targetObj))
-            _target.SetTarget(uid, evilTwin.TargetMindId, targetObj);
+        if (_mindSystem.TryGetObjectiveComp<TargetObjectiveComponent>(uid, out var obj))
+            _target.SetTarget(uid, evilTwin.TargetMindId, obj);
     }
 
     private void OnRoundEnd(RoundEndTextAppendEvent ev)