OnFire statuseffects aren't applied to items inside fireproof containers. Closes #98

2017-12-14 17:18:25 +02:00
parent 986862b23e
commit 1da15dbca2
2 changed files with 18 additions and 1 deletions
@@ -74,6 +74,15 @@ namespace Barotrauma
                {
                    if (item.CurrentHull != hull || item.FireProof || item.Condition <= 0.0f) continue;

+                    //don't apply OnFire effects if the item is inside a fireproof container
+                    //(or if it's inside a container that's inside a fireproof container, etc)
+                    Item container = item.Container;
+                    while (container != null)
+                    {
+                        if (container.FireProof) return;
+                        container = container.Container;
+                    }
+
                    if (Vector2.Distance(item.WorldPosition, worldPosition) > attack.Range * 0.1f) continue;

                    item.ApplyStatusEffects(ActionType.OnFire, 1.0f);