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

4
Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
View File

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