diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf index 0fd53bf1c..d4ea15c35 100644 --- a/addons/events/fnc_addPlayerEventHandler.sqf +++ b/addons/events/fnc_addPlayerEventHandler.sqf @@ -125,13 +125,13 @@ private _id = switch (_type) do { }; case "group": { if (_applyRetroactively) then { - [GVAR(oldUnit), group GVAR(oldUnit), grpNull] call _function; + [GVAR(oldUnit), GVAR(oldGroup), GVAR(oldGroup)] call _function; // backwards compatiblity }; [QGVAR(groupEvent), _function] call CBA_fnc_addEventHandler // return id }; case "leader": { if (_applyRetroactively) then { - [GVAR(oldUnit), leader GVAR(oldUnit), objNull] call _function; + [GVAR(oldUnit), GVAR(oldLeader), GVAR(oldLeader)] call _function; //backwards compatiblity }; [QGVAR(leaderEvent), _function] call CBA_fnc_addEventHandler // return id }; diff --git a/addons/events/fnc_playerEvent.sqf b/addons/events/fnc_playerEvent.sqf index eb740a6a7..0f06a9420 100644 --- a/addons/events/fnc_playerEvent.sqf +++ b/addons/events/fnc_playerEvent.sqf @@ -71,12 +71,12 @@ if !(_state isEqualTo GVAR(oldState)) then { }; if !(_newGroup isEqualTo GVAR(oldGroup)) then { - [QGVAR(groupEvent), [_unit, GVAR(oldGroup), _newGroup]] call CBA_fnc_localEvent; + [QGVAR(groupEvent), [_unit, GVAR(oldGroup), _newGroup]] call CBA_fnc_localEvent; // intentionally reversed order for backwards compatiblity GVAR(oldGroup) = _newGroup; }; if !(_newLeader isEqualTo GVAR(oldLeader)) then { - [QGVAR(leaderEvent), [_unit, GVAR(oldLeader), _newLeader]] call CBA_fnc_localEvent; + [QGVAR(leaderEvent), [_unit, GVAR(oldLeader), _newLeader]] call CBA_fnc_localEvent; // intentionally reversed order for backwards compatiblity GVAR(oldLeader) = _newLeader; }; @@ -113,7 +113,7 @@ if !(_state isEqualTo GVAR(oldState)) then { } forEach [primaryWeaponMagazine _unit, secondaryWeaponMagazine _unit, handgunMagazine _unit]; if !(_newLoadoutNoAmmo isEqualTo GVAR(oldLoadoutNoAmmo)) then { - [QGVAR(loadoutEvent), [_unit, GVAR(oldLoadout), _newLoadout]] call CBA_fnc_localEvent; + [QGVAR(loadoutEvent), [_unit, _newLoadout, GVAR(oldLoadout)]] call CBA_fnc_localEvent; GVAR(oldLoadoutNoAmmo) = _newLoadoutNoAmmo; };