From 88e0c8f27bb77baac98a7eba977bbae84613e519 Mon Sep 17 00:00:00 2001
From: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:14:42 -0400
Subject: [PATCH] Common - Improve `FUNC(removeSpecificMagazine)` with 2.14
 changes (#9227)

---
 .../functions/fnc_removeSpecificMagazine.sqf       | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/addons/common/functions/fnc_removeSpecificMagazine.sqf b/addons/common/functions/fnc_removeSpecificMagazine.sqf
index 98eee7ba5a..aed1c275c4 100644
--- a/addons/common/functions/fnc_removeSpecificMagazine.sqf
+++ b/addons/common/functions/fnc_removeSpecificMagazine.sqf
@@ -25,18 +25,8 @@ private _fnc_removeMagazine = {
     params ["_container", "_magArray"];
     _magArray params ["_magazineType", "_ammoCount"];
 
-    private _allMagazines = magazinesAmmoCargo _container;
-    private _specificMagazineIndex = _allMagazines findIf {_x isEqualTo _magArray};
-    _allMagazines deleteAt _specificMagazineIndex;
-
-    if (_specificMagazineIndex > -1) exitWith {
-        clearMagazineCargoGlobal _container;
-        if (_container isKindOf "WeaponHolder" && {_allMagazines isNotEqualTo []}) then {
-            _container = createVehicle [typeOf _container, getPosATL _container, [], 0, "CAN_COLLIDE"];
-        };
-        {
-            _container addMagazineAmmoCargo [_x select 0, 1, _x select 1];
-        } forEach _allMagazines;
+    if (_magArray in (magazinesAmmoCargo _container)) exitWith {
+        _container addMagazineAmmoCargo [_magazineType, -1, _ammoCount];
         true
     };
     false