Reduce action blocker uses and add target entity to CanInteract (#6655)

2022-02-15 17:06:52 +13:00
parent 334568dad2
commit ad9ddf1552
60 changed files with 286 additions and 402 deletions
--- a/Content.Shared/Storage/SharedStorageComponent.cs
+++ b/Content.Shared/Storage/SharedStorageComponent.cs
@@ -34,7 +34,7 @@ namespace Content.Shared.Storage

        bool IDraggable.Drop(DragDropEvent eventArgs)
        {
-            if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(eventArgs.User))
+            if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(eventArgs.User, eventArgs.Target))
            {
                return false;
            }