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

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -34,6 +34,20 @@ namespace Barotrauma.Items.Components
            }
        }

+        public override bool IsActive
+        {
+            get { return base.IsActive; }
+            set
+            {
+                base.IsActive = value;
+                if (!value)
+                {
+                    nodes.Clear();
+                    charactersInRange.Clear();
+                }
+            }
+        }
+
        [Serialize(100.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 5000.0f)]
        public float Range
        {
@@ -126,14 +140,19 @@ namespace Barotrauma.Items.Components
            }
            else
            {
-                nodes.Clear();
-                charactersInRange.Clear();
                IsActive = false;
            }

            voltage = 0.0f;
        }

+        public override void UpdateBroken(float deltaTime, Camera cam)
+        {
+            base.UpdateBroken(deltaTime, cam);
+            nodes.Clear();
+            charactersInRange.Clear();
+        }
+
        private void Discharge()
        {
            ApplyStatusEffects(ActionType.OnUse, 1.0f);