From 64f6a9daa33cbdc7c6585b7799c81de58963e8dc Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sun, 25 Dec 2016 20:01:55 -0500 Subject: [PATCH] Exit vanilla craft item when action is in progress Fixes #1826 --- CHANGE LOG 1.0.6.1.txt | 1 + SQF/dayz_code/actions/player_craftItemVanilla.sqf | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt index d18d77afb..daae3e25a 100644 --- a/CHANGE LOG 1.0.6.1.txt +++ b/CHANGE LOG 1.0.6.1.txt @@ -26,6 +26,7 @@ [FIXED] Wrong bleeding icon on vanilla status UI. @jOoPs @ebayShopper [FIXED] It is no longer possible to autoRun under ponds on Chernarus. #1827 @schwanzkopfhegel [FIXED] Hive connection error after the first and only online player disconnects during the object stream at server start up. #1822 @AirwavesMan @ebayShopper +[FIXED] Vanilla player_craftItem not exiting when action is already in progress. #1826 @schwanzkopfhegel [NOTE] Updated server files were released with the four hotfixes below on December 11th, 2016 (http://dayzepoch.com/a2dayzepoch.php) [FIXED] Hive child 309 errors that resulted in broken saving of newly built storage object inventory. @icomrade diff --git a/SQF/dayz_code/actions/player_craftItemVanilla.sqf b/SQF/dayz_code/actions/player_craftItemVanilla.sqf index 73e4210fa..cb441b3b4 100644 --- a/SQF/dayz_code/actions/player_craftItemVanilla.sqf +++ b/SQF/dayz_code/actions/player_craftItemVanilla.sqf @@ -10,9 +10,10 @@ failChance = 1; */ //diag_log("crafting system"); -dayz_actionInProgress = true; private ["_config","_input","_output","_required","_failChance","_hasInput","_availabeSpace","_classname","_isClass","_onLadder","_hasTools","_avail","_selection","_item","_amount","_itemName","_freeSlots","_slotType","_i","_j","_dis","_sfx"]; +if (dayz_actionInProgress) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;}; +dayz_actionInProgress = true; //diag_log(str(isnil "r_player_crafting")); //Process has started