From c9f9b89ea2b1f67fd828fb2ba657636a18ab7708 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Thu, 25 Aug 2016 18:23:42 -0500
Subject: [PATCH] Fix merge (was moved to XEH_postInitServer)

Use short circuit for loadout change and add note
---
 addons/map/XEH_postInitClient.sqf | 26 ++++----------------------
 addons/map/XEH_postInitServer.sqf |  2 +-
 addons/map/config.cpp             |  2 +-
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index 9170f7ebf6..683b7b1eda 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -1,23 +1,5 @@
 #include "script_component.hpp"
 
-//Delete map glow lights from disconnecting players #2810
-if (isServer) then {
-    addMissionEventHandler ["HandleDisconnect",{
-        params ["_disconnectedPlayer"];
-
-        if ((!GVAR(mapGlow)) || {isNull _disconnectedPlayer}) exitWith {};
-        {
-            if (_x isKindOf "ACE_FlashlightProxy_White") then {
-                // ACE_LOGINFO_2("Deleting leftover light [%1:%2] from DC player [%3]", _x, typeOf _x, _disconnectedPlayer);
-                detach _x;
-                deleteVehicle _x;
-            };
-        } forEach attachedObjects _disconnectedPlayer;
-
-        nil
-    }];
-};
-
 // Exit on Headless as well
 if (!hasInterface) exitWith {};
 
@@ -98,10 +80,10 @@ call FUNC(determineZoom);
     if (GVAR(mapIllumination)) then {
         ["loadout", {
             params ["_player", ""];
-            private _flashlightItems = [_player] call FUNC(getUnitFlashlights);
             private _unitLight = _player getVariable [QGVAR(flashlight), ["", objNull]];
             _unitLight params ["_flashlight", "_glow"];
-            if (!(_flashlight isEqualTo "") && {!(_flashlight in _flashlightItems)}) then {
+            if ((_flashlight != "") && {!(_flashlight in ([_player] call FUNC(getUnitFlashlights)))}) then {
+                // remove the current glow if the unit suddenly lost it's flashlight
                 if (!isNull _glow) then {
                     _glow = [_player, "", false] call FUNC(flashlightGlow);
                 };
@@ -110,7 +92,7 @@ call FUNC(determineZoom);
         }] call CBA_fnc_addPlayerEventHandler;
 
         if (GVAR(mapGlow)) then {
-            ["ace_visibleMapChanged", {
+            ["visibleMap", {
                 params ["_player", "_mapOn"];
                 private _unitLight = _player getVariable [QGVAR(flashlight), ["", objNull]];
                 _unitLight params ["_flashlight", "_glow"];
@@ -125,7 +107,7 @@ call FUNC(determineZoom);
                         [_player, ""] call FUNC(flashlightGlow);
                     };
                 };
-            }] call CBA_fnc_addEventHandler;
+            }] call CBA_fnc_addPlayerEventHandler;
         };
     };
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/map/XEH_postInitServer.sqf b/addons/map/XEH_postInitServer.sqf
index 763c21b002..dc0c7f991e 100644
--- a/addons/map/XEH_postInitServer.sqf
+++ b/addons/map/XEH_postInitServer.sqf
@@ -13,4 +13,4 @@ addMissionEventHandler ["HandleDisconnect",{
     };
 
     nil
-}];
\ No newline at end of file
+}];
diff --git a/addons/map/config.cpp b/addons/map/config.cpp
index 6a26f74a6b..b619d96d10 100644
--- a/addons/map/config.cpp
+++ b/addons/map/config.cpp
@@ -165,4 +165,4 @@ class RscDisplayServerGetReady: RscDisplayGetReady {
             #include "MapControls.hpp"
         };
     };
-};
\ No newline at end of file
+};