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

Don't relay incapacitated move inputs (#9822)

Browse Source
This commit is contained in:
metalgearsloth
2022-07-17 14:31:49 +10:00
committed by GitHub
parent 094d8265f8
commit 94141ad021
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Movement/Systems/SharedMoverController.Input.cs
View File

@@ -78,9 +78,12 @@ namespace Content.Shared.Movement.Systems
private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bool state) private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bool state)
{ {
// Relayed movement just uses the same keybinds given we're moving the relayed entity
// the same as us.
TryComp<InputMoverComponent>(entity, out var moverComp); TryComp<InputMoverComponent>(entity, out var moverComp);
if (TryComp<RelayInputMoverComponent>(entity, out var relayMover)) // Can't relay inputs if you're dead.
if (TryComp<RelayInputMoverComponent>(entity, out var relayMover) && !_mobState.IsIncapacitated(entity))
{ {
// if we swap to relay then stop our existing input if we ever change back. // if we swap to relay then stop our existing input if we ever change back.
if (moverComp != null) if (moverComp != null)