More checks to cartridge pop

project-fika · Oct 18, 2024 · 7a96fa2 · 7a96fa2
1 parent fef6a36
commit 7a96fa2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedFirearmController.cs b/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedFirearmController.cs
@@ -424,9 +424,9 @@ private void HandleObservedShot(ref ShotInfoPacket packet, InventoryController i
 
 			ammo.IsUsed = true;
 
-			if (magazine != null && magazine is not CylinderMagazineClass && !Weapon.BoltAction)
+			if (magazine != null && magazine is not CylinderMagazineClass && magazine.Count > 0 && !Weapon.BoltAction)
 			{
-				if (Item.HasChambers)
+				if (Item.HasChambers && magazine.IsAmmoCompatible(Item.Chambers) && Item.Chambers[0].ContainedItem == null)
 				{
 					magazine.Cartridges.PopTo(inventoryController, Item.Chambers[0].CreateItemAddress());
 				}