Unstable 1.1.15.0

This commit is contained in:
Markus Isberg
2023-10-05 14:55:53 +03:00
parent cf8f0de659
commit 12e43d95ef
13 changed files with 50 additions and 45 deletions
@@ -133,15 +133,13 @@ namespace Barotrauma
tempTargetItems.Clear();
foreach (var target in targets)
{
if (target is not Item item) { continue; }
if (itemTags.Any() && itemTags.None(item.HasTag) &&
itemIdentifierSplit.Any() && !itemIdentifierSplit.Contains(item.Prefab.Identifier))
if (target is not Item item) { continue; }
if (itemTags.Any(item.HasTag) || itemIdentifierSplit.Contains(item.Prefab.Identifier))
{
continue;
}
if (ConditionalsMatch(item, character: null))
{
tempTargetItems.Add(item);
if (ConditionalsMatch(item, character: null))
{
tempTargetItems.Add(item);
}
}
}
if (EnoughTargets(targetCount, tempTargetItems.Count))