Merge pull request #4289 from acemod/earlyAddPlayerEventHandler

Fix null ace_player from early call to addPlayerEH
acemod · Aug 27, 2016 · 1366a6f · 1366a6f
2 parents 34b8686 + 3f34308
commit 1366a6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
@@ -295,6 +295,13 @@ enableCamShake true;
 // Set up numerous eventhanders for player controlled units
 //////////////////////////////////////////////////
 
+// It is possible that CBA_fnc_addPlayerEventHandler has allready been called and run
+// We will NOT get any events for the initial state, so manually set ACE_player
+if (!isNull (missionNamespace getVariable ["cba_events_oldUnit", objNull])) then {
+    INFO("CBA_fnc_addPlayerEventHandler has already run - manually setting ace_player");
+    ACE_player = cba_events_oldUnit;
+};
+
 // "playerChanged" event
 ["unit", {
     ACE_player = (_this select 0);

diff --git a/addons/noradio/XEH_postInit.sqf b/addons/noradio/XEH_postInit.sqf
@@ -10,6 +10,11 @@ if (isServer) then {
 
 if (!hasInterface) exitWith {};
 
+// Handle early CBA_fnc_addPlayerEventHandler
+if (!isNull ace_player) then {
+    [ace_player, "isPlayer"] call EFUNC(common,muteUnit);
+};
+
 // mutes/unmutes units when the player changes
 ["unit", {
     params ["_newPlayer", "_oldPlayer"];