tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

7
Content.Shared/Damage/Systems/DamageContactsSystem.cs
View File

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