From 6e32fc1144ddfcdd51857cc09e88946031c64059 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Sun, 28 Apr 2024 18:04:56 +0200
Subject: [PATCH] Hearing - Add earplugs only if not present (#9987)

Only add earplugs if not present
---
 addons/hearing/functions/fnc_addEarPlugs.sqf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hearing/functions/fnc_addEarPlugs.sqf b/addons/hearing/functions/fnc_addEarPlugs.sqf
index 035d82956f..fdbcfbc621 100644
--- a/addons/hearing/functions/fnc_addEarPlugs.sqf
+++ b/addons/hearing/functions/fnc_addEarPlugs.sqf
@@ -20,11 +20,14 @@ if !(EGVAR(common,settingsInitFinished)) exitWith {
     EGVAR(common,runAtSettingsInitialized) pushBack [FUNC(addEarPlugs), _this];
 };
 
+// Exit if hearing is disabled or if autoAdd is disabled
+if (!GVAR(enableCombatDeafness) || {GVAR(autoAddEarplugsToUnits) == 0}) exitWith {};
+
 params ["_unit"];
 TRACE_2("params",_unit,typeOf _unit);
 
-// Exit if hearing is disabled OR autoAdd is disabled OR soldier has earplugs already in (persistence scenarios)
-if (!GVAR(enableCombatDeafness) || {GVAR(autoAddEarplugsToUnits) == 0} || {[_unit] call FUNC(hasEarPlugsIn)}) exitWith {};
+// Exit if the unit already has earplugs (in ears (persistence scenarios) or inventory)
+if (_unit call FUNC(hasEarPlugsIn) || {[_unit, "ACE_EarPlugs"] call EFUNC(common,hasItem)}) exitWith {};
 
 // Add earplugs if enabled for everyone or if the soldier has a rocket launcher
 if (GVAR(autoAddEarplugsToUnits) == 2 || {(secondaryWeapon _unit) != ""}) exitWith {