From 1b4b5bb2e7faec9e2c92a7f577996b62ec7bcc02 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue, 30 Oct 2018 20:13:54 +0200
Subject: [PATCH] Fixed conditions being ignored on delayed status effects.
 Closes #866

---
 .../BarotraumaShared/Source/StatusEffects/DelayedEffect.cs     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs b/Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs
index d8c318728..4d6cb144d 100644
--- a/Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs
+++ b/Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs
@@ -29,6 +29,7 @@ namespace Barotrauma
             if (!Stackable && DelayList.Any(d => d.Parent == this && d.Targets.Count == 1 && d.Targets[0] == target)) return;
 
             if (targetNames != null && !targetNames.Contains(target.Name)) return;
+            if (!HasRequiredConditions(new List<ISerializableEntity>() { target })) return;
 
             DelayedListElement element = new DelayedListElement
             {
@@ -53,6 +54,8 @@ namespace Barotrauma
                 if (targets.Count == 0) return;
             }
 
+            if (!HasRequiredConditions(targets)) return;
+
             DelayedListElement element = new DelayedListElement
             {
                 Parent = this,