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

2019-05-16 06:31:49 +03:00
parent fc22eb5088
commit 80c563e7b0
23 changed files with 296 additions and 295 deletions
@@ -100,8 +100,7 @@ namespace Barotrauma
                objectiveManager.GetObjective<AIObjectiveIdle>()?.Wander(deltaTime);
                return;
            }
-            if (moveToTarget.CurrentHull == character.CurrentHull && 
-                Vector2.DistanceSquared(character.Position, moveToTarget.Position) < MathUtils.Pow(targetItem.InteractDistance, 2))
+            if (character.CanInteractWith(targetItem, out _, checkLinked: false))
            {
                if (IsTakenBySomeone(targetItem))
                {