Container bugfix

.editorconfig

@@ -12,7 +12,7 @@ indent_style = space
 # 1 indent is 4 spaces
 indent_size = 4
 # Windows-style newlines
-end_of_line = crlf
+end_of_line = lf
 # Set default character encoding
 charset = utf-8
 # Remove any whitespace characters preceding newline characters

AL.ini

@@ -193,6 +193,11 @@ SQL1_1 = SELECT houses.id, houses.pid, houses.pos, players.name, houses.garage F
 SQL1_INPUTS = 1
 OUTPUT = 1, 2-STRING, 3, 4-STRING, 5
 
+[selectHousesCleanup]
+SQL1_1 = SELECT pos FROM houses WHERE pid = ?
+SQL1_INPUTS = 1
+OUTPUT = 1
+
 [selectHousePositions]
 SQL1_1 = SELECT pid, pos FROM houses WHERE pid = ? AND owned = '1'
 SQL1_INPUTS = 1
@@ -214,11 +219,6 @@ SQL1_INPUTS = 1
 SQL1_1 = UPDATE houses SET garage = ? WHERE pid = ? AND pos = ?
 SQL1_INPUTS = 1, 2, 3
 
-[selectContainerPositions]
-SQL1_1 = SELECT pid, pos FROM containers WHERE pid = ? AND owned = '1'
-SQL1_INPUTS = 1
-OUTPUT = 1-STRING, 2
-
 [selectContainers]
 SQL1_1 = SELECT pid, pos, classname, inventory, gear, dir, id FROM containers WHERE pid = ? AND owned = '1'
 SQL1_INPUTS = 1

life_server/Functions/Housing/fn_houseCleanup.sqf

@@ -8,13 +8,18 @@ params [
     ["_uid","",[""]]
 ];
 
-private _query = format ["selectContainerPositions:%1", _this];
-private _containers = [_query,2,true] call DB_fnc_asyncCall;
+private _query = format ["selectHousesCleanup:%1", _uid];
+private _houses = [_query,2,true] call DB_fnc_asyncCall;
 
 {
     _x params ["_pos"];
-    _pos = parseSimpleArray _pos;
-    {
-        deleteVehicle _x;
-    } forEach (nearestObjects[_pos,["Box_IND_Grenades_F","B_supplyCrate_F"],12]);
-} forEach _containers;
+    private _house = nearestObject [_pos, "House"];
+    private _containers = _house getVariable ["containers",[]];
+
+    if !(_containers isEqualTo []) then {
+        {
+            deleteVehicle _x;
+        } forEach _containers;
+        _house setVariable ["containers",nil,true];
+    };
+} forEach _houses;

life_server/Functions/Systems/fn_clientDisconnect.sqf

@@ -46,4 +46,4 @@ private _containers = nearestObjects[_unit,["WeaponHolderSimulated"],5];
 {deleteVehicle _x} forEach _containers;
 deleteVehicle _unit;
 
-[_uid] spawn TON_fnc_houseCleanup;
+[_uid] call TON_fnc_houseCleanup;