(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
@@ -88,21 +88,6 @@ namespace Barotrauma
            }
        }

-        public override void Update(float deltaTime)
-        {
-            if (objectiveManager.CurrentObjective == this)
-            {
-                if (randomTimer > 0)
-                {
-                    randomTimer -= deltaTime;
-                }
-                else
-                {
-                    SetRandom();
-                }
-            }
-        }
-
        public override bool IsCompleted() => false;
        public override bool CanBeCompleted => true;

@@ -331,16 +316,8 @@ namespace Barotrauma
        {
            if (hull == null) { return true; }
            string hullName = hull.RoomName?.ToLowerInvariant();
-            bool isForbidden = hullName == "ballast" || hullName == "airlock";
-            foreach (Item item in Item.ItemList)
-            {
-                if (item.CurrentHull == hull && (item.HasTag("ballast") || item.HasTag("airlock")))
-                {
-                    isForbidden = true;
-                    break;
-                }
-            }
-            return isForbidden;
+            if (hullName == null) { return false; }
+            return hullName.Contains("ballast") || hullName.Contains("airlock");
        }

        public override bool IsDuplicate(AIObjective otherObjective)