(dc8407cf2) Properly remove reported targets when they are done. Fix get item completing when it shouldn't if the target item was supposed to be equipped.

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