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

Try fix some mover jank (#13503)

Browse Source
This commit is contained in:
Leon Friedrich
2023-01-16 21:20:22 +13:00
committed by GitHub
parent 450dfd5074
commit 4b65fb1579
6 changed files with 79 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,25 +192,25 @@ namespace Content.Shared.Movement.Systems
{
// Relayed movement just uses the same keybinds given we're moving the relayed entity
// the same as us.
TryComp<InputMoverComponent>(entity, out var moverComp);
// Can't relay inputs if you're dead.
if (TryComp<RelayInputMoverComponent>(entity, out var relayMover) && !_mobState.IsIncapacitated(entity))
if (TryComp<RelayInputMoverComponent>(entity, out var relayMover))
{
// if we swap to relay then stop our existing input if we ever change back.
if (moverComp != null)
{
SetMoveInput(moverComp, MoveButtons.None);
}
if (relayMover.RelayEntity == null) return;
DebugTools.Assert(relayMover.RelayEntity != entity);
HandleDirChange(relayMover.RelayEntity.Value, dir, subTick, state);
DebugTools.AssertNotNull(relayMover.RelayEntity);
if (TryComp<InputMoverComponent>(entity, out var mover))
SetMoveInput(mover, MoveButtons.None);
DebugTools.Assert(TryComp(relayMover.RelayEntity, out MovementRelayTargetComponent? targetComp) && targetComp.Entities.Count == 1,
"Multiple relayed movers are not supported at the moment");
if (relayMover.RelayEntity != null && !_mobState.IsIncapacitated(entity))
HandleDirChange(relayMover.RelayEntity.Value, dir, subTick, state);
return;
}
if (moverComp == null)
if (!TryComp<InputMoverComponent>(entity, out var moverComp))
return;
// Relay the fact we had any movement event.