From 9f6868eaaae126591887690d401733758f0175c4 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 1 Mar 2018 10:17:32 +0200 Subject: [PATCH] Fixed crashing when attempting to perform CPR _as_ a headless character. --- .../Source/Characters/Animation/HumanoidAnimController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs index 7961a5d08..aebc19264 100644 --- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs +++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs @@ -948,7 +948,7 @@ namespace Barotrauma } int skill = character.GetSkillLevel("Medical"); - if (cprAnimState % 17 > 15.0f && targetHead != null) + if (cprAnimState % 17 > 15.0f && targetHead != null && head != null) { float yPos = (float)Math.Sin(cprAnimState) * 0.2f; head.pullJoint.WorldAnchorB = new Vector2(targetHead.SimPosition.X, targetHead.SimPosition.Y + 0.3f + yPos); @@ -968,7 +968,7 @@ namespace Barotrauma } else { - if (targetHead != null) + if (targetHead != null && head != null) { head.pullJoint.WorldAnchorB = new Vector2(targetHead.SimPosition.X, targetHead.SimPosition.Y + 0.8f); head.pullJoint.Enabled = true;