Merge branch 'master' into 20-06-24-movement-prediction

2020-06-24 04:04:43 +02:00
parent da45a52325 78085855db
commit f3a816321c
2259 changed files with 16436 additions and 11772 deletions
--- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
@@ -117,7 +117,9 @@ namespace Content.Server.GameObjects
        {
            protected override void GetData(IEntity user, ItemComponent component, VerbData data)
            {
-                if (ContainerHelpers.IsInContainer(component.Owner) || !component.CanPickup(user))
+                if (!ActionBlockerSystem.CanInteract(user) ||
+                    ContainerHelpers.IsInContainer(component.Owner) ||
+                    !component.CanPickup(user))
                {
                    data.Visibility = VerbVisibility.Invisible;
                    return;