2f107db...5202af9

2019-03-18 21:42:26 +02:00
parent 58c92888b7
commit 044fd3344b
395 changed files with 27417 additions and 19754 deletions
@@ -66,7 +66,9 @@ namespace Barotrauma.Items.Components
            {
                if (picker.PickingItem == null && PickingTime <= float.MaxValue)
                {
+#if SERVER
                    item.CreateServerEvent(this);
+#endif
                    CoroutineManager.StartCoroutine(WaitForPick(picker, PickingTime));
                }
                return false;
@@ -143,7 +145,11 @@ namespace Barotrauma.Items.Components

            StopPicking(picker);

-            if (!picker.IsRemotePlayer || GameMain.Server != null) OnPicked(picker);
+            bool isNotRemote = true;
+#if CLIENT
+            isNotRemote = !picker.IsRemotePlayer;
+#endif
+            if (isNotRemote) OnPicked(picker);

            yield return CoroutineStatus.Success;
        }