Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove obsolete Fixture.Body references (#16259)

Browse Source
This commit is contained in:
Leon Friedrich
2023-05-09 19:21:26 +12:00
committed by GitHub
parent dac7025cc5
commit 2bd5fb3736
32 changed files with 67 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
View File

@@ -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>

4
Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
View File

@@ -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)

4
Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
View File

@@ -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))