Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Container bugfix #652

Open
wants to merge 2 commits into
base: v5.X.X
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# editorconfig.org
# Some editors do not have native support for EditorConfig and require a plugin.
# For a list of those editors and a plugin for them, see http://editorconfig.org/#download

# Top-most EditorConfig file
root = true

# Every file
[*]
# Soft tabs
indent_style = space
# 1 indent is 4 spaces
indent_size = 4
# Windows-style newlines
end_of_line = crlf
# Set default character encoding
charset = utf-8
# Remove any whitespace characters preceding newline characters
trim_trailing_whitespace = true
# A newline ending every file
insert_final_newline = true

# Markdown files
[*.md]
# Do not remove any whitespace characters preceding newline characters
trim_trailing_whitespace = false
# editorconfig.org
# Some editors do not have native support for EditorConfig and require a plugin.
# For a list of those editors and a plugin for them, see http://editorconfig.org/#download
# Top-most EditorConfig file
root = true
# Every file
[*]
# Soft tabs
indent_style = space
# 1 indent is 4 spaces
indent_size = 4
# Windows-style newlines
end_of_line = lf
# Set default character encoding
charset = utf-8
# Remove any whitespace characters preceding newline characters
trim_trailing_whitespace = true
# A newline ending every file
insert_final_newline = true
# Markdown files
[*.md]
# Do not remove any whitespace characters preceding newline characters
trim_trailing_whitespace = false
7 changes: 6 additions & 1 deletion life_server/Functions/Housing/fn_houseCleanup.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ private _containers = [_query,2,true] call DB_fnc_asyncCall;
{
deleteVehicle _x;
} forEach (nearestObjects[_pos,["Box_IND_Grenades_F","B_supplyCrate_F"],12]);
} forEach _containers;

private _house = nearestObject [_pos, "House"];
if !(_house getVariable ["containers",[]] isEqualTo []) then {
_house setVariable ["containers",nil,true];
};
} forEach _containers;
2 changes: 1 addition & 1 deletion life_server/Functions/Systems/fn_clientDisconnect.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;