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

Fix disconnecting discontinuing your adventures off into deep space (#2256)

Browse Source 
* Fix stopping when disconnecting while weightless

* Use extension
This commit is contained in:
DrSmugleaf
2020-10-14 22:46:39 +02:00
committed by GitHub
parent 50bc61b672
commit 8548e939e2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ namespace Content.Server.GameObjects.EntitySystems
} }
} }
private static void PlayerDetached(PlayerDetachedSystemMessage ev) private void PlayerDetached(PlayerDetachedSystemMessage ev)
{ {
if (ev.Entity.HasComponent<PlayerInputMoverComponent>()) if (ev.Entity.HasComponent<PlayerInputMoverComponent>())
{ {
@@ -84,7 +84,8 @@ namespace Content.Server.GameObjects.EntitySystems
} }
if (ev.Entity.TryGetComponent(out IPhysicsComponent? physics) && if (ev.Entity.TryGetComponent(out IPhysicsComponent? physics) &&
physics.TryGetController(out MoverController controller)) physics.TryGetController(out MoverController controller) &&
!ev.Entity.IsWeightless())
{ {
controller.StopMoving(); controller.StopMoving();
} }

2
Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Shared.GameObjects.EntitySystems
public abstract class SharedMoverSystem : EntitySystem public abstract class SharedMoverSystem : EntitySystem
{ {
[Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPhysicsManager _physicsManager = default!; [Dependency] protected readonly IPhysicsManager PhysicsManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IConfigurationManager _configurationManager = default!;
public override void Initialize() public override void Initialize()