(59629f0e1) Fixed: ContentPackage path not being valid on MacOS
This commit is contained in:
@@ -29,8 +29,6 @@ namespace Barotrauma.Items.Components
|
||||
|
||||
private GUIComponent statusContainer, dockingContainer;
|
||||
|
||||
private bool dockingNetworkMessagePending;
|
||||
|
||||
private GUIButton dockingButton;
|
||||
private string dockText, undockText;
|
||||
|
||||
@@ -310,15 +308,7 @@ namespace Barotrauma.Items.Components
|
||||
{
|
||||
OnClicked = (btn, userdata) =>
|
||||
{
|
||||
if (GameMain.Client == null)
|
||||
{
|
||||
item.SendSignal(0, "1", "toggle_docking", sender: Character.Controlled);
|
||||
}
|
||||
else
|
||||
{
|
||||
dockingNetworkMessagePending = true;
|
||||
item.CreateClientEvent(this);
|
||||
}
|
||||
item.SendSignal(0, "1", "toggle_docking", sender: Character.Controlled);
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1114,10 +1114,8 @@ namespace Barotrauma
|
||||
|
||||
//----------------------------------------
|
||||
|
||||
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; }
|
||||
var itemPrefab = MapEntityPrefab.Find(itemName, itemIdentifier) as ItemPrefab;
|
||||
if (itemPrefab == null) return null;
|
||||
|
||||
Inventory inventory = null;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user