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

Refactor to use the new multiple controller system (#1462)

Browse Source 
* Transition code to new controller system

* Fix shuttles not moving

* Fix throwing

* Fix guns

* Change hands to use physics.Stop() and remove item fumble method
This commit is contained in:
DrSmugleaf
2020-07-23 18:33:37 +02:00
committed by GitHub
parent 3296079400
commit 64672fdc31
13 changed files with 114 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,11 +78,6 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
protected override void SetController(IPhysicsComponent physics)
{
physics.SetController<MoverController>();
}
private static void PlayerAttached(PlayerAttachSystemMessage ev)
{
if (!ev.Entity.HasComponent<IMoverComponent>())
@@ -98,9 +93,10 @@ namespace Content.Server.GameObjects.EntitySystems
ev.Entity.RemoveComponent<PlayerInputMoverComponent>();
}
if (ev.Entity.TryGetComponent(out IPhysicsComponent physics))
if (ev.Entity.TryGetComponent(out IPhysicsComponent physics) &&
physics.TryGetController(out MoverController controller))
{
(physics.Controller as MoverController)?.StopMoving();
controller.StopMoving();
}
}