Merge pull request #2942 from CombatExtended-Continued/bipodDoesntDro…

…pPawn Fix bipodded weapons causing pawns to drop carried pawns
CombatExtended-Continued · Jan 14, 2024 · ffc3bf1 · ffc3bf1
2 parents 4e37bb9 + cc0c958
commit ffc3bf1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/CombatExtended/CombatExtended/Comps/BipodComp.cs b/Source/CombatExtended/CombatExtended/Comps/BipodComp.cs
@@ -32,7 +32,8 @@ public bool ShouldSetUp
                 if (Controller.settings.AutoSetUp)
                 {
                     var varA = this.parent.TryGetComp<CompFireModes>();
-                    result = (((varA.CurrentAimMode == Props.catDef.autosetMode) | (!Props.catDef.useAutoSetMode && varA.CurrentAimMode != AimMode.Snapshot)) && !IsSetUpRn);
+                    Pawn pawn = ((Pawn_EquipmentTracker)this.ParentHolder).pawn;
+                    result = (((varA.CurrentAimMode == Props.catDef.autosetMode) | (!Props.catDef.useAutoSetMode && varA.CurrentAimMode != AimMode.Snapshot)) && !IsSetUpRn && !PawnUtility.IsCarryingPawn(pawn));
                 }
                 else
                 {