Don't add trait comps if present (#16424)

diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 114c0ea914e0784370f2befff8433186acbb31d8..91b0d6caea878d9d02694a35b46d6f74f538472c 100644 (file)
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -40,6 +40,9 @@ public sealed class TraitSystem : EntitySystem
             // Add all components required by the prototype
             foreach (var entry in traitPrototype.Components.Values)
             {
+                if (HasComp(args.Mob, entry.Component.GetType()))
+                    continue;
+
                 var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true);
                 comp.Owner = args.Mob;
                 EntityManager.AddComponent(args.Mob, comp);