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

You can no longer move a PC entity unless it has a PlayerInputMover (#2987)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-01-14 04:24:43 +01:00
committed by GitHub
parent 7c48a5708e
commit 6a19dd9f02
6 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ using Content.Shared.Physics;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Server.Interfaces.GameObjects;
using Robust.Server.Interfaces.Timing;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Components.Transform;
@@ -45,8 +46,6 @@ namespace Content.Server.GameObjects.EntitySystems
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<PlayerAttachSystemMessage>(PlayerAttached);
SubscribeLocalEvent<PlayerDetachedSystemMessage>(PlayerDetached);
_audioSystem = EntitySystemManager.GetEntitySystem<AudioSystem>();
@@ -64,21 +63,8 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
private static void PlayerAttached(PlayerAttachSystemMessage ev)
{
if (!ev.Entity.HasComponent<IMoverComponent>())
{
ev.Entity.AddComponent<PlayerInputMoverComponent>();
}
}
private void PlayerDetached(PlayerDetachedSystemMessage ev)
{
if (ev.Entity.HasComponent<PlayerInputMoverComponent>())
{
ev.Entity.RemoveComponent<PlayerInputMoverComponent>();
}
if (ev.Entity.TryGetComponent(out IPhysicsComponent? physics) &&
physics.TryGetController(out MoverController controller) &&
!ev.Entity.IsWeightless())