Remove obsolete `Fixture.Body` references (#16259)

diff --git a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
index 5e75795292e463c21d66a93e7f3e33440edfe061..2372e872cbae3a31e98f18b11100dc7d5cbcfa23 100644 (file)
--- a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
@@ -26,8 +26,8 @@ public sealed class FlyBySoundSystem : SharedFlyBySoundSystem
 
         // If it's not our ent or we shot it.
         if (attachedEnt == null ||
-            args.OtherFixture.Body.Owner != attachedEnt ||
-            TryComp<ProjectileComponent>(args.OurFixture.Body.Owner, out var projectile) &&
+            args.OtherEntity != attachedEnt ||
+            TryComp<ProjectileComponent>(uid, out var projectile) &&
             projectile.Shooter == attachedEnt)
         {
             return;

diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs
index 781fe6014c3bc1d2f39b97a22be04342398c2b11..224a2ddab7b19af64ad0ebf6ffce72ebdab88e77 100644 (file)
--- a/Content.Server/Anomaly/AnomalySystem.cs
+++ b/Content.Server/Anomaly/AnomalySystem.cs
@@ -67,7 +67,7 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
 
     private void OnStartCollide(EntityUid uid, AnomalyComponent component, ref StartCollideEvent args)
     {
-        if (!TryComp<AnomalousParticleComponent>(args.OtherFixture.Body.Owner, out var particle))
+        if (!TryComp<AnomalousParticleComponent>(args.OtherEntity, out var particle))
             return;
 
         if (args.OtherFixture.ID != particle.FixtureId)

diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 8baae83641e3a82a01b95aa8ff24a87be0b872df..a57b66af806a32cdfcf08a68f6241aaabd28883f 100644 (file)
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -131,7 +131,7 @@ namespace Content.Server.Atmos.EntitySystems
 
         private void OnCollide(EntityUid uid, FlammableComponent flammable, ref StartCollideEvent args)
         {
-            var otherUid = args.OtherFixture.Body.Owner;
+            var otherUid = args.OtherEntity;
 
             // Normal hard collisions, though this isn't generally possible since most flammable things are mobs
             // which don't collide with one another, shouldn't work here.

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
index ef0d757b4a07d5646ecbbcc3f5319a5f4fa99f36..9848463e3f00ced6d8a9f050348f8d2b0cfb9cee 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
@@ -34,9 +34,9 @@ namespace Content.Server.Chemistry.EntitySystems
 
         private void HandleInjection(EntityUid uid, SolutionInjectOnCollideComponent component, ref StartCollideEvent args)
         {
-            var target = args.OtherFixture.Body.Owner;
+            var target = args.OtherEntity;
 
-            if (!args.OtherFixture.Body.Hard ||
+            if (!args.OtherBody.Hard ||
                 !EntityManager.TryGetComponent<BloodstreamComponent>(target, out var bloodstream) ||
                 !_solutionsSystem.TryGetInjectableSolution(component.Owner, out var solution)) return;
 
@@ -53,7 +53,7 @@ namespace Content.Server.Chemistry.EntitySystems
 
             var solRemoved = solution.SplitSolution(component.TransferAmount);
             var solRemovedVol = solRemoved.Volume;
-            
+
             var solToInject = solRemoved.SplitSolution(solRemovedVol * component.TransferEfficiency);
 
             _bloodstreamSystem.TryAddToChemicals(target, solToInject, bloodstream);

diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index 38e22ad14e9dfd98c1d597a85bbf8ace330a020e..8fd6d315729ccf0000b704410452211e3f8ce7ad 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -41,7 +41,7 @@ namespace Content.Server.Chemistry.EntitySystems
 
             foreach (var value in contents.Solutions.Values)
             {
-                value.DoEntityReaction(args.OtherFixture.Body.Owner, ReactionMethod.Touch);
+                value.DoEntityReaction(args.OtherEntity, ReactionMethod.Touch);
             }
 
             // Check for collision with a impassable object (e.g. wall) and stop

diff --git a/Content.Server/Climbing/ClimbSystem.cs b/Content.Server/Climbing/ClimbSystem.cs
index 6f1a4ca8e3774a930418d4c80afab37c6e1d3a41..3f50fa824baaeb401d76adbcb15b7b58572d24d3 100644 (file)
--- a/Content.Server/Climbing/ClimbSystem.cs
+++ b/Content.Server/Climbing/ClimbSystem.cs
@@ -226,7 +226,7 @@ public sealed class ClimbSystem : SharedClimbSystem
             if (fixture == args.OtherFixture)
                 continue;
             // If still colliding with a climbable, do not stop climbing
-            if (HasComp<ClimbableComponent>(fixture.Body.Owner))
+            if (HasComp<ClimbableComponent>(args.OtherEntity))
                 return;
         }
 

diff --git a/Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs b/Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
index 3bc08d4bb3d14d0b0b759ac62053ea196ed7e53d..a1cc9604318717ad49bb56b81ade0bebfcf1528a 100644 (file)
--- a/Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
@@ -30,8 +30,8 @@ namespace Content.Server.Damage.Systems
         {
             if (!EntityManager.HasComponent<DamageableComponent>(uid)) return;
 
-            var otherBody = args.OtherFixture.Body.Owner;
-            var speed = args.OurFixture.Body.LinearVelocity.Length;
+            var otherBody = args.OtherEntity;
+            var speed = args.OurBody.LinearVelocity.Length;
 
             if (speed < component.MinimumSpeed) return;
 

diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs
index b7ac9086f6017bbef6d1e8551bbe4d2d65b6b0c0..7ec1413ba5e2a9fd314c9e90fd0459b653ae0670 100644 (file)
--- a/Content.Server/Doors/Systems/DoorSystem.cs
+++ b/Content.Server/Doors/Systems/DoorSystem.cs
@@ -251,7 +251,7 @@ public sealed class DoorSystem : SharedDoorSystem
         if (door.State != DoorState.Closed)
             return;
 
-        var otherUid = args.OtherFixture.Body.Owner;
+        var otherUid = args.OtherEntity;
 
         if (Tags.HasTag(otherUid, "DoorBumpOpener"))
             TryOpen(uid, door, otherUid);
@@ -290,12 +290,13 @@ public sealed class DoorSystem : SharedDoorSystem
 
     protected override void CheckDoorBump(DoorComponent component, PhysicsComponent body)
     {
+        var uid = body.Owner;
         if (component.BumpOpen)
         {
-            foreach (var other in PhysicsSystem.GetContactingEntities(body, approximate: true))
+            foreach (var other in PhysicsSystem.GetContactingEntities(uid, body, approximate: true))
             {
-                if (Tags.HasTag(other.Owner, "DoorBumpOpener") &&
-                    TryOpen(component.Owner, component, other.Owner, false, quiet: true)) break;
+                if (Tags.HasTag(other, "DoorBumpOpener") && TryOpen(uid, component, other, false, quiet: true))
+                    break;
             }
         }
     }

diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index 11db6184e3a3a5b1a36cae21df3ffdfc240ff629..bb53b7a374a69d5a38728a655b1bd782816fc64e 100644 (file)
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -153,7 +153,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
     private void OnElectrifiedStartCollide(EntityUid uid, ElectrifiedComponent electrified, ref StartCollideEvent args)
     {
         if (electrified.OnBump)
-            TryDoElectrifiedAct(uid, args.OtherFixture.Body.Owner, 1, electrified);
+            TryDoElectrifiedAct(uid, args.OtherEntity, 1, electrified);
     }
 
         private void OnElectrifiedAttacked(EntityUid uid, ElectrifiedComponent electrified, AttackedEvent args)

diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 3499d6644341ceb2f5b384408c2d44306796fe0d..5c90577011f80c0a706cc613bb8d1a4d51093375 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -283,7 +283,7 @@ public sealed partial class ExplosionSystem : EntitySystem
         ref (List<TransformComponent> List, HashSet<EntityUid> Processed, EntityQuery<TransformComponent> XformQuery) state,
         in FixtureProxy proxy)
     {
-        var owner = proxy.Fixture.Body.Owner;
+        var owner = proxy.Entity;
         return GridQueryCallback(ref state, in owner);
     }
 
@@ -366,8 +366,8 @@ public sealed partial class ExplosionSystem : EntitySystem
         ref (List<TransformComponent> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox) state,
         in FixtureProxy proxy)
     {
-        var owner = proxy.Fixture.Body.Owner;
-        return SpaceQueryCallback(ref state, in owner);
+        var uid = proxy.Entity;
+        return SpaceQueryCallback(ref state, in uid);
     }
 
     /// <summary>

diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
index 07f44f7564698b2b9b9f3158c6f3feba088b265e..ede539af5f08b4a4dadd7bfd1ff0cff935d09ebe 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
@@ -77,14 +77,14 @@ public sealed partial class TriggerSystem
         if (args.OurFixture.ID != TriggerOnProximityComponent.FixtureID) return;
 
         _activeProximities.Add(component);
-        component.Colliding.Add(args.OtherFixture.Body);
+        component.Colliding.Add(args.OtherBody);
     }
 
     private static void OnProximityEndCollide(EntityUid uid, TriggerOnProximityComponent component, ref EndCollideEvent args)
     {
         if (args.OurFixture.ID != TriggerOnProximityComponent.FixtureID) return;
 
-        component.Colliding.Remove(args.OtherFixture.Body);
+        component.Colliding.Remove(args.OtherBody);
     }
 
     private void SetProximityAppearance(EntityUid uid, TriggerOnProximityComponent component)

diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
index 2c3ecc605a6f715296fc3a89c7a8dc95b993e0cf..29b81deb32c2ce4d462a0150c51bb780f936a178 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
@@ -19,7 +19,7 @@ public sealed partial class TriggerSystem
     {
         //Ensures the entity trigger will have an active component
         EnsureComp<ActiveTriggerOnTimedCollideComponent>(uid);
-        var otherUID = args.OtherFixture.Body.Owner;
+        var otherUID = args.OtherEntity;
         if (component.Colliding.ContainsKey(otherUID))
             return;
         component.Colliding.Add(otherUID, 0);
@@ -27,7 +27,7 @@ public sealed partial class TriggerSystem
 
     private void OnTimerEndCollide(EntityUid uid, TriggerOnTimedCollideComponent component, ref EndCollideEvent args)
     {
-        var otherUID = args.OtherFixture.Body.Owner;
+        var otherUID = args.OtherEntity;
         component.Colliding.Remove(otherUID);
 
         if (component.Colliding.Count == 0 && HasComp<ActiveTriggerOnTimedCollideComponent>(uid))

diff --git a/Content.Server/ImmovableRod/ImmovableRodSystem.cs b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
index ba41b28de73fc82899b8d2607997fb4bd86c8911..36a16695f570246db14879ab5a57c500cf32554b 100644 (file)
--- a/Content.Server/ImmovableRod/ImmovableRodSystem.cs
+++ b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
@@ -73,7 +73,7 @@ public sealed class ImmovableRodSystem : EntitySystem
 
     private void OnCollide(EntityUid uid, ImmovableRodComponent component, ref StartCollideEvent args)
     {
-        var ent = args.OtherFixture.Body.Owner;
+        var ent = args.OtherEntity;
 
         if (_random.Prob(component.HitSoundProbability))
         {

diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs
index 2fb28f39b969ad551ba3619b76b79c14c3beb59c..c6a6417efee97883fa9a48564dcaf5bbf956dcf7 100644 (file)
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs
@@ -36,7 +36,7 @@ public partial class PolymorphSystem
         if (args.OurFixture.ID != SharedProjectileSystem.ProjectileFixture)
             return;
 
-        var other = args.OtherFixture.Body.Owner;
+        var other = args.OtherEntity;
         if (!component.Whitelist.IsValid(other)
             || component.Blacklist != null && component.Blacklist.IsValid(other))
             return;

diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 659de57e472057a39ff24bab1b6be4e43cf3ee5e..a9b02cdb8e861f7630f0ad07b03741d4f5c12124 100644 (file)
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -40,7 +40,7 @@ public sealed class ProjectileSystem : SharedProjectileSystem
         if (args.OurFixture.ID != ProjectileFixture || !args.OtherFixture.Hard || component.DamagedEntity)
             return;
 
-        var otherEntity = args.OtherFixture.Body.Owner;
+        var otherEntity = args.OtherEntity;
         // it's here so this check is only done once before possible hit
         var attemptEv = new ProjectileReflectAttemptEvent(uid, component, false);
         RaiseLocalEvent(otherEntity, ref attemptEv);
@@ -51,7 +51,7 @@ public sealed class ProjectileSystem : SharedProjectileSystem
         }
 
         var otherName = ToPrettyString(otherEntity);
-        var direction = args.OurFixture.Body.LinearVelocity.Normalized;
+        var direction = args.OurBody.LinearVelocity.Normalized;
         var modifiedDamage = _damageableSystem.TryChangeDamage(otherEntity, component.Damage, component.IgnoreResistances, origin: component.Shooter);
         component.DamagedEntity = true;
         var deleted = Deleted(otherEntity);

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index 889d4b69866f175c1925c25cc8822810ff1ea035..97be835cd1848cf488a343be331c5e1e03607601 100644 (file)
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -23,25 +23,25 @@ public sealed partial class ShuttleSystem
 
     private void OnShuttleCollide(EntityUid uid, ShuttleComponent component, ref StartCollideEvent args)
     {
-        var ourBody = args.OurFixture.Body;
-        var otherBody = args.OtherFixture.Body;
-
-        if (!HasComp<ShuttleComponent>(otherBody.Owner))
+        if (!HasComp<ShuttleComponent>(args.OtherEntity))
             return;
 
+        var ourBody = args.OurBody;
+        var otherBody = args.OtherBody;
+
         // TODO: Would also be nice to have a continuous sound for scraping.
-        var ourXform = Transform(ourBody.Owner);
+        var ourXform = Transform(uid);
 
         if (ourXform.MapUid == null)
             return;
 
-        var otherXform = Transform(otherBody.Owner);
+        var otherXform = Transform(args.OtherEntity);
 
         var ourPoint = ourXform.InvWorldMatrix.Transform(args.WorldPoint);
         var otherPoint = otherXform.InvWorldMatrix.Transform(args.WorldPoint);
 
-        var ourVelocity = _physics.GetLinearVelocity(ourBody.Owner, ourPoint, ourBody, ourXform);
-        var otherVelocity = _physics.GetLinearVelocity(otherBody.Owner, otherPoint, otherBody, otherXform);
+        var ourVelocity = _physics.GetLinearVelocity(uid, ourPoint, ourBody, ourXform);
+        var otherVelocity = _physics.GetLinearVelocity(args.OtherEntity, otherPoint, otherBody, otherXform);
         var jungleDiff = (ourVelocity - otherVelocity).Length;
 
         if (jungleDiff < MinimumImpactVelocity)

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 1d4b7abbf1beb81accf011c2d358e7da480b8d62..e64f9022c00f698d6fb786894fe4c91508c92e89 100644 (file)
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -58,7 +58,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
 
         SubscribeLocalEvent<GridInitializeEvent>(OnGridInit);
-        SubscribeLocalEvent<GridFixtureChangeEvent>(OnGridFixtureChange);
+        SubscribeLocalEvent<FixturesComponent, GridFixtureChangeEvent>(OnGridFixtureChange);
     }
 
     public override void Update(float frameTime)
@@ -81,22 +81,13 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
         }
     }
 
-    private void OnGridFixtureChange(GridFixtureChangeEvent args)
+    private void OnGridFixtureChange(EntityUid uid, FixturesComponent manager, GridFixtureChangeEvent args)
     {
-        // Look this is jank but it's a placeholder until we design it.
-        if (args.NewFixtures.Count == 0)
-            return;
-
-        var uid = args.NewFixtures[0].Body.Owner;
-        var manager = Comp<FixturesComponent>(uid);
-
         foreach (var fixture in args.NewFixtures)
         {
             _physics.SetDensity(uid, fixture, TileMassMultiplier, false, manager);
             _fixtures.SetRestitution(uid, fixture, 0.1f, false, manager);
         }
-
-        _fixtures.FixtureUpdate(uid, manager: manager);
     }
 
     private void OnGridInit(GridInitializeEvent ev)

diff --git a/Content.Server/Shuttles/Systems/SpaceGarbageSystem.cs b/Content.Server/Shuttles/Systems/SpaceGarbageSystem.cs
index ca8304e55547978ceba89dcd65ef31764428d40f..7a5b4c98708b88f46fcf6a8075519cc1b4d4d6b0 100644 (file)
--- a/Content.Server/Shuttles/Systems/SpaceGarbageSystem.cs
+++ b/Content.Server/Shuttles/Systems/SpaceGarbageSystem.cs
@@ -18,10 +18,10 @@ public sealed class SpaceGarbageSystem : EntitySystem
 
     private void OnCollide(EntityUid uid, SpaceGarbageComponent component, ref StartCollideEvent args)
     {
-        if (args.OtherFixture.Body.BodyType != BodyType.Static) return;
+        if (args.OtherBody.BodyType != BodyType.Static) return;
 
-        var ourXform = Transform(args.OurFixture.Body.Owner);
-        var otherXform = Transform(args.OtherFixture.Body.Owner);
+        var ourXform = Transform(uid);
+        var otherXform = Transform(args.OtherEntity);
 
         if (ourXform.GridUid == otherXform.GridUid) return;
 

diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index 1d6449c31dee440d6e83c9cf1cfe82e1be7f4c98..979e8565e8efda83f3398c0f27bbbe01bb060d23 100644 (file)
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -60,7 +60,7 @@ public sealed class ContainmentFieldGeneratorSystem : EntitySystem
     /// </summary>
     private void HandleGeneratorCollide(EntityUid uid, ContainmentFieldGeneratorComponent component, ref StartCollideEvent args)
     {
-        if (_tags.HasTag(args.OtherFixture.Body.Owner, component.IDTag))
+        if (_tags.HasTag(args.OtherEntity, component.IDTag))
         {
             ReceivePower(component.PowerReceived, component);
             component.Accumulator = 0f;

diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
index 48487cbb94ee4c19f14ffab592b2000faeadef49..c03ea25b7c20f11f7620bc574639d9d2e0a1640c 100644 (file)
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs
@@ -24,7 +24,7 @@ public sealed class ContainmentFieldSystem : EntitySystem
 
     private void HandleFieldCollide(EntityUid uid, ContainmentFieldComponent component, ref StartCollideEvent args)
     {
-        var otherBody = args.OtherFixture.Body.Owner;
+        var otherBody = args.OtherEntity;
 
         if (TryComp<SpaceGarbageComponent>(otherBody, out var garbage))
         {

diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index df4ae7349370a5fc56e559d729fbf57d18bcfc3d..97e9fb9f3138be898c00c21ff1f96a7cba044f82 100644 (file)
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -421,7 +421,7 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem
         if (args.OurFixture.ID != comp.HorizonFixtureId)
             return;
 
-        AttemptConsumeEntity(args.OtherFixture.Body.Owner, comp);
+        AttemptConsumeEntity(args.OtherEntity, comp);
     }
 
     /// <summary>

diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
index cc26123eeca9c5eed6e12092309a3923e73e9f1d..6db478dead4bd5f78081c034a6ece1c1cddf33de 100644 (file)
--- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
@@ -123,7 +123,7 @@ public sealed class SingularityGeneratorSystem : EntitySystem
     /// <param name="args">The state of the beginning of the collision.</param>
     private void HandleParticleCollide(EntityUid uid, ParticleProjectileComponent component, ref StartCollideEvent args)
     {
-        if (EntityManager.TryGetComponent<SingularityGeneratorComponent?>(args.OtherFixture.Body.Owner, out var singularityGeneratorComponent))
+        if (EntityManager.TryGetComponent<SingularityGeneratorComponent?>(args.OtherEntity, out var singularityGeneratorComponent))
         {
             SetPower(
                 singularityGeneratorComponent,

diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
index f7734622c53f305dab7d40e9221459e127643d81..92a2e91a22082919815c48643ad3261b63e7043f 100644 (file)
--- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
@@ -44,7 +44,7 @@ namespace Content.Server.Stunnable
         {
             if (args.OurFixture.ID != component.FixtureID) return;
 
-            TryDoCollideStun(uid, component, args.OtherFixture.Body.Owner);
+            TryDoCollideStun(uid, component, args.OtherEntity);
         }
 
         private void HandleThrow(EntityUid uid, StunOnCollideComponent component, ThrowDoHitEvent args)

diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
index 363c3f1e03863350da25f161b812cbd0f01d7e6f..8989df0ec10115b8d84dcb62763678c15174a862 100644 (file)
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs
@@ -449,7 +449,7 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
 
     private void OnCollide(EntityUid uid, ArtifactAnalyzerComponent component, ref StartCollideEvent args)
     {
-        var otherEnt = args.OtherFixture.Body.Owner;
+        var otherEnt = args.OtherEntity;
 
         if (!HasComp<ArtifactComponent>(otherEnt))
             return;
@@ -462,7 +462,7 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem
 
     private void OnEndCollide(EntityUid uid, ArtifactAnalyzerComponent component, ref EndCollideEvent args)
     {
-        var otherEnt = args.OtherFixture.Body.Owner;
+        var otherEnt = args.OtherEntity;
 
         if (!HasComp<ArtifactComponent>(otherEnt))
             return;

diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs
index 190cb51bdd2d5c10fc581aa148774ad9dc8ba4d7..e4617efb1b8cc510cdb4f0cf22acf6fdb9e09df0 100644 (file)
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs
@@ -90,7 +90,7 @@ public sealed class TraversalDistorterSystem : EntitySystem
 
     private void OnCollide(EntityUid uid, TraversalDistorterComponent component, ref StartCollideEvent args)
     {
-        var otherEnt = args.OtherFixture.Body.Owner;
+        var otherEnt = args.OtherEntity;
 
         if (!HasComp<ArtifactComponent>(otherEnt))
             return;
@@ -101,7 +101,7 @@ public sealed class TraversalDistorterSystem : EntitySystem
 
     private void OnEndCollide(EntityUid uid, TraversalDistorterComponent component, ref EndCollideEvent args)
     {
-        var otherEnt = args.OtherFixture.Body.Owner;
+        var otherEnt = args.OtherEntity;
 
         if (!HasComp<ArtifactComponent>(otherEnt))
             return;

diff --git a/Content.Shared/Damage/Systems/DamageContactsSystem.cs b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
index 891526bbb05cc8700329c6045144e621cdcd99e0..32757a563ca898027f04cc92828c2015bfc8307a 100644 (file)
--- a/Content.Shared/Damage/Systems/DamageContactsSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
@@ -37,15 +37,14 @@ public sealed class DamageContactsSystem : EntitySystem
 
     private void OnEntityExit(EntityUid uid, DamageContactsComponent component, ref EndCollideEvent args)
     {
-        var otherUid = args.OtherFixture.Body.Owner;
+        var otherUid = args.OtherEntity;
 
         if (!TryComp<PhysicsComponent>(uid, out var body))
             return;
 
         var damageQuery = GetEntityQuery<DamageContactsComponent>();
-        foreach (var contact in _physics.GetContactingEntities(body))
+        foreach (var ent in _physics.GetContactingEntities(uid, body))
         {
-            var ent = contact.Owner;
             if (ent == uid)
                 continue;
 
@@ -58,7 +57,7 @@ public sealed class DamageContactsSystem : EntitySystem
 
     private void OnEntityEnter(EntityUid uid, DamageContactsComponent component, ref StartCollideEvent args)
     {
-        var otherUid = args.OtherFixture.Body.Owner;
+        var otherUid = args.OtherEntity;
 
         if (HasComp<DamagedByContactComponent>(otherUid))
             return;

diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index 8d8784a17389db71ee7eb6948867902369d7041d..8400b26ee71b52a9b1d151464e93f29352a43a19 100644 (file)
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -87,7 +87,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
             return;
         if (!TryComp<MaterialReclaimerComponent>(uid, out var reclaimer))
             return;
-        TryStartProcessItem(uid, args.OtherFixture.Body.Owner, reclaimer);
+        TryStartProcessItem(uid, args.OtherEntity, reclaimer);
     }
 
     private void OnActiveStartup(EntityUid uid, ActiveMaterialReclaimerComponent component, ComponentStartup args)

diff --git a/Content.Shared/Movement/Systems/SlowContactsSystem.cs b/Content.Shared/Movement/Systems/SlowContactsSystem.cs
index c318b6628ba70af55f21c96adcf084e440cc664d..44e64218e0f941ab631a7910441f3523c04ed3f4 100644 (file)
--- a/Content.Shared/Movement/Systems/SlowContactsSystem.cs
+++ b/Content.Shared/Movement/Systems/SlowContactsSystem.cs
@@ -69,9 +69,8 @@ public sealed class SlowContactsSystem : EntitySystem
         var sprintSpeed = 1.0f;
 
         bool remove = true;
-        foreach (var colliding in _physics.GetContactingEntities(physicsComponent))
+        foreach (var ent in _physics.GetContactingEntities(uid, physicsComponent))
         {
-            var ent = colliding.Owner;
             if (!TryComp<SlowContactsComponent>(ent, out var slowContactsComponent))
                 continue;
 
@@ -92,14 +91,14 @@ public sealed class SlowContactsSystem : EntitySystem
 
     private void OnEntityExit(EntityUid uid, SlowContactsComponent component, ref EndCollideEvent args)
     {
-        var otherUid = args.OtherFixture.Body.Owner;
+        var otherUid = args.OtherEntity;
         if (HasComp<MovementSpeedModifierComponent>(otherUid))
             _toUpdate.Add(otherUid);
     }
 
     private void OnEntityEnter(EntityUid uid, SlowContactsComponent component, ref StartCollideEvent args)
     {
-        var otherUid = args.OtherFixture.Body.Owner;
+        var otherUid = args.OtherEntity;
         if (!HasComp<MovementSpeedModifierComponent>(otherUid))
             return;
 

diff --git a/Content.Shared/Physics/Controllers/SharedConveyorController.cs b/Content.Shared/Physics/Controllers/SharedConveyorController.cs
index 9dce765692e9bf6ebabc4091cb7a0b52fb9a0d40..9762c0d807809505cf16707a49e3e44b34c52cd6 100644 (file)
--- a/Content.Shared/Physics/Controllers/SharedConveyorController.cs
+++ b/Content.Shared/Physics/Controllers/SharedConveyorController.cs
@@ -49,9 +49,9 @@ public abstract class SharedConveyorController : VirtualController
 
     private void OnConveyorStartCollide(EntityUid uid, ConveyorComponent component, ref StartCollideEvent args)
     {
-        var otherUid = args.OtherFixture.Body.Owner;
+        var otherUid = args.OtherEntity;
 
-        if (args.OtherFixture.Body.BodyType == BodyType.Static || component.State == ConveyorState.Off)
+        if (args.OtherBody.BodyType == BodyType.Static || component.State == ConveyorState.Off)
             return;
 
         component.Intersecting.Add(otherUid);
@@ -60,7 +60,7 @@ public abstract class SharedConveyorController : VirtualController
 
     private void OnConveyorEndCollide(EntityUid uid, ConveyorComponent component, ref EndCollideEvent args)
     {
-        component.Intersecting.Remove(args.OtherFixture.Body.Owner);
+        component.Intersecting.Remove(args.OtherEntity);
 
         if (component.Intersecting.Count == 0)
             RemComp<ActiveConveyorComponent>(uid);

diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
index 44274e0d7cee151f02713505b0282ca13e533f21..d4fcf1ce5c935a91693494e3e0843196e1d466eb 100644 (file)
--- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -128,7 +128,7 @@ public sealed class StepTriggerSystem : EntitySystem
 
     private void OnStartCollide(EntityUid uid, StepTriggerComponent component, ref StartCollideEvent args)
     {
-        var otherUid = args.OtherFixture.Body.Owner;
+        var otherUid = args.OtherEntity;
 
         if (!args.OtherFixture.Hard)
             return;
@@ -146,7 +146,7 @@ public sealed class StepTriggerSystem : EntitySystem
 
     private void OnEndCollide(EntityUid uid, StepTriggerComponent component, ref EndCollideEvent args)
     {
-        var otherUid = args.OtherFixture.Body.Owner;
+        var otherUid = args.OtherEntity;
 
         if (!component.Colliding.Remove(otherUid))
             return;

diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
index b24047fcea7f9fab4497734c1df053f36021b749..f21c9b2efd079f55244ea13840fab7be3a8dd3e6 100644 (file)
--- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
@@ -59,7 +59,7 @@ public abstract class SharedPortalSystem : EntitySystem
         if (!ShouldCollide(args.OurFixture, args.OtherFixture))
             return;
 
-        var subject = args.OtherFixture.Body.Owner;
+        var subject = args.OtherEntity;
 
         // best not.
         if (Transform(subject).Anchored)
@@ -127,7 +127,7 @@ public abstract class SharedPortalSystem : EntitySystem
         if (!ShouldCollide(args.OurFixture, args.OtherFixture))
             return;
 
-        var subject = args.OtherFixture.Body.Owner;
+        var subject = args.OtherEntity;
 
         // if they came from (not us), remove the timeout
         if (TryComp<PortalTimeoutComponent>(subject, out var timeout) && timeout.EnteredPortal != uid)

diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index 62ae7883a72c4a57847d14113db8db4892da9f5f..6467ea2d77540443f70b5205001aa95bccd32154 100644 (file)
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -74,10 +74,10 @@ namespace Content.Shared.Throwing
                 return;
 
             var thrower = component.Thrower;
-            var otherBody = args.OtherFixture.Body;
+            if (args.OtherEntity == thrower)
+                return;
 
-            if (otherBody.Owner == thrower) return;
-            ThrowCollideInteraction(thrower, args.OurFixture.Body, otherBody);
+            ThrowCollideInteraction(thrower, args.OurBody, args.OtherBody);
         }
 
         private void PreventCollision(EntityUid uid, ThrownItemComponent component, ref PreventCollideEvent args)