Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

7
Content.Server/Physics/Controllers/ConveyorController.cs
View File

@@ -14,8 +14,11 @@ using Robust.Shared.Containers;
using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Collision.Shapes;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Controllers;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Physics.Events;
using Robust.Shared.Physics.Systems;
namespace Content.Server.Physics.Controllers
{
@@ -43,7 +46,7 @@ namespace Content.Server.Physics.Controllers
base.Initialize();
}
private void OnConveyorEndCollide(EntityUid uid, ConveyorComponent component, EndCollideEvent args)
private void OnConveyorEndCollide(EntityUid uid, ConveyorComponent component, ref EndCollideEvent args)
{
component.Intersecting.Remove(args.OtherFixture.Body.Owner);
@@ -53,7 +56,7 @@ namespace Content.Server.Physics.Controllers
}
}
private void OnConveyorStartCollide(EntityUid uid, ConveyorComponent component, StartCollideEvent args)
private void OnConveyorStartCollide(EntityUid uid, ConveyorComponent component, ref StartCollideEvent args)
{
var otherUid = args.OtherFixture.Body.Owner;