vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed conditions being ignored on delayed status effects. Closes #866

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-10-30 20:13:54 +02:00
parent 33d971f5d0
commit 1b4b5bb2e7
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/StatusEffects/DelayedEffect.cs
+3
View File
@@ -29,6 +29,7 @@ namespace Barotrauma
if (!Stackable && DelayList.Any(d => d.Parent == this && d.Targets.Count == 1 && d.Targets[0] == target)) return; 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 (targetNames != null && !targetNames.Contains(target.Name)) return;
if (!HasRequiredConditions(new List<ISerializableEntity>() { target })) return;
DelayedListElement element = new DelayedListElement DelayedListElement element = new DelayedListElement
{ {
@@ -53,6 +54,8 @@ namespace Barotrauma
if (targets.Count == 0) return; if (targets.Count == 0) return;
} }
if (!HasRequiredConditions(targets)) return;
DelayedListElement element = new DelayedListElement DelayedListElement element = new DelayedListElement
{ {
Parent = this, Parent = this,