Adjust interaction ordering & interaction conditions (#6387)
This commit is contained in:
@@ -35,7 +35,7 @@ namespace Content.Server.Medical.Components
|
||||
|
||||
async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
|
||||
{
|
||||
if (eventArgs.Target == null)
|
||||
if (eventArgs.Target == null || !eventArgs.CanReach)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -54,12 +54,6 @@ namespace Content.Server.Medical.Components
|
||||
return true;
|
||||
}
|
||||
|
||||
if (eventArgs.User != eventArgs.Target &&
|
||||
!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (_entMan.TryGetComponent<SharedStackComponent?>(Owner, out var stack) && !EntitySystem.Get<StackSystem>().Use(Owner, 1, stack))
|
||||
{
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user