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

Make bound-UI range checks consistent with interaction. (#19461)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2023-08-27 10:27:43 +02:00
committed by GitHub
parent 3e93e963b5
commit 3a7274771e
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Interaction/InteractionSystem.cs
View File

@@ -34,6 +34,8 @@ namespace Content.Server.Interaction
base.Initialize(); base.Initialize();
SubscribeNetworkEvent<DragDropRequestEvent>(HandleDragDropRequestEvent); SubscribeNetworkEvent<DragDropRequestEvent>(HandleDragDropRequestEvent);
SubscribeLocalEvent<BoundUserInterfaceCheckRangeEvent>(HandleUserInterfaceRangeCheck);
} }
public override bool CanAccessViaStorage(EntityUid user, EntityUid target) public override bool CanAccessViaStorage(EntityUid user, EntityUid target)
@@ -91,5 +93,20 @@ namespace Content.Server.Interaction
} }
#endregion #endregion
private void HandleUserInterfaceRangeCheck(ref BoundUserInterfaceCheckRangeEvent ev)
{
if (ev.Player.AttachedEntity is not { } user)
return;
if (InRangeUnobstructed(user, ev.Target, ev.UserInterface.InteractionRange))
{
ev.Result = BoundUserInterfaceRangeResult.Pass;
}
else
{
ev.Result = BoundUserInterfaceRangeResult.Fail;
}
}
} }
} }