Fix mind swap

v0idRift · Apr 1, 2024 · 5d32070 · 5d32070
1 parent fea2d20
commit 5d32070
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
@@ -65,6 +65,10 @@ protected override void Started(EntityUid uid, MassMindSwapRuleComponent compone
                 // Remove this actor from the pool of swap candidates before they go.
                 psionicPool.Remove(actor);
 
+                //if actor or other has MindSwappedComponent component then skip, if not that leads to stuck in body
+                if (HasComp<MindSwappedComponent>(actor) || HasComp<MindSwappedComponent>(other))
+                    continue;
+
                 // Do the swap.
                 _mindSwap.Swap(actor, other);
                 if (!component.IsTemporary)

diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -104,6 +104,7 @@
       glimmerBurnLower: 50
       glimmerBurnUpper: 110
     - type: MassMindSwapRule
+      isTemporary: true
 
 #- type: entity
 #  id: GlimmerWispSpawn