Unstable 0.1300.0.5

2021-04-01 16:09:18 +03:00
parent 862221635c
commit 96b2184811
54 changed files with 429 additions and 122 deletions
@@ -443,6 +443,7 @@ namespace Barotrauma.Items.Components
            }
            else
            {
+
                //not attached -> pick the item instantly, ignoring picking time
                return OnPicked(picker);
            }
@@ -450,6 +451,10 @@ namespace Barotrauma.Items.Components

        public override bool OnPicked(Character picker)
        {
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient)
+            {
+                return false;
+            }
            if (base.OnPicked(picker))
            {
                DeattachFromWall();