From 07caf1b0bdf56aeebb5940b887ef2c91789d881e Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sat, 14 May 2016 20:33:33 +0200
Subject: [PATCH] fix for null player

---
 addons/common/XEH_postInit.sqf                | 25 ++++++++++++-------
 .../medical/functions/fnc_reviveStateLoop.sqf |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 14e09e2c5b..e75841cb8e 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -389,18 +389,25 @@ GVAR(OldIsCamera) = false;
 
         // we don't want to trigger this just because your ammo counter decreased.
         _data = + GVAR(OldPlayerInventory);
-        if (!((_data select 0) isEqualTo [])) then { 
-            (_data param [0, []]) set [4, primaryWeaponMagazine ACE_player];
-            (_data param [0, []]) set [5, []];
+
+        private _weaponInfo = _data param [0, []];
+        if !(_weaponInfo isEqualTo []) then {
+            _weaponInfo set [4, primaryWeaponMagazine ACE_player];
+            _weaponInfo deleteAt 5;
         };
-        if (!((_data select 1) isEqualTo [])) then { 
-            (_data param [1, []]) set [4, secondaryWeaponMagazine ACE_player];
-            (_data param [1, []]) set [5, []];
+
+        _weaponInfo = _data param [1, []];
+        if !(_weaponInfo isEqualTo []) then {
+            _weaponInfo set [4, secondaryWeaponMagazine ACE_player];
+            _weaponInfo deleteAt 5;
         };
-        if (!((_data select 2) isEqualTo [])) then { 
-            (_data param [2, []]) set [4, handgunMagazine ACE_player];
-            (_data param [2, []]) set [5, []];
+
+        _weaponInfo = _data param [2, []];
+        if !(_weaponInfo isEqualTo []) then {
+            _weaponInfo set [4, handgunMagazine ACE_player];
+            _weaponInfo deleteAt 5;
         };
+
         if !(_data isEqualTo GVAR(OldPlayerInventoryNoAmmo)) then {
             GVAR(OldPlayerInventoryNoAmmo) = _data;
             ["playerInventoryChanged", [ACE_player, GVAR(OldPlayerInventory)]] call FUNC(localEvent);
diff --git a/addons/medical/functions/fnc_reviveStateLoop.sqf b/addons/medical/functions/fnc_reviveStateLoop.sqf
index 3e55f7b7ce..77a48c9340 100644
--- a/addons/medical/functions/fnc_reviveStateLoop.sqf
+++ b/addons/medical/functions/fnc_reviveStateLoop.sqf
@@ -13,7 +13,7 @@
 
 #include "script_component.hpp"
 
-params ["_unit"]
+params ["_unit"];
 
 // If locality changed finish the local loop
 // @todo: reinitiate the loop elsewhere