v1.6.17.0 (Unto the Breach update)

2024-10-22 17:29:04 +03:00
parent e74b3cdb17
commit 6e6c17e100
417 changed files with 17166 additions and 5870 deletions
@@ -513,18 +513,19 @@ namespace Barotrauma
        /// </summary>
        private bool Check()
        {
+            if (isCompleted) { return true; }
            if (AbortCondition != null && AbortCondition(this))
            {
                Abandon = true;
                return false;
            }
-            return CheckObjectiveSpecific();
+            return CheckObjectiveState();
        }

        /// <summary>
        /// Should return whether the objective is completed or not.
        /// </summary>
-        protected abstract bool CheckObjectiveSpecific();
+        protected abstract bool CheckObjectiveState();

        private bool CheckState()
        {
@@ -574,8 +575,6 @@ namespace Barotrauma
            }
        }

-        public virtual void SpeakAfterOrderReceived() { }
-
        protected static bool CanPutInInventory(Character character, Item item, bool allowWearing)
        {
            if (item == null) { return false; }