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

Update for collision events by-ref (#10933)

Browse Source
This commit is contained in:
metalgearsloth
2022-09-14 17:26:26 +10:00
committed by GitHub
parent feb50ce7cc
commit 78a4ab6eb2
105 changed files with 204 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Buckle/SharedBuckleSystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Shared.Movement.Events;
using Content.Shared.Standing;
using Content.Shared.Throwing;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Physics.Events;
using Robust.Shared.Timing;
namespace Content.Shared.Buckle
@@ -105,13 +106,13 @@ namespace Content.Shared.Buckle
args.Cancel();
}
private void PreventCollision(EntityUid uid, SharedBuckleComponent component, PreventCollideEvent args)
private void PreventCollision(EntityUid uid, SharedBuckleComponent component, ref PreventCollideEvent args)
{
if (args.BodyB.Owner != component.LastEntityBuckledTo) return;
if (component.Buckled || component.DontCollide)
{
args.Cancel();
args.Cancelled = true;
}
}
}