diff --git a/SQF/dayz_code/actions/player_chopWood.sqf b/SQF/dayz_code/actions/player_chopWood.sqf index da071578b..72e993a7c 100644 --- a/SQF/dayz_code/actions/player_chopWood.sqf +++ b/SQF/dayz_code/actions/player_chopWood.sqf @@ -105,13 +105,17 @@ if (!isNull _tree) then { format[localize "str_player_24_progress", _counter,_countOut] call dayz_rollingMessages; }; - if (_proceed ||(_counter > 0) ) then { - //remove vehicle, Need to ask server to remove. - PVDZ_objgather_Knockdown = [_tree,player]; - publicVariableServer "PVDZ_objgather_Knockdown"; - //"Chopping down tree." call dayz_rollingMessages; - //localize "str_player_25" call dayz_rollingMessages; - }; + if (_proceed || (_counter > 0)) then { + //localize "str_choppingTree" call dayz_rollingMessages; + //localize "str_player_25" call dayz_rollingMessages; + if (typeOf _tree == "") then { + // Ask server to setDamage on tree and sync for JIP + PVDZ_objgather_Knockdown = [_tree,player]; + publicVariableServer "PVDZ_objgather_Knockdown"; + } else { + deleteVehicle _tree; + }; + }; if !(_proceed) then { localize "str_player_24_Stoped" call dayz_rollingMessages; diff --git a/SQF/dayz_code/compile/player_harvest.sqf b/SQF/dayz_code/compile/player_harvest.sqf index 4362814c8..37b46cbc4 100644 --- a/SQF/dayz_code/compile/player_harvest.sqf +++ b/SQF/dayz_code/compile/player_harvest.sqf @@ -17,14 +17,18 @@ if (_ammo in ["Hatchet_Swing_Ammo","Chainsaw_Swing_Ammo"]) then { // get 2d distance _distance2d = [player, _tree] call BIS_fnc_distance2D; - if(_distance2d <= 5) then { - + if (_distance2d <= 5) then { // damage must be going down _damage = damage _tree; if (DZE_TEMP_treedmg < _damage) then { if (_damage < 0.99 && {(random 1) > 0.9}) then { - PVDZ_objgather_Knockdown = [_tree,player]; // Ask server to setDamage on tree - publicVariableServer "PVDZ_objgather_Knockdown"; + if (typeOf _tree == "") then { + // Ask server to setDamage on tree and sync for JIP + PVDZ_objgather_Knockdown = [_tree,player]; + publicVariableServer "PVDZ_objgather_Knockdown"; + } else { + deleteVehicle _tree; + }; }; _itemOut = if (_ammo == "Chainsaw_Swing_Ammo") then {"PartWoodLumber"} else {"PartWoodPile"}; // Log can be crafted to > 2x plank > 4x woodpile [_itemOut,1,1] call fn_dropItem;