Unstable 0.1400.1.0

2021-05-20 16:12:54 +03:00
parent 92f0264af2
commit 5bc850cddb
181 changed files with 2475 additions and 1588 deletions
@@ -91,7 +91,7 @@ namespace Barotrauma

        protected override void Act(float deltaTime)
        {
-            if (container == null || (container.Item != null && container.Item.IsThisOrAnyContainerIgnoredByAI()))
+            if (container?.Item == null || container.Item.Removed || container.Item.IsThisOrAnyContainerIgnoredByAI())
            {
                Abandon = true;
                return;
@@ -146,7 +146,10 @@ namespace Barotrauma
                    {
                        DialogueIdentifier = "dialogcannotreachtarget",
                        TargetName = container.Item.Name,
-                        AbortCondition = obj => !ItemToContain.IsOwnedBy(character),
+                        AbortCondition = obj =>
+                            container?.Item == null || container.Item.Removed || container.Item.IsThisOrAnyContainerIgnoredByAI() ||
+                            ItemToContain == null || ItemToContain.Removed ||
+                            !ItemToContain.IsOwnedBy(character) || container.Item.GetRootInventoryOwner() is Character c && c != character,
                        SpeakIfFails = !objectiveManager.IsCurrentOrder<AIObjectiveCleanupItems>()
                    },
                    onAbandon: () => Abandon = true,