(deeaf479b) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-18 17:52:26 +03:00
parent 3a0d8bbb8a
commit a01729514b
12 changed files with 14 additions and 25 deletions
@@ -553,6 +553,8 @@ namespace Barotrauma

        public static bool HasItem(Character character, string tag, string containedTag, float conditionPercentage = 0)
        {
+            if (character == null) { return false; }
+            if (character.Inventory == null) { return false; }
            var item = character.Inventory.FindItemByTag(tag);
            return item != null &&
                item.ConditionPercentage > conditionPercentage &&