(b469a55e9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:00:45 +03:00
parent aad4b64014
commit e019b0e3d5
12 changed files with 331 additions and 67 deletions
@@ -72,15 +72,7 @@ namespace Barotrauma
{
if (character.SelectedConstruction != target.Item)
{
if (character.SelectedConstruction != target.Item && target.CanBeSelected)
{
target.Item.TryInteract(character, false, true);
}
if (component.AIOperate(deltaTime, character, this))
{
isCompleted = true;
}
return;
isCompleted = true;
}
if (component.AIOperate(deltaTime, character, this))
{