fix conversion remove roles (#220)

Co-authored-by: Doublechest <twin01v@gmail.com>
Space-Stories · Nov 2, 2024 · f7b36f8 · f7b36f8
1 parent fb1866b
commit f7b36f8
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/Content.Server/Stories/Conversion/ConversionSystem.API.cs b/Content.Server/Stories/Conversion/ConversionSystem.API.cs
@@ -3,11 +3,12 @@
 using Content.Shared.Stories.Conversion;
 using Robust.Shared.Prototypes;
 using Content.Server.Radio.Components;
-using Content.Shared.Database;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Content.Server.Stories.Conversion;
 
+// TODO: Move to shared
 public sealed partial class ConversionSystem
 {
     public HashSet<EntityUid> GetEntitiesConvertedBy(EntityUid? uid, ProtoId<ConversionPrototype> prototype)
@@ -138,21 +139,31 @@ public void MindRemoveRoles(EntityUid mindId, List<ProtoId<EntityPrototype>>? ro
         if (roles == null)
             return;
 
-        mind.MindRoles?.ForEach((mindRole) =>
+        var rolesUid = mind.MindRoles.Where((role) => EntityPrototyped(role, roles)).ToList();
+
+        rolesUid.ForEach((mindRole) =>
         {
-            var proto = MetaData(mindRole).EntityPrototype;
-            if (proto != null && roles.Contains(proto))
-            {
-                var antagonist = Comp<MindRoleComponent>(mindRole).Antag;
+            var antagonist = Comp<MindRoleComponent>(mindRole).Antag;
 
-                QueueDel(mindRole);
-                mind.MindRoles.Remove(mindRole);
+            QueueDel(mindRole);
 
-                var message = new RoleRemovedEvent(mindId, mind, antagonist);
+            mind.MindRoles.Remove(mindRole);
 
-                if (mind.OwnedEntity != null)
-                    RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
-            }
+            var message = new RoleRemovedEvent(mindId, mind, antagonist);
+
+            if (mind.OwnedEntity != null)
+                RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
         });
+
+        mind.MindRoles?.Clear();
+    }
+    public bool EntityPrototyped(EntityUid role, List<ProtoId<EntityPrototype>> roles)
+    {
+        var proto = MetaData(role).EntityPrototype;
+
+        if (proto == null)
+            return false;
+
+        return roles.Contains(proto);
     }
 }