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

StatusEffects don't attempt to use removed items or apply property values to removed entities.

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-30 14:30:27 +03:00
parent b4d0a1bd38
commit 7acd3f746d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs
+6 -1
View File
@@ -370,6 +370,7 @@ namespace Barotrauma
{ {
foreach (Item item in targets.FindAll(t => t is Item).Cast<Item>()) foreach (Item item in targets.FindAll(t => t is Item).Cast<Item>())
{ {
if (item.Removed) continue;
item.Use(deltaTime, targets.FirstOrDefault(t => t is Character) as Character); item.Use(deltaTime, targets.FirstOrDefault(t => t is Character) as Character);
} }
} }
@@ -396,10 +397,14 @@ namespace Barotrauma
{ {
foreach (ISerializableEntity target in targets) foreach (ISerializableEntity target in targets)
{ {
if (target is Entity targetEntity)
{
if (targetEntity.Removed) continue;
}
for (int i = 0; i < propertyNames.Length; i++) for (int i = 0; i < propertyNames.Length; i++)
{ {
SerializableProperty property; SerializableProperty property;
if (target == null || target.SerializableProperties == null || !target.SerializableProperties.TryGetValue(propertyNames[i], out property)) continue; if (target == null || target.SerializableProperties == null || !target.SerializableProperties.TryGetValue(propertyNames[i], out property)) continue;
ApplyToProperty(property, propertyEffects[i], deltaTime); ApplyToProperty(property, propertyEffects[i], deltaTime);