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

Remove FixtureId (#19280)

Browse Source
This commit is contained in:
metalgearsloth
2023-08-23 18:55:58 +10:00
committed by GitHub
parent 2cc1f8f0fe
commit 735626654a
23 changed files with 66 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -95,8 +95,8 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
{
foreach (var fixture in args.NewFixtures)
{
_physics.SetDensity(uid, fixture, TileMassMultiplier, false, manager);
_fixtures.SetRestitution(uid, fixture, 0.1f, false, manager);
_physics.SetDensity(uid, fixture.Key, fixture.Value, TileMassMultiplier, false, manager);
_fixtures.SetRestitution(uid, fixture.Key, fixture.Value, 0.1f, false, manager);
}
}

4
Content.Server/Shuttles/Systems/ThrusterSystem.cs
View File

@@ -445,7 +445,7 @@ public sealed class ThrusterSystem : EntitySystem
private void OnStartCollide(EntityUid uid, ThrusterComponent component, ref StartCollideEvent args)
{
if (args.OurFixture.ID != BurnFixture)
if (args.OurFixtureId != BurnFixture)
return;
component.Colliding.Add(args.OtherEntity);
@@ -453,7 +453,7 @@ public sealed class ThrusterSystem : EntitySystem
private void OnEndCollide(EntityUid uid, ThrusterComponent component, ref EndCollideEvent args)
{
if (args.OurFixture.ID != BurnFixture)
if (args.OurFixtureId != BurnFixture)
return;
component.Colliding.Remove(args.OtherEntity);