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

Update content for PhysicsMapComponent (#4462)

Browse Source 
* Update content for PhysicsMapComponent

* Fix command

* Cache broadphasesystem
This commit is contained in:
metalgearsloth
2021-08-23 15:02:03 +10:00
committed by GitHub
parent c0e9dd1f47
commit 8878f4dc8f
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -3,6 +3,7 @@ using System.Linq;
using Content.Shared.Physics;
using Content.Shared.Physics.Pull;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Dynamics;
@@ -14,6 +15,8 @@ namespace Content.Shared.Throwing
/// </summary>
public class ThrownItemSystem : EntitySystem
{
[Dependency] private readonly SharedBroadphaseSystem _broadphaseSystem = default!;
private const string ThrowingFixture = "throw-fixture";
public override void Initialize()
@@ -37,7 +40,7 @@ namespace Content.Shared.Throwing
return;
}
Get<SharedBroadphaseSystem>().DestroyFixture(physicsComponent, fixture);
_broadphaseSystem.DestroyFixture(physicsComponent, fixture);
}
private void ThrowItem(EntityUid uid, ThrownItemComponent component, ThrownEvent args)
@@ -52,7 +55,7 @@ namespace Content.Shared.Throwing
}
var shape = physicsComponent.Fixtures[0].Shape;
Get<SharedBroadphaseSystem>().CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture});
_broadphaseSystem.CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture});
}
private void HandleCollision(EntityUid uid, ThrownItemComponent component, StartCollideEvent args)