NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Hotfix] Remove pull-escape trick (#40368)

Browse source 
* make HandleStopPull byref

* we get signal
This commit is contained in:
Errant 2025-09-15 13:31:22 +02:00 • committed by GitHub
parent d8e818283c
commit 9b5f9c3fd6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Content.Shared/Cuffs/SharedCuffableSystem.cs
View file

@ -242,13 +242,18 @@ namespace Content.Shared.Cuffs
args.Cancel();
}
private void HandleStopPull(EntityUid uid, CuffableComponent component, AttemptStopPullingEvent args)
private void HandleStopPull(EntityUid uid, CuffableComponent component, ref AttemptStopPullingEvent args)
{
if (args.User == null || !Exists(args.User.Value))
return;
if (args.User.Value == uid && !component.CanStillInteract)
{
//TODO: UX feedback. Simply blocking the normal interaction feels like an interface bug
args.Cancelled = true;
}
}
private void OnRemoveCuffsAlert(Entity<CuffableComponent> ent, ref RemoveCuffsAlertEvent args)

4
Content.Shared/Movement/Pulling/Events/AttemptStopPullingEvent.cs
View file

@ -3,8 +3,10 @@ namespace Content.Shared.Pulling.Events;
/// <summary>
/// Raised when a request is made to stop pulling an entity.
/// </summary>
[ByRefEvent]
public record struct AttemptStopPullingEvent(EntityUid? User = null)
{
public readonly EntityUid? User = User;
public bool Cancelled;
}
}

2
Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
View file

@ -599,7 +599,7 @@ public sealed class PullingSystem : EntitySystem
return true;
var msg = new AttemptStopPullingEvent(user);
RaiseLocalEvent(pullableUid, msg, true);
RaiseLocalEvent(pullableUid, ref msg, true);
if (msg.Cancelled)
return false;