Performing CPR on unconscious players, a "use on self" button for some items

2016-03-25 15:34:40 +02:00
parent 0dbfb54b5f
commit f585235887
11 changed files with 225 additions and 55 deletions
@@ -77,9 +77,13 @@ namespace Barotrauma
            {
                case RelationType.Contained:
                    if (parentItem == null) return false;
-                    foreach (Item contained in parentItem.ContainedItems)
+
+                    var containedItems = parentItem.ContainedItems;
+                    if (containedItems == null) return false;
+
+                    foreach (Item contained in containedItems)
                    {
-                        if (contained.Condition>0.0f && MatchesItem(contained)) return true;
+                        if (contained.Condition > 0.0f && MatchesItem(contained)) return true;
                    }
                    break;
                case RelationType.Equipped: