Merge pull request #3113 from masakitenchi/GizmoFix

Fix NRE when selecting Corpse
CombatExtended-Continued · May 1, 2024 · e672d1e · e672d1e
2 parents 3811e93 + c4853eb
commit e672d1e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/CombatExtended/CombatExtended/Comps/CompMeleeTargettingGizmo.cs b/Source/CombatExtended/CombatExtended/Comps/CompMeleeTargettingGizmo.cs
@@ -171,7 +171,8 @@ private string heightString
         public override IEnumerable<Gizmo> CompGetGizmosExtra()
         {
             // Don't let people control melee targeting for non-colonist pawns or colonists in a mental state
-            if (!PawnParent.IsColonist || PawnParent.InAggroMentalState)
+            // Corpses are also auto-assigned this comp, but clearly they are not typeof(Pawn)
+            if (parent is Corpse || !PawnParent.IsColonist || PawnParent.InAggroMentalState)
             {
                 yield break;
             }