Merge pull request #332 from CBATeam/improve_playereh

pass old unit in 'unit' event, disable on HC and dedicated servers
CBATeam · May 18, 2016 · 189b7c7 · 189b7c7
2 parents 9a43d4c + 9c0e566
commit 189b7c7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf
@@ -32,6 +32,8 @@ Author:
 #include "script_component.hpp"
 SCRIPT(addPlayerEventHandler);
 
+if (!hasInterface) exitWith {-1};
+
 params [["_type", "", [""]], ["_function", {}, [{}]]];
 
 _type = toLower _type;
@@ -82,8 +84,8 @@ if (_id != -1) then {
         GVAR(playerEHInfo) pushBack addMissionEventHandler ["EachFrame", {
             private _player = call CBA_fnc_currentUnit;
             if !(_player isEqualTo GVAR(oldUnit)) then {
+                [QGVAR(unitEvent), [_player, GVAR(oldUnit)]] call CBA_fnc_localEvent;
                 GVAR(oldUnit) = _player;
-                [QGVAR(unitEvent), [_player]] call CBA_fnc_localEvent;
             };
 
             private _data = currentWeapon _player;