From 575fabb69d3172341339ca40ea88d1555d3ceb89 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Tue, 24 Nov 2015 16:17:06 -0600
Subject: [PATCH] #2872-Map time support for subclasses of ItemWatch

---
 addons/map/XEH_postInitClient.sqf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index 2659440452..00e9e737cf 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -139,5 +139,9 @@ GVAR(hasWatch) = true;
     if (isNull (_this select 0)) exitWith {
         GVAR(hasWatch) = true;
     };
-    GVAR(hasWatch) = "ItemWatch" in (_this select 1 select 17);
+    GVAR(hasWatch) = false;
+    {
+        if (_x isKindOf ["ItemWatch", configFile >> "CfgWeapons"]) exitWith {GVAR(hasWatch) = true;};
+        false
+    } count (assignedItems ACE_player);
 }] call EFUNC(common,addEventHandler);