(95bf20e92) Disable watchman and mechanic variants for the build, because they are not yet quite there.

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:17:11 +03:00
parent 5d38344efc
commit 306e3575a8
23 changed files with 452 additions and 176 deletions
@@ -271,13 +271,10 @@ namespace Barotrauma
{
bool isEquipped = !equip || character.HasEquippedItem(item);
if (character.Inventory.Items.Contains(item) && isEquipped) { return true; }
if (!equip)
Item rootContainer = item.GetRootContainer();
if (rootContainer != null && rootContainer.ParentInventory is CharacterInventory)
{
Item rootContainer = item.GetRootContainer();
if (rootContainer != null && rootContainer.ParentInventory is CharacterInventory)
{
return rootContainer.ParentInventory.Owner == character;
}
return rootContainer.ParentInventory.Owner == character;
}
return false;
}