Added some null checks

2017-06-05 18:40:25 +03:00
parent 892d28fd39
commit acad7980f2
3 changed files with 10 additions and 3 deletions
@@ -243,7 +243,11 @@ namespace Barotrauma.Items.Components
        public override void Update(float deltaTime, Camera cam)
        {
            if (item.body == null || !item.body.Enabled) return;
-            if (!picker.HasSelectedItem(item)) IsActive = false;
+            if (picker == null || !picker.HasSelectedItem(item))
+            {
+                IsActive = false;
+                return;
+            }

            ApplyStatusEffects(ActionType.OnActive, deltaTime, picker);