tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes resulting from merging Client and Server PhysicsComponent.

Browse Source
This commit is contained in:
Acruid
2020-07-01 12:03:19 -07:00
parent b807b9e7ee
commit f0561d8d95
14 changed files with 25 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GameObjects/EntitySystems/MoverSystem.cs
View File

@@ -19,7 +19,6 @@ using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
@@ -66,7 +65,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
var mover = entity.GetComponent<IMoverComponent>();
var physics = entity.GetComponent<SharedPhysicsComponent>();
var physics = entity.GetComponent<PhysicsComponent>();
if (entity.TryGetComponent<CollidableComponent>(out var collider))
{
UpdateKinematics(entity.Transform, mover, physics, collider);
@@ -78,7 +77,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
protected override void SetController(SharedPhysicsComponent physics)
protected override void SetController(PhysicsComponent physics)
{
((PhysicsComponent) physics).SetController<MoverController>();
}