Revert "Common - Fix calling getVar on null object in `canInteractWit…

…h` (acemod#8532)" (acemod#8564) This reverts commit a0e9f60.
AndreasBrostrom · Dec 3, 2021 · 30836d5 · 30836d5
1 parent a5d8527
commit 30836d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/addons/common/functions/fnc_canInteractWith.sqf b/addons/common/functions/fnc_canInteractWith.sqf
@@ -21,11 +21,10 @@ 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 _target) && {
-    private _owner = _target getVariable [QGVAR(owner), objNull];
-    (!isNull _owner) && {_unit != _owner}}
-) exitWith {false};
+if (!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,9 +23,7 @@ if (isNull _unit) exitWith {};
 private _virtualLoad = 0;
 
 {
-    if (!isNull _x) then {
-        _virtualLoad = _virtualLoad + (_x getVariable [QGVAR(vLoad), 0]);
-    };
+    _virtualLoad = _virtualLoad + (_x getVariable [QGVAR(vLoad), 0]);
 } forEach [
     _unit,
     uniformContainer _unit,