From 7aa1b44cae6b84f98a6ceeff008aaad256b7c676 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Thu, 26 May 2016 16:08:55 +0300
Subject: [PATCH] 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)

---
 Subsurface/Content/Items/Tools/tools.xml                   | 7 ++++---
 .../Source/Items/Components/Signal/LightComponent.cs       | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Subsurface/Content/Items/Tools/tools.xml b/Subsurface/Content/Items/Tools/tools.xml
index 2715ebadc..b2f965c69 100644
--- a/Subsurface/Content/Items/Tools/tools.xml
+++ b/Subsurface/Content/Items/Tools/tools.xml
@@ -266,14 +266,15 @@
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" aimpos="35,-10"/>
 
     <LightComponent LightColor="1.0,0.0,0.0,1.0" Flicker="0.5" range="600" IsOn="false">
-      <sprite texture="Content/Lights/light.png" sourcerect="33,0,31,39"/>
-      
       <StatusEffect type="OnUse" target="This" IsOn="true"/>
 
-      <StatusEffect type="OnActive" target="This" Condition="-0.5">
+      <StatusEffect type="OnActive" target="This" Condition="-5.0">
         <ParticleEmitter particle="flare"/>
         <ParticleEmitter particle="bubbles"/>
       </StatusEffect>
+
+      <StatusEffect type="OnBroken" target="This" IsOn="false"/>
+      
       <sound file="flare.ogg" type="OnActive" range="800.0" loop="true"/>
     </LightComponent>
   </Item>
diff --git a/Subsurface/Source/Items/Components/Signal/LightComponent.cs b/Subsurface/Source/Items/Components/Signal/LightComponent.cs
index f25a95a1b..4fa63fdd7 100644
--- a/Subsurface/Source/Items/Components/Signal/LightComponent.cs
+++ b/Subsurface/Source/Items/Components/Signal/LightComponent.cs
@@ -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;