v0.12.0.2

This commit is contained in:
Joonas Rikkonen
2021-02-10 17:08:21 +02:00
parent 5c80a59bdd
commit 694cdfee7b
353 changed files with 12897 additions and 5028 deletions
@@ -58,12 +58,17 @@ namespace Barotrauma
protected override void Act(float deltaTime)
{
Item itemToDecontain = targetItem ?? sourceContainer.Inventory.FindItem(i => itemIdentifiers.Any(id => i.Prefab.Identifier == id || i.HasTag(id)), recursive: false);
Item itemToDecontain = targetItem ?? sourceContainer.Inventory.FindItem(i => itemIdentifiers.Any(id => i.Prefab.Identifier == id || i.HasTag(id) && !i.IgnoreByAI), recursive: false);
if (itemToDecontain == null)
{
Abandon = true;
return;
}
if (itemToDecontain.IgnoreByAI)
{
Abandon = true;
return;
}
if (targetContainer == null)
{
if (sourceContainer == null)
@@ -77,7 +82,7 @@ namespace Barotrauma
return;
}
}
else if (targetContainer.Inventory.Items.Contains(itemToDecontain))
else if (targetContainer.Inventory.Contains(itemToDecontain))
{
IsCompleted = true;
return;