From 132b5bc8b23b6eed2208e8c9e6b9b60de5ee88ed Mon Sep 17 00:00:00 2001 From: TaktischerSpeck Date: Wed, 22 Jul 2020 11:39:17 +0200 Subject: [PATCH 1/3] Update fn_houseCleanup.sqf Fix House Cleanup Dupe #729 https://github.com/AsYetUntitled/Framework/issues/729 --- .../Functions/Housing/fn_houseCleanup.sqf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/life_server/Functions/Housing/fn_houseCleanup.sqf b/life_server/Functions/Housing/fn_houseCleanup.sqf index fc835445d..c05e26e1f 100644 --- a/life_server/Functions/Housing/fn_houseCleanup.sqf +++ b/life_server/Functions/Housing/fn_houseCleanup.sqf @@ -16,6 +16,25 @@ private _containers = [_query,2,true] call DB_fnc_asyncCall; _x params ["_pos"]; _pos = parseSimpleArray _pos; { + _x setPos [8417.31,25137.8,0.000846863]; + _x setVariable ["trunk_in_use",true,true]; + + _trunkData = _x getVariable ["Trunk",[[],0]]; + _containerID = _x getVariable ["container_id",-1]; + _trunkData = [_trunkData] call DB_fnc_mresArray; + _query = format ["UPDATE containers SET inventory='%1' WHERE id='%2'",_trunkData,_containerID]; + [_query,1] call DB_fnc_asyncCall; + + _containerID = _x getVariable ["container_id",-1]; + _vehItems = getItemCargo _x; + _vehMags = getMagazineCargo _x; + _vehWeapons = getWeaponCargo _x; + _vehBackpacks = getBackpackCargo _x; + _cargo = [_vehItems,_vehMags,_vehWeapons,_vehBackpacks]; + _cargo = [_cargo] call DB_fnc_mresArray; + _query = format ["UPDATE containers SET gear='%1' WHERE id='%2'",_cargo,_containerID]; + [_query,1] call DB_fnc_asyncCall; + deleteVehicle _x; } forEach (nearestObjects[_pos,["Box_IND_Grenades_F","B_supplyCrate_F"],12]); } forEach _containers; \ No newline at end of file From ffa65715e444139ff2342b5adb6b0ed76d36760d Mon Sep 17 00:00:00 2001 From: TaktischerSpeck Date: Wed, 22 Jul 2020 11:45:13 +0200 Subject: [PATCH 2/3] Update fn_houseCleanup.sqf --- .../Functions/Housing/fn_houseCleanup.sqf | 55 +++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/life_server/Functions/Housing/fn_houseCleanup.sqf b/life_server/Functions/Housing/fn_houseCleanup.sqf index c05e26e1f..81b11b896 100644 --- a/life_server/Functions/Housing/fn_houseCleanup.sqf +++ b/life_server/Functions/Housing/fn_houseCleanup.sqf @@ -1,40 +1,39 @@ /* - File: fn_houseCleanup.sqf - Author: NiiRoZz - - Description: - Cleans up containers inside in house of player. +File: fn_houseCleanup.sqf +Author: NiiRoZz +Description: +Cleans up containers inside in house of player. */ params [ - ["_uid","",[""]] +["_uid","",[""]] ]; private _query = format ["SELECT pos FROM containers WHERE pid='%1' AND owned='1'",_uid]; private _containers = [_query,2,true] call DB_fnc_asyncCall; { - _x params ["_pos"]; - _pos = parseSimpleArray _pos; - { - _x setPos [8417.31,25137.8,0.000846863]; - _x setVariable ["trunk_in_use",true,true]; +_x params ["_pos"]; +_pos = parseSimpleArray _pos; +{ +_x setPos [8417.31,25137.8,0.000846863]; +_x setVariable ["trunk_in_use",true,true]; + +_trunkData = _x getVariable ["Trunk",[[],0]]; +_containerID = _x getVariable ["container_id",-1]; +_trunkData = [_trunkData] call DB_fnc_mresArray; +_query = format ["UPDATE containers SET inventory='%1' WHERE id='%2'",_trunkData,_containerID]; +[_query,1] call DB_fnc_asyncCall; - _trunkData = _x getVariable ["Trunk",[[],0]]; - _containerID = _x getVariable ["container_id",-1]; - _trunkData = [_trunkData] call DB_fnc_mresArray; - _query = format ["UPDATE containers SET inventory='%1' WHERE id='%2'",_trunkData,_containerID]; - [_query,1] call DB_fnc_asyncCall; - - _containerID = _x getVariable ["container_id",-1]; - _vehItems = getItemCargo _x; - _vehMags = getMagazineCargo _x; - _vehWeapons = getWeaponCargo _x; - _vehBackpacks = getBackpackCargo _x; - _cargo = [_vehItems,_vehMags,_vehWeapons,_vehBackpacks]; - _cargo = [_cargo] call DB_fnc_mresArray; - _query = format ["UPDATE containers SET gear='%1' WHERE id='%2'",_cargo,_containerID]; - [_query,1] call DB_fnc_asyncCall; +_containerID = _x getVariable ["container_id",-1]; +_vehItems = getItemCargo _x; +_vehMags = getMagazineCargo _x; +_vehWeapons = getWeaponCargo _x; +_vehBackpacks = getBackpackCargo _x; +_cargo = [_vehItems,_vehMags,_vehWeapons,_vehBackpacks]; +_cargo = [_cargo] call DB_fnc_mresArray; +_query = format ["UPDATE containers SET gear='%1' WHERE id='%2'",_cargo,_containerID]; +[_query,1] call DB_fnc_asyncCall; - deleteVehicle _x; - } forEach (nearestObjects[_pos,["Box_IND_Grenades_F","B_supplyCrate_F"],12]); +deleteVehicle _x; +} forEach (nearestObjects[_pos,["Box_IND_Grenades_F","B_supplyCrate_F"],12]); } forEach _containers; \ No newline at end of file From 149b2501f5efac3e1602712282457b641c88ee3c Mon Sep 17 00:00:00 2001 From: TaktischerSpeck Date: Wed, 22 Jul 2020 11:48:15 +0200 Subject: [PATCH 3/3] Update fn_houseCleanup.sqf --- .../Functions/Housing/fn_houseCleanup.sqf | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/life_server/Functions/Housing/fn_houseCleanup.sqf b/life_server/Functions/Housing/fn_houseCleanup.sqf index 81b11b896..b3add418d 100644 --- a/life_server/Functions/Housing/fn_houseCleanup.sqf +++ b/life_server/Functions/Housing/fn_houseCleanup.sqf @@ -1,39 +1,41 @@ /* -File: fn_houseCleanup.sqf -Author: NiiRoZz -Description: -Cleans up containers inside in house of player. + File: fn_houseCleanup.sqf + Author: NiiRoZz + + Description: + Cleans up containers inside in house of player. */ params [ -["_uid","",[""]] + ["_uid","",[""]] ]; private _query = format ["SELECT pos FROM containers WHERE pid='%1' AND owned='1'",_uid]; private _containers = [_query,2,true] call DB_fnc_asyncCall; { -_x params ["_pos"]; -_pos = parseSimpleArray _pos; -{ -_x setPos [8417.31,25137.8,0.000846863]; -_x setVariable ["trunk_in_use",true,true]; + _x params ["_pos"]; + _pos = parseSimpleArray _pos; + + { + _x setPos [8417.31,25137.8,0.000846863]; + _x setVariable ["trunk_in_use",true,true]; -_trunkData = _x getVariable ["Trunk",[[],0]]; -_containerID = _x getVariable ["container_id",-1]; -_trunkData = [_trunkData] call DB_fnc_mresArray; -_query = format ["UPDATE containers SET inventory='%1' WHERE id='%2'",_trunkData,_containerID]; -[_query,1] call DB_fnc_asyncCall; + _trunkData = _x getVariable ["Trunk",[[],0]]; + _containerID = _x getVariable ["container_id",-1]; + _trunkData = [_trunkData] call DB_fnc_mresArray; + _query = format ["UPDATE containers SET inventory='%1' WHERE id='%2'",_trunkData,_containerID]; + [_query,1] call DB_fnc_asyncCall; -_containerID = _x getVariable ["container_id",-1]; -_vehItems = getItemCargo _x; -_vehMags = getMagazineCargo _x; -_vehWeapons = getWeaponCargo _x; -_vehBackpacks = getBackpackCargo _x; -_cargo = [_vehItems,_vehMags,_vehWeapons,_vehBackpacks]; -_cargo = [_cargo] call DB_fnc_mresArray; -_query = format ["UPDATE containers SET gear='%1' WHERE id='%2'",_cargo,_containerID]; -[_query,1] call DB_fnc_asyncCall; + _containerID = _x getVariable ["container_id",-1]; + _vehItems = getItemCargo _x; + _vehMags = getMagazineCargo _x; + _vehWeapons = getWeaponCargo _x; + _vehBackpacks = getBackpackCargo _x; + _cargo = [_vehItems,_vehMags,_vehWeapons,_vehBackpacks]; + _cargo = [_cargo] call DB_fnc_mresArray; + _query = format ["UPDATE containers SET gear='%1' WHERE id='%2'",_cargo,_containerID]; + [_query,1] call DB_fnc_asyncCall; -deleteVehicle _x; -} forEach (nearestObjects[_pos,["Box_IND_Grenades_F","B_supplyCrate_F"],12]); + deleteVehicle _x; + } forEach (nearestObjects[_pos,["Box_IND_Grenades_F","B_supplyCrate_F"],12]); } forEach _containers; \ No newline at end of file