Common - Fix calling getVar on null object in canInteractWith (#8532)

* Common - Fix calling getVar on null object in `canInteractWith` * why was this added dedman?
acemod · Oct 16, 2021 · a0e9f60 · a0e9f60
1 parent 2dfbaa9
commit a0e9f60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/addons/common/functions/fnc_canInteractWith.sqf b/addons/common/functions/fnc_canInteractWith.sqf
@@ -21,10 +21,11 @@ params ["_unit", "_target", ["_exceptions", []]];
 
 _exceptions = _exceptions apply {toLower _x};
 
-private _owner = _target getVariable [QGVAR(owner), objNull];
-
 // exit if the target is not free to interact
-if (!isNull _owner && {_unit != _owner}) exitWith {false};
+if ((!isNull _target) && {
+    private _owner = _target getVariable [QGVAR(owner), objNull];
+    (!isNull _owner) && {_unit != _owner}}
+) exitWith {false};
 
 // check general conditions
 private _conditions = missionNamespace getVariable [QGVAR(InteractionConditions), [[],[]]];

diff --git a/addons/movement/functions/fnc_handleVirtualMass.sqf b/addons/movement/functions/fnc_handleVirtualMass.sqf
@@ -23,7 +23,9 @@ if (isNull _unit) exitWith {};
 private _virtualLoad = 0;
 
 {
-    _virtualLoad = _virtualLoad + (_x getVariable [QGVAR(vLoad), 0]);
+    if (!isNull _x) then {
+        _virtualLoad = _virtualLoad + (_x getVariable [QGVAR(vLoad), 0]);
+    };
 } forEach [
     _unit,
     uniformContainer _unit,