Fixed flare lightcomponent staying active after the flare burns out, OnActive statuseffects are applied to lightcomponents even if the item is inside an inventory/container (= flares won't stop burning if placed back to inventory)

2016-05-26 16:08:55 +03:00
parent 310e85fd8c
commit 7aa1b44cae
2 changed files with 7 additions and 6 deletions
@@ -123,6 +123,8 @@ namespace Barotrauma.Items.Components
           
            light.Submarine = item.Submarine;
            
+            ApplyStatusEffects(ActionType.OnActive, deltaTime);
+
            if (item.Container != null)
            {
                light.Color = Color.Transparent;
@@ -158,8 +160,6 @@ namespace Barotrauma.Items.Components
            else
            {
                lightBrightness = MathHelper.Lerp(lightBrightness, Math.Min(voltage, 1.0f), 0.1f);
-
-                ApplyStatusEffects(ActionType.OnActive, deltaTime);
            }

            light.Color = lightColor * lightBrightness * (1.0f-Rand.Range(0.0f,Flicker));
@@ -167,7 +167,7 @@ namespace Barotrauma.Items.Components

            voltage = 0.0f;
        }
-
+        
        public override bool Use(float deltaTime, Character character = null)
        {
            return true;