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/Physics/SharedPreventCollideSystem.cs
View File

@@ -1,5 +1,6 @@
using Robust.Shared.GameStates;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Physics.Events;
namespace Content.Shared.Physics;
@@ -27,12 +28,12 @@ public sealed class SharedPreventCollideSystem : EntitySystem
component.Uid = state.Uid;
}
private void OnPreventCollide(EntityUid uid, PreventCollideComponent component, PreventCollideEvent args)
private void OnPreventCollide(EntityUid uid, PreventCollideComponent component, ref PreventCollideEvent args)
{
var otherUid = args.BodyB.Owner;
if (component.Uid == otherUid)
args.Cancel();
args.Cancelled = true;
}
}