v0.10.5.1

2020-09-22 11:31:56 -03:00
parent 44032d0ae0
commit 0002ad2c50
343 changed files with 12276 additions and 5023 deletions
@@ -60,7 +60,7 @@ namespace Barotrauma
        private float sinTime;
        protected override void Act(float deltaTime)
        {
-            var extinguisherItem = character.Inventory.FindItemByIdentifier("fireextinguisher") ?? character.Inventory.FindItemByTag("fireextinguisher");
+            var extinguisherItem = character.Inventory.FindItemByTag("fireextinguisher");
            if (extinguisherItem == null || extinguisherItem.Condition <= 0.0f || !character.HasEquippedItem(extinguisherItem))
            {
                TryAddSubObjective(ref getExtinguisherObjective, () =>
@@ -147,5 +147,14 @@ namespace Barotrauma
                }
            }
        }
+
+        public override void Reset()
+        {
+            base.Reset();
+            getExtinguisherObjective = null;
+            gotoObjective = null;
+            useExtinquisherTimer = 0;
+            sinTime = 0;
+        }
    }
 }