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

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs

@@ -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;
                 }
             };

Barotrauma/BarotraumaClient/Source/Items/Item.cs

@@ -1114,8 +1114,10 @@ namespace Barotrauma
 
             //----------------------------------------
 
-            var itemPrefab = MapEntityPrefab.Find(itemName, itemIdentifier) as ItemPrefab;
-            if (itemPrefab == null) return null;
+            var itemPrefab = string.IsNullOrEmpty(itemIdentifier) ?
+                MapEntityPrefab.Find(itemName, null, showErrorMessages: false) as ItemPrefab :
+                MapEntityPrefab.Find(itemName, itemIdentifier, showErrorMessages: false) as ItemPrefab;
+            if (itemPrefab == null) { return null; }
 
             Inventory inventory = null;