Remove obsolete occurrences of IComponent.Owner being assigned just before AddCompone...

diff --git a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
index 4e95eabff04cbdf39d21d713cac27ba4a1b7eb57..89950edf8c094fa50f3c1cc4a5b3798eb4394f01 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
@@ -30,13 +30,12 @@ public sealed class TwoStageTriggerSystem : EntitySystem
     {
         foreach (var (name, entry) in component.SecondStageComponents)
         {
-            var comp = (Component) _factory.GetComponent(name);
-            var temp = (object) comp;
+            var comp = (Component)_factory.GetComponent(name);
+            var temp = (object)comp;
 
             if (EntityManager.TryGetComponent(uid, entry.Component.GetType(), out var c))
                 RemComp(uid, c);
 
-            comp.Owner = uid;
             _serializationManager.CopyTo(entry.Component, ref temp);
             EntityManager.AddComponent(uid, comp);
         }

diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
index 872df8eae891692f9718ddf42cf086084457f875..fc0e47b033d90adb9b299fa34f782d5c0dbcf269 100644 (file)
--- a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
+++ b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs
@@ -50,8 +50,7 @@ public sealed class RandomHumanoidSystem : EntitySystem
         {
             foreach (var entry in prototype.Components.Values)
             {
-                var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true);
-                comp.Owner = humanoid; // This .owner must survive for now.
+                var comp = (Component)_serialization.CreateCopy(entry.Component, notNullableOverride: true);
                 EntityManager.RemoveComponent(humanoid, comp.GetType());
                 EntityManager.AddComponent(humanoid, comp);
             }

diff --git a/Content.Server/Jobs/AddComponentSpecial.cs b/Content.Server/Jobs/AddComponentSpecial.cs
index c57d73435436d55b67f85365afe886dce0e474c5..6489068d1fb7cff5dad568577c905a07e01068ca 100644 (file)
--- a/Content.Server/Jobs/AddComponentSpecial.cs
+++ b/Content.Server/Jobs/AddComponentSpecial.cs
@@ -23,12 +23,11 @@ namespace Content.Server.Jobs
             foreach (var (name, data) in Components)
             {
                 var component = (Component) factory.GetComponent(name);
-                component.Owner = mob;
 
-                var temp = (object) component;
+                var temp = (object)component;
                 serializationManager.CopyTo(data.Component, ref temp);
                 entityManager.RemoveComponent(mob, temp!.GetType());
-                entityManager.AddComponent(mob, (Component) temp);
+                entityManager.AddComponent(mob, (Component)temp);
             }
         }
     }

diff --git a/Content.Server/Worldgen/Prototypes/BiomePrototype.cs b/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
index db1b5e2a160956f1df7f639b729224bd1e8f706a..1cecf87a5e0e63a1565c511c4a8e18dcaf60220f 100644 (file)
--- a/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
+++ b/Content.Server/Worldgen/Prototypes/BiomePrototype.cs
@@ -54,7 +54,6 @@ public sealed partial class BiomePrototype : IPrototype, IInheritingPrototype
         foreach (var data in ChunkComponents.Values)
         {
             var comp = (Component) serialization.CreateCopy(data.Component, notNullableOverride: true);
-            comp.Owner = target; // look im sorry ok this .owner has to live until engine api exists
             entityManager.AddComponent(target, comp);
         }
     }

diff --git a/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs b/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs
index 49e9e1ed9d2e1d87aa5be9b5ebc5f995e17aed7e..f669377abbc43798bf04e49527ea8b1c1d361e65 100644 (file)
--- a/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs
+++ b/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs
@@ -30,7 +30,6 @@ public sealed partial class WorldgenConfigPrototype : IPrototype
         foreach (var data in Components.Values)
         {
             var comp = (Component) serialization.CreateCopy(data.Component, notNullableOverride: true);
-            comp.Owner = target; // look im sorry ok this .owner has to live until engine api exists
             entityManager.AddComponent(target, comp);
         }
     }

diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
index 65aaabdf0e957ff392a9ec8a082cb23ea8ce462c..a0e8420011fca538d0607e8673b11ccd5feeb696 100644 (file)
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
@@ -182,13 +182,12 @@ public sealed partial class ArtifactSystem
                 EntityManager.RemoveComponent(uid, reg.Type);
             }
 
-            var comp = (Component) _componentFactory.GetComponent(reg);
-            comp.Owner = uid;
+            var comp = (Component)_componentFactory.GetComponent(reg);
 
-            var temp = (object) comp;
+            var temp = (object)comp;
             _serialization.CopyTo(entry.Component, ref temp);
             EntityManager.RemoveComponent(uid, temp!.GetType());
-            EntityManager.AddComponent(uid, (Component) temp!);
+            EntityManager.AddComponent(uid, (Component)temp!);
         }
 
         node.Discovered = true;
@@ -218,12 +217,11 @@ public sealed partial class ArtifactSystem
             // if the entity prototype contained the component originally
             if (entityPrototype?.Components.TryGetComponent(name, out var entry) ?? false)
             {
-                var comp = (Component) _componentFactory.GetComponent(name);
-                comp.Owner = uid;
-                var temp = (object) comp;
+                var comp = (Component)_componentFactory.GetComponent(name);
+                var temp = (object)comp;
                 _serialization.CopyTo(entry, ref temp);
                 EntityManager.RemoveComponent(uid, temp!.GetType());
-                EntityManager.AddComponent(uid, (Component) temp);
+                EntityManager.AddComponent(uid, (Component)temp);
                 continue;
             }
 

diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index cc7a297aa40aa2a631b3d02b08bd526203909ad4..02d483c0a3f2c9e13369e3cfb496d24d98eadc0c 100644 (file)
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -369,11 +369,10 @@ public abstract class SharedMagicSystem : EntitySystem
             if (HasComp(ev.Target, data.Component.GetType()))
                 continue;
 
-            var component = (Component) _compFact.GetComponent(name);
-            component.Owner = ev.Target;
-            var temp = (object) component;
+            var component = (Component)_compFact.GetComponent(name);
+            var temp = (object)component;
             _seriMan.CopyTo(data.Component, ref temp);
-            EntityManager.AddComponent(ev.Target, (Component) temp!);
+            EntityManager.AddComponent(ev.Target, (Component)temp!);
         }
     }
     // End Change Component Spells