From 13a2e4d33b6726c7ef249609b57e3ee35df06ac3 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon, 30 Jul 2018 20:02:56 +0300
Subject: [PATCH] StatusEffect.StopAll clears DurationList and DelayList.
 Closes #543

---
 .../BarotraumaShared/Source/StatusEffects/DelayedEffect.cs    | 2 +-
 .../BarotraumaShared/Source/StatusEffects/StatusEffect.cs     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs b/Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs
index 225c061ca..d8c318728 100644
--- a/Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs
+++ b/Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs
@@ -13,7 +13,7 @@ namespace Barotrauma
     }
     class DelayedEffect : StatusEffect
     {
-        public static List<DelayedListElement> DelayList = new List<DelayedListElement>();
+        public static readonly List<DelayedListElement> DelayList = new List<DelayedListElement>();
 
         private float delay;
 
diff --git a/Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs b/Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs
index 51096948a..4293ee1b3 100644
--- a/Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs
+++ b/Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs
@@ -50,7 +50,7 @@ namespace Barotrauma
         private HashSet<string> tags;
         
         private readonly float duration;
-        public static List<DurationListElement> DurationList = new List<DurationListElement>();
+        public static readonly List<DurationListElement> DurationList = new List<DurationListElement>();
 
         public bool CheckConditionalAlways; //Always do the conditional checks for the duration/delay. If false, only check conditional on apply.
 
@@ -510,6 +510,8 @@ namespace Barotrauma
         public static void StopAll()
         {
             CoroutineManager.StopCoroutines("statuseffect");
+            DelayedEffect.DelayList.Clear();
+            DurationList.Clear();
         }
 
         public void AddTag(string tag)