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

Pulled item interaction fix (#34587)

Browse Source
This commit is contained in:
themias
2025-02-10 22:29:37 -05:00
committed by GitHub
parent a393c15f92
commit eb1f84600d
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -1413,7 +1413,7 @@ namespace Content.Shared.Interaction
/// <returns>If there is an entity being used.</returns>
public bool TryGetUsedEntity(EntityUid user, [NotNullWhen(true)] out EntityUid? used, bool checkCanUse = true)
{
var ev = new GetUsedEntityEvent();
var ev = new GetUsedEntityEvent(user);
RaiseLocalEvent(user, ref ev);
used = ev.Used;
@@ -1464,8 +1464,9 @@ namespace Content.Shared.Interaction
/// Raised directed by-ref on an entity to determine what item will be used in interactions.
/// </summary>
[ByRefEvent]
public record struct GetUsedEntityEvent()
public record struct GetUsedEntityEvent(EntityUid User)
{
public EntityUid User = User;
public EntityUid? Used = null;
public bool Handled => Used != null;