Merge pull request #4393 from CombatExtended-Continued/ammo_out_NRE_Fix

N7Huntsman · web-flow · commit 02426e8df195 · 2025-12-26T01:55:52.000-05:00
Fix NRE when magazineless weapon runs out of ammo
diff --git a/Source/CombatExtended/CombatExtended/Comps/CompInventory.cs b/Source/CombatExtended/CombatExtended/Comps/CompInventory.cs
@@ -446,7 +446,10 @@ public bool SwitchToNextViableWeapon(bool useFists = false, bool useAOE = false,
         }
         else if (useFists)
         {
-            parentPawn.jobs.SuspendCurrentJob(JobCondition.InterruptForced);
+            if (parentPawn.jobs.curJob != null) //check there is a current job before attempting to suspend it
+            {
+                parentPawn.jobs.SuspendCurrentJob(JobCondition.InterruptForced);
+            }
             // Put away current weapon
             ThingWithComps eq = parentPawn.equipment?.Primary;
             if (eq != null && !parentPawn.equipment.TryTransferEquipmentToContainer(eq, container))

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,10 @@ public bool SwitchToNextViableWeapon(bool useFists = false, bool useAOE = false,`
`446`	`446`	`}`
`447`	`447`	`else if (useFists)`
`448`	`448`	`{`
`449`		`- parentPawn.jobs.SuspendCurrentJob(JobCondition.InterruptForced);`
	`449`	`+ if (parentPawn.jobs.curJob != null) //check there is a current job before attempting to suspend it`
	`450`	`+ {`
	`451`	`+ parentPawn.jobs.SuspendCurrentJob(JobCondition.InterruptForced);`
	`452`	`+ }`
`450`	`453`	`// Put away current weapon`
`451`	`454`	`ThingWithComps eq = parentPawn.equipment?.Primary;`
`452`	`455`	`if (eq != null && !parentPawn.equipment.TryTransferEquipmentToContainer(eq, container))`