Merge pull request #1602 from Vdauphin/FIX-carry_damage

FIX: Damage after droping an object while running
Vdauphin · Apr 8, 2024 · e35bb4d · e35bb4d
2 parents e1c5006 + 01729fc
commit e35bb4d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/log/place.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/log/place.sqf
@@ -73,6 +73,9 @@ btc_log_placing_d = 1.5 + abs(((_bbr select 1) select 1) - ((_bbr select 0) sele
     if (!alive player || player getVariable ["ACE_isUnconscious", false] || !btc_log_placing || (vehicle player != player)) then {
         _arguments params ["_placing_obj", "_actionEH", "_place_EH_keydown"];
 
+        ["ace_common_fixCollision", player] call CBA_fnc_localEvent;
+        ["ace_common_fixCollision", btc_log_placing_obj, btc_log_placing_obj] call CBA_fnc_targetEvent;
+
         //remove PFH
         [_idPFH] call CBA_fnc_removePerFrameHandler;
 

diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/log/place_key_down.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/log/place_key_down.sqf
@@ -34,6 +34,8 @@ params [
     ["_keyPressed", false, [false]]
 ];
 
+if !(btc_log_placing) exitWith {};
+
 private _turbo = if (_shift) then {1} else {0};
 
 //height [+] (Key 16: Q)