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

StatusEffects with a duration ignore removed targets and automatically stop if all targets have been removed. Closes #571

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-08-06 11:09:06 +03:00
parent 0fa046b325
commit 3956c1d7a0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs
+9 -4
View File
@@ -484,7 +484,14 @@ namespace Barotrauma
if (element.Parent.CheckConditionalAlways && !element.Parent.HasRequiredConditions(element.Targets)) if (element.Parent.CheckConditionalAlways && !element.Parent.HasRequiredConditions(element.Targets))
{ {
DurationList.Remove(element); DurationList.RemoveAt(i);
continue;
}
element.Targets.RemoveAll(t => t is Entity entity && entity.Removed);
if (element.Targets.Count == 0)
{
DurationList.RemoveAt(i);
continue; continue;
} }
@@ -492,9 +499,7 @@ namespace Barotrauma
{ {
for (int n = 0; n < element.Parent.propertyNames.Length; n++) for (int n = 0; n < element.Parent.propertyNames.Length; n++)
{ {
SerializableProperty property; if (target == null || target.SerializableProperties == null || !target.SerializableProperties.TryGetValue(element.Parent.propertyNames[n], out SerializableProperty property)) continue;
if (target == null || target.SerializableProperties == null || !target.SerializableProperties.TryGetValue(element.Parent.propertyNames[n], out property)) continue;
element.Parent.ApplyToProperty(property, element.Parent.propertyEffects[n], CoroutineManager.UnscaledDeltaTime); element.Parent.ApplyToProperty(property, element.Parent.propertyEffects[n], CoroutineManager.UnscaledDeltaTime);
} }