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

Revert "Content update for fixture changes (#5524)"

Browse Source 
This reverts commit 0a843b671f.
This commit is contained in:
metalgearsloth
2021-12-01 13:55:24 +11:00
parent 6ccd1d7110
commit 43b637826d
108 changed files with 829 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.Shuttles.EntitySystems
{
[Robust.Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!;
[Robust.Shared.IoC.Dependency] private readonly AmbientSoundSystem _ambient = default!;
[Robust.Shared.IoC.Dependency] private readonly FixtureSystem _fixtureSystem = default!;
[Robust.Shared.IoC.Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
[Robust.Shared.IoC.Dependency] private readonly DamageableSystem _damageable = default!;
// Essentially whenever thruster enables we update the shuttle's available impulses which are used for movement.
@@ -259,7 +259,7 @@ namespace Content.Server.Shuttles.EntitySystems
CollisionLayer = (int) CollisionGroup.MobImpassable
};
_fixtureSystem.CreateFixture(physicsComponent, fixture);
_broadphase.CreateFixture(physicsComponent, fixture);
}
break;
@@ -323,7 +323,7 @@ namespace Content.Server.Shuttles.EntitySystems
if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
{
_fixtureSystem.DestroyFixture(physicsComponent, BurnFixture);
_broadphase.DestroyFixture(physicsComponent, BurnFixture);
}
_activeThrusters.Remove(component);