From: Tayrtahn <tayrtahn@gmail.com>
Date: Wed, 19 Mar 2025 16:11:53 +0000 (-0400)
Subject: Fix artifacts swapping places with ghosts (#35074)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=398d92a0645d26559292b7a891790c43c50c3182;p=space-station-14.git

Fix artifacts swapping places with ghosts (#35074)

* Prevent artifacts swapping position with ghosts

* Filter for MobStateComponent instead

* Update Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs

* bluh
---

diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs
index b1a08fb505..810d56e89b 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/PortalArtifactSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
 using Content.Shared.Mind.Components;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Teleportation.Systems;
 using Robust.Shared.Collections;
 using Robust.Shared.Containers;
@@ -25,8 +26,8 @@ public sealed class PortalArtifactSystem : EntitySystem
     {
         var map = Transform(artifact).MapID;
         var validMinds = new ValueList<EntityUid>();
-        var mindQuery = EntityQueryEnumerator<MindContainerComponent, TransformComponent, MetaDataComponent>();
-        while (mindQuery.MoveNext(out var uid, out var mc, out var xform, out var meta))
+        var mindQuery = EntityQueryEnumerator<MindContainerComponent, MobStateComponent, TransformComponent, MetaDataComponent>();
+        while (mindQuery.MoveNext(out var uid, out var mc, out _, out var xform, out var meta))
         {
             // check if the MindContainer has a Mind and if the entity is not in a container (this also auto excludes AI) and if they are on the same map
             if (mc.HasMind && !_container.IsEntityOrParentInContainer(uid, meta: meta, xform: xform) && xform.MapID == map)