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.

Sign up for GitHub

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

Repair - Fix claimed object abuse #8460

Merged
merged 3 commits into from
Oct 10, 2021
Merged

Repair - Fix claimed object abuse #8460

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
118d387
fix claimed object abuse
LinkIsGrim Sep 30, 2021
068ee0f
simplify callbackProgress getter
LinkIsGrim Oct 6, 2021
ee4c86b
Revert "simplify callbackProgress getter"
LinkIsGrim Oct 6, 2021
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
8 changes: 6 additions & 2 deletions addons/repair/functions/fnc_repair.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,12 @@ if (_consumeItems > 0) then {
private _callbackProgress = getText (_config >> "callbackProgress");
if (_callbackProgress == "") then {
_callbackProgress = {
(_this select 0) params ["", "_target"];
(alive _target) && {(abs speed _target) < 1} // make sure vehicle doesn't drive off
(_this select 0) params ["_caller", "_target", "", "", "", "", "_claimObjectsAvailable"];
(
(alive _target) &&
{(abs speed _target) < 1} && // make sure vehicle doesn't drive off
{_claimObjectsAvailable findIf {!alive _x || {_x getVariable [QEGVAR(common,owner), objNull] isNotEqualTo _caller}} == -1} // make sure claim objects are still available
)
};
} else {
if (isNil _callbackProgress) then {
Expand Down