Adjust interaction ordering & interaction conditions (#6387)

2022-02-05 15:39:01 +13:00
parent 442d7dbf8e
commit dd61fb46ea
28 changed files with 88 additions and 167 deletions
--- a/Content.Server/Crayon/CrayonComponent.cs
+++ b/Content.Server/Crayon/CrayonComponent.cs
@@ -108,7 +108,7 @@ namespace Content.Server.Crayon

        async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
        {
-            if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: false, popup: true,
+            if (!eventArgs.User.InRangeUnobstructed(eventArgs.ClickLocation, ignoreInsideBlocker: false, popup: true,
                collisionMask: Shared.Physics.CollisionGroup.MobImpassable))
            {
                return true;