(779fe50ee) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:42:08 +03:00
parent 42f287e254
commit 114fada396
23 changed files with 295 additions and 306 deletions
@@ -29,6 +29,8 @@ namespace Barotrauma.Items.Components

        private GUIComponent statusContainer, dockingContainer;

+        private bool dockingNetworkMessagePending;
+
        private GUIButton dockingButton;
        private string dockText, undockText;

@@ -308,7 +310,15 @@ namespace Barotrauma.Items.Components
            {
                OnClicked = (btn, userdata) =>
                {
-                    item.SendSignal(0, "1", "toggle_docking", sender: Character.Controlled);
+                    if (GameMain.Client == null)
+                    {
+                        item.SendSignal(0, "1", "toggle_docking", sender: Character.Controlled);
+                    }
+                    else
+                    {
+                        dockingNetworkMessagePending = true;
+                        item.CreateClientEvent(this);
+                    }
                    return true;
                }
            };