W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-19 14:42:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent queuing multiple vehicle upgrades

Browse Source
This commit is contained in:
ebaydayz
2017-01-27 20:23:36 -05:00
parent 028924770f
commit d30b7b5ffc
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/compile/player_upgradeVehicle.sqf
View File

@@ -125,11 +125,15 @@ if (_IsNearVehicle >= 1) then {
// Current charID // Current charID
_objectCharacterID = _vehicle getVariable ["CharacterID","0"]; _objectCharacterID = _vehicle getVariable ["CharacterID","0"];
[_newclassname,objNull] call fn_waitForObject;
dze_waiting = nil;
PVDZE_veh_Upgrade = [_vehicle,[_dir,_location],_newclassname,true,_objectCharacterID,player]; PVDZE_veh_Upgrade = [_vehicle,[_dir,_location],_newclassname,true,_objectCharacterID,player];
publicVariableServer "PVDZE_veh_Upgrade"; publicVariableServer "PVDZE_veh_Upgrade";
localize "STR_EPOCH_VEHUP_SUCCESS" call dayz_rollingMessages; localize "STR_EPOCH_VEHUP_SUCCESS" call dayz_rollingMessages;
{player reveal _x;} count (player nearEntities [["LandVehicle"],10]);
//Wait for hive to finish spawning vehicle. Prevents dupe via player queuing multiple upgrades.
waitUntil {!isNil "dze_waiting"};
}; };
} }
else { else {

15
SQF/dayz_server/compile/server_publishVehicle3.sqf
View File

@@ -11,7 +11,11 @@ _activatingPlayer = _this select 5;
_characterID = _keySelected; _characterID = _keySelected;
_isOK = isClass(configFile >> "CfgVehicles" >> _class); _isOK = isClass(configFile >> "CfgVehicles" >> _class);
if(!_isOK || isNull _object) exitWith { diag_log ("HIVE-pv3: Vehicle does not exist: "+ str(_class)); }; if (!_isOK || isNull _object) exitWith {
diag_log ("HIVE-pv3: Vehicle does not exist: "+ str(_class));
dze_waiting = "fail";
(owner _activatingPlayer) publicVariableClient "dze_waiting";
};
#ifdef OBJECT_DEBUG #ifdef OBJECT_DEBUG
diag_log ("PUBLISH: Attempt " + str(_object)); diag_log ("PUBLISH: Attempt " + str(_object));
@@ -75,7 +79,11 @@ _key call server_hiveWrite;
}; };
}; };
if(!_done) exitWith { diag_log("CUSTOM: failed to get id for : " + str(_uid)); }; if (!_done) exitWith {
diag_log("CUSTOM: failed to get id for : " + str(_uid));
dze_waiting = "fail";
(owner _activatingPlayer) publicVariableClient "dze_waiting";
};
// add items from previous vehicle here // add items from previous vehicle here
_weapons = getWeaponCargo _object; _weapons = getWeaponCargo _object;
@@ -142,5 +150,8 @@ _key call server_hiveWrite;
PVDZE_veh_Init = _object; PVDZE_veh_Init = _object;
publicVariable "PVDZE_veh_Init"; publicVariable "PVDZE_veh_Init";
dze_waiting = "success";
(owner _activatingPlayer) publicVariableClient "dze_waiting";
diag_log ("PUBLISH: " + str(_activatingPlayer) + " Upgraded " + (_class) + " with ID " + str(_uid)); diag_log ("PUBLISH: " + str(_activatingPlayer) + " Upgraded " + (_class) + " with ID " + str(_uid));
}; };