Added some null checks

This commit is contained in:
Joonas Rikkonen
2017-06-05 18:40:25 +03:00
parent 892d28fd39
commit acad7980f2
3 changed files with 10 additions and 3 deletions
@@ -1109,7 +1109,7 @@ namespace Barotrauma
for (int i = 0; i < character.SelectedItems.Length; i++) for (int i = 0; i < character.SelectedItems.Length; i++)
{ {
if (character.SelectedItems[i] != null) if (character.SelectedItems[i] != null && character.SelectedItems[i].body != null)
{ {
difference = character.SelectedItems[i].body.SimPosition - torso.SimPosition; difference = character.SelectedItems[i].body.SimPosition - torso.SimPosition;
difference = Vector2.Transform(difference, torsoTransform); difference = Vector2.Transform(difference, torsoTransform);
+4 -1
View File
@@ -52,7 +52,10 @@ namespace Barotrauma
foreach (Limb limb in AnimController.Limbs) foreach (Limb limb in AnimController.Limbs)
{ {
limb.body.Enabled = enabled; if (limb.body != null)
{
limb.body.Enabled = enabled;
}
} }
AnimController.Collider.Enabled = value; AnimController.Collider.Enabled = value;
} }
@@ -243,7 +243,11 @@ namespace Barotrauma.Items.Components
public override void Update(float deltaTime, Camera cam) public override void Update(float deltaTime, Camera cam)
{ {
if (item.body == null || !item.body.Enabled) return; 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); ApplyStatusEffects(ActionType.OnActive, deltaTime, picker);