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

Fix pressing shift while held triggering escape (#24878)

Browse Source 
* We meet again, my old friend.

* Helper property
This commit is contained in:
Tayrtahn
2024-02-02 21:14:20 -05:00
committed by GitHub
parent f0dddd48ad
commit 31207006f5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Resist/EscapeInventorySystem.cs
View File

@@ -7,6 +7,7 @@ using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Events;
using Content.Shared.Inventory; using Content.Shared.Inventory;
using Content.Shared.Movement.Events; using Content.Shared.Movement.Events;
using Content.Shared.Movement.Systems;
using Content.Shared.Resist; using Content.Shared.Resist;
using Content.Shared.Storage; using Content.Shared.Storage;
using Robust.Shared.Containers; using Robust.Shared.Containers;
@@ -38,6 +39,9 @@ public sealed class EscapeInventorySystem : EntitySystem
private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent component, ref MoveInputEvent args) private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent component, ref MoveInputEvent args)
{ {
if (!args.HasDirectionalMovement)
return;
if (!_containerSystem.TryGetContainingContainer(uid, out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner)) if (!_containerSystem.TryGetContainingContainer(uid, out var container) || !_actionBlockerSystem.CanInteract(uid, container.Owner))
return; return;

2
Content.Shared/Movement/Events/MoveInputEvent.cs
View File

@@ -13,6 +13,8 @@ public readonly struct MoveInputEvent
public readonly InputMoverComponent Component; public readonly InputMoverComponent Component;
public readonly MoveButtons OldMovement; public readonly MoveButtons OldMovement;
public bool HasDirectionalMovement => (Component.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None;
public MoveInputEvent(EntityUid entity, InputMoverComponent component, MoveButtons oldMovement) public MoveInputEvent(EntityUid entity, InputMoverComponent component, MoveButtons oldMovement)
{ {
Entity = entity; Entity = entity;