W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

move deleteVehicle to server

Browse Source
This commit is contained in:
icomrade
2017-09-26 16:18:47 -04:00
parent 02ff9be46d
commit e079381931
18 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/AdvancedTrading/functions/DZE_deleteTradedVehicle.sqf
View File

@@ -60,7 +60,7 @@ if ((count _VehKey2) > 0) then {
} else { } else {
PVDZ_obj_Destroy = [(_VehKey2 select 2),(_VehKey2 select 3),player,(_VehKey2 select 1),DZE_AuthKey]; PVDZ_obj_Destroy = [(_VehKey2 select 2),(_VehKey2 select 3),player,(_VehKey2 select 1),DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle (_VehKey2 select 1); //deleteVehicle (_VehKey2 select 1);
}; };
} else { } else {
_localResult2 = 0; _localResult2 = 0;

7
SQF/dayz_code/actions/object_disassembly.sqf
View File

@@ -72,9 +72,10 @@ for "_i" from 1 to 20 do {
PVDZ_obj_Destroy = [_objectID,_objectUID,player,_cursorTarget,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,player,_cursorTarget,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
diag_log [diag_ticktime, __FILE__, "Networked object, request to destroy", PVDZ_obj_Destroy]; diag_log [diag_ticktime, __FILE__, "Networked object, request to destroy", PVDZ_obj_Destroy];
}; } else {
// remove object // remove object
deleteVehicle _cursorTarget; deleteVehicle _cursorTarget;
};
_cursorTarget = objNull; _cursorTarget = objNull;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem; ["Working",0,[20,40,15,0]] call dayz_NutritionSystem;

2
SQF/dayz_code/actions/object_dismantle.sqf
View File

@@ -135,7 +135,7 @@ if (_proceed) then {
}; };
//Need to update for sanity no client should ever create or delete anything //Need to update for sanity no client should ever create or delete anything
deleteVehicle _object; //deleteVehicle _object;
[_dismantleToo,1,1] call fn_dropItem; [_dismantleToo,1,1] call fn_dropItem;
}; };

3
SQF/dayz_code/actions/object_pickup.sqf
View File

@@ -81,8 +81,9 @@ if (_isOk) then {
}; };
PVDZ_obj_Destroy = [(_holder getVariable["ObjectID","0"]),(_holder getVariable["ObjectUID","0"]),player,_holder,DZE_AuthKey]; PVDZ_obj_Destroy = [(_holder getVariable["ObjectID","0"]),(_holder getVariable["ObjectUID","0"]),player,_holder,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
} else {
deleteVehicle _holder;
}; };
deleteVehicle _holder;
} else { } else {
if (!_isOk) exitWith { if (!_isOk) exitWith {
_holder setVariable["claimed",0,true]; _holder setVariable["claimed",0,true];

2
SQF/dayz_code/actions/object_upgradeStorage.sqf
View File

@@ -130,7 +130,7 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
//remove old tent //remove old tent
PVDZ_obj_Destroy = [_objectID,_objectUID,player,_cursorTarget,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,player,_cursorTarget,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _cursorTarget; //deleteVehicle _cursorTarget;
// remove parts from players inventory before creation of new tent. // remove parts from players inventory before creation of new tent.
{ {

7
SQF/dayz_code/actions/object_upgradebuilding.sqf
View File

@@ -72,6 +72,9 @@ if (!_ok) exitWith {
format [localize "str_upgradeMissingPart", _missing] call dayz_rollingMessages; format [localize "str_upgradeMissingPart", _missing] call dayz_rollingMessages;
}; };
_PlayerNear = {isPlayer _x} count (([_cursorTarget] call FNC_GetPos) nearEntities ["CAManBase", 10]) > 1;
if (_PlayerNear) exitWith {localize "str_pickup_limit_5" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith { if (dayz_actionInProgress) exitWith {
{ player addMagazine _x; } forEach _upgradeParts; { player addMagazine _x; } forEach _upgradeParts;
localize "str_player_actionslimit" call dayz_rollingMessages; localize "str_player_actionslimit" call dayz_rollingMessages;
@@ -123,8 +126,8 @@ _object setVariable ["padlockCombination",_ownerPasscode,true];
_object setVariable ["characterID",_characterID,true]; _object setVariable ["characterID",_characterID,true];
//remove old object //remove old object
deleteVehicle _cursorTarget; //deleteVehicle _cursorTarget;
PVDZ_obj_Destroy = [_objectID,_objectUID,player,_object,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,player,_cursorTarget,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
// create a weaponholder with dismissed parts // create a weaponholder with dismissed parts

2
SQF/dayz_code/actions/player_destroyTent.sqf
View File

@@ -65,7 +65,7 @@ player addMagazine _emptycan;
// Added Nutrition-Factor for work // Added Nutrition-Factor for work
["Working",0,[20,40,15,0]] call dayz_NutritionSystem; ["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
PVDZ_obj_Destroy = [_objectID,_objectUID,player,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,player,_obj,DZE_AuthKey,false];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
//Send killed for object //Send killed for object

4
SQF/dayz_code/actions/remove.sqf
View File

@@ -149,15 +149,15 @@ if (_proceed && _success) then {
// Double check that object is not null // Double check that object is not null
if(!isNull(_obj)) then { if(!isNull(_obj)) then {
_ipos = getPosATL _obj; _ipos = getPosATL _obj;
deleteVehicle _obj;
if(!_isWreck && !_isWreckBuilding) then { if(!_isWreck && !_isWreckBuilding) then {
PVDZ_obj_Destroy = [_objectID,_objectUID,player,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,player,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
}; };
//deleteVehicle _obj;
if (_isWreckBuilding) then { if (_isWreckBuilding) then {
PVDZ_send = [player,"RemoveObject",_ipos]; PVDZ_send = [player,"RemoveObject",_ipos];
publicVariableServer "PVDZ_send"; publicVariableServer "PVDZ_send";

2
SQF/dayz_code/actions/trade_any_bicycle.sqf
View File

@@ -186,7 +186,7 @@ if (_finished) then {
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
// payout // payout
_canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange;

2
SQF/dayz_code/actions/trade_any_bicycle_old.sqf
View File

@@ -159,7 +159,7 @@ if (_qty >= _qty_in) then {
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages;
}; };

2
SQF/dayz_code/actions/trade_any_boat.sqf
View File

@@ -162,7 +162,7 @@ if (_finished) then {
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
// payout // payout
_canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange;

2
SQF/dayz_code/actions/trade_any_boat_old.sqf
View File

@@ -145,7 +145,7 @@ if (_qty >= _qty_in) then {
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages;
} else { } else {

2
SQF/dayz_code/actions/trade_any_vehicle.sqf
View File

@@ -192,7 +192,7 @@ if (_finished) then {
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
// remove Key // remove Key
_temp_keys = []; _temp_keys = [];

2
SQF/dayz_code/actions/trade_any_vehicle_free.sqf
View File

@@ -188,7 +188,7 @@ if (_finished) then {
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
// payout // payout
_canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange;

2
SQF/dayz_code/actions/trade_any_vehicle_old.sqf
View File

@@ -166,7 +166,7 @@ if (_qty >= _qty_in) then {
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages; format[localize "str_epoch_player_181",_qty_in,_textPartIn,_qty_out,_textPartOut] call dayz_rollingMessages;

2
SQF/dayz_code/compile/player_packTent.sqf
View File

@@ -55,7 +55,7 @@ if (_ownerID in [dayz_characterID,dayz_playerUID] or typeOf _obj in _campItems)
PVDZ_obj_Destroy = [_objectID,_objectUID,player,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,player,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
//Add weapons //Add weapons
_objWpnTypes = _weapons select 0; _objWpnTypes = _weapons select 0;

2
SQF/dayz_code/traps/functions/remove.sqf
View File

@@ -12,6 +12,6 @@ if (isServer) then {
//For normal remove let object_pickup.sqf perform deletion to ensure player has room in gear first, no others remove at same time and animation runs //For normal remove let object_pickup.sqf perform deletion to ensure player has room in gear first, no others remove at same time and animation runs
PVDZ_obj_Destroy = [_objectID,_objectUID,player,_obj,DZE_AuthKey]; PVDZ_obj_Destroy = [_objectID,_objectUID,player,_obj,DZE_AuthKey];
publicVariableServer "PVDZ_obj_Destroy"; publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj; //deleteVehicle _obj;
}; };
}; };

14
SQF/dayz_server/compile/server_deleteObj.sqf
View File

@@ -2,7 +2,7 @@
[_objectID,_objectUID,_activatingPlayer,_object,DZE_AuthKey] call server_deleteObj; [_objectID,_objectUID,_activatingPlayer,_object,DZE_AuthKey] call server_deleteObj;
For PV calls from the client use this function, otherwise if calling directly from the server use server_deleteObjDirect For PV calls from the client use this function, otherwise if calling directly from the server use server_deleteObjDirect
*/ */
private["_id","_uid","_key","_activatingPlayer","_object","_clientKey","_PlayerUID","_PUIDIndex"]; private["_id","_uid","_key","_activatingPlayer","_object","_clientKey","_PlayerUID","_PUIDIndex","_processDelete"];
if (count _this < 5) exitWith {diag_log "Server_DeleteObj error: Improper parameter format";}; if (count _this < 5) exitWith {diag_log "Server_DeleteObj error: Improper parameter format";};
_id = _this select 0; _id = _this select 0;
@@ -10,24 +10,26 @@ _uid = _this select 1;
_activatingPlayer = _this select 2; _activatingPlayer = _this select 2;
_object = _this select 3; _object = _this select 3;
_clientKey = _this select 4; _clientKey = _this select 4;
_processDelete = if (count _this > 5) then {_this select 5} else {true};
_PlayerUID = getPlayerUID _activatingPlayer; _PlayerUID = getPlayerUID _activatingPlayer;
_PUIDIndex = DZE_ServerPUIDArray find _PlayerUID; _PUIDIndex = DZE_ServerPUIDArray find _PlayerUID;
if (_object distance _activatingPlayer > (Z_VehicleDistance + 10)) exitWith {diag_log "Server_DeleteObj error: Delete verification failed, referenced player is too far away from object";}; if (_object distance _activatingPlayer > (Z_VehicleDistance + 10)) exitWith {diag_log format["Server_DeleteObj error: Delete verification failed, referenced player is too far away from object. PV ARRAY: %1", _this];};
if (_PUIDIndex < 0) exitWith {diag_log "Server_DeleteObj error: PUID NOT FOUND ON SERVER";}; if (_PUIDIndex < 0) exitWith {diag_log format["Server_DeleteObj error: PUID NOT FOUND ON SERVER. PV ARRAY: %1", _this];};
if ((((DZE_ServerClientKeys select _PUIDIndex) select 0) != (owner _activatingPlayer)) || (((DZE_ServerClientKeys select _PUIDIndex) select 1) != _clientKey)) exitWith {diag_log "Server_DeleteObj error: CLIENT AUTH KEY INCORRECT OR UNRECOGNIZED";}; if ((((DZE_ServerClientKeys select _PUIDIndex) select 0) != (owner _activatingPlayer)) || (((DZE_ServerClientKeys select _PUIDIndex) select 1) != _clientKey)) exitWith {diag_log format["Server_DeleteObj error: CLIENT AUTH KEY INCORRECT OR UNRECOGNIZED. PV ARRAY: %1", _this];};
if (isServer) then { if (isServer) then {
if (_processDelete) then {deleteVehicle _object};
//remove from database //remove from database
if (parseNumber _id > 0) then { if (parseNumber _id > 0) then {
//Send request //Send request
_key = format["CHILD:304:%1:",_id]; _key = format["CHILD:304:%1:",_id];
_key call server_hiveWrite; _key call server_hiveWrite;
diag_log format["DELETE: Player %1 ,with Player UID %2 deleted object with ID: %3",_activatingPlayer, _PlayerUID, _id]; diag_log format["DELETE: Player %1 with Player UID %2 deleted object with ID: %3",_activatingPlayer, _PlayerUID, _id];
} else { } else {
//Send request //Send request
_key = format["CHILD:310:%1:",_uid]; _key = format["CHILD:310:%1:",_uid];
_key call server_hiveWrite; _key call server_hiveWrite;
diag_log format["DELETE: Player %1 ,with Player UID %2 deleted object with UID: %3",_activatingPlayer, _PlayerUID, _uid]; diag_log format["DELETE: Player %1 with Player UID %2 deleted object with UID: %3",_activatingPlayer, _PlayerUID, _uid];
}; };
}; };