Content update for fixture changes (#5524)

This commit is contained in:
metalgearsloth
2021-12-01 13:05:08 +11:00
committed by GitHub
parent c2f2d27b16
commit 0a843b671f
108 changed files with 1023 additions and 829 deletions

View File

@@ -2,7 +2,9 @@
using Content.Shared.Radiation;
using Content.Shared.Singularity.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Collision.Shapes;
using Robust.Shared.Physics.Dynamics;
@@ -10,6 +12,8 @@ namespace Content.Shared.Singularity
{
public abstract class SharedSingularitySystem : EntitySystem
{
[Dependency] private readonly FixtureSystem _fixtures = default!;
public const string DeleteFixture = "DeleteCircle";
private float GetFalloff(int level)
@@ -74,8 +78,7 @@ namespace Content.Shared.Singularity
appearance.SetData(SingularityVisuals.Level, value);
}
if (physics != null &&
physics.GetFixture(DeleteFixture) is {Shape: PhysShapeCircle circle})
if (physics != null && _fixtures.GetFixtureOrNull(physics, DeleteFixture) is {Shape: PhysShapeCircle circle})
{
circle.Radius = value - 0.5f;
}