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

move SQF wait/loop to get OID to SQL Procedure

Browse Source 
for some reason you cannot directly get the OID using SELECT LAST_INSERT_ID(); and you cannot return it within the same hive call as the insert call (????).

Requires new procedure for 1.0.6.2
This commit is contained in:
icomrade
2017-09-25 12:14:41 -04:00
parent cb5d61eff7
commit 95b3174e04
7 changed files with 152 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.2.txt
View File

@@ -67,4 +67,5 @@
[NEW] Added temporary check for mission file overwrite exploit. This can be removed after Bohemia patches it. [NEW] Added temporary check for mission file overwrite exploit. This can be removed after Bohemia patches it.
[INFO] HiveExt.dll has been updated to return character_data duration in the 101 call for the dayz_survived stat. Source is available at github.com/vbawol/DayZhiveEpoch/pull/13 @icomrade [INFO] HiveExt.dll has been updated to return character_data duration in the 101 call for the dayz_survived stat. Source is available at github.com/vbawol/DayZhiveEpoch/pull/13 @icomrade
[INFO] HiveExt.dll REQUIRES NEW PROCEDURE BE ADDED TO YOUR DATABASE, SEE 1.0.6.2_UPDATES.SQL! [REQUIRED BY IMPROVED VEHICLE/OBJECT SPAWNING LOGIC]
[INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes. [INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.

81
SQF/dayz_server/compile/server_publishVehicle.sqf
View File

@@ -1,4 +1,4 @@
private ["_object","_worldspace","_location","_dir","_class","_uid","_dam","_hitpoints","_selection","_array","_damage","_fuel","_key","_totaldam","_spawnDMG","_characterID"]; private ["_object","_worldspace","_location","_dir","_class","_uid","_dam","_hitpoints","_selection","_array","_damage","_fuel","_key","_totaldam","_spawnDMG","_characterID","_result","_outcome","_oid"];
//[_veh,[_dir,_location],"V3S_Civ",true] //[_veh,[_dir,_location],"V3S_Civ",true]
#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp"
@@ -18,96 +18,61 @@ diag_log ("PUBLISH: Attempt " + str(_object));
_dir = _worldspace select 0; _dir = _worldspace select 0;
_location = _worldspace select 1; _location = _worldspace select 1;
//Generate UID test using time
// _uid = str( round (dateToNumber date)) + str(round time);
_uid = _worldspace call dayz_objectUID2; _uid = _worldspace call dayz_objectUID2;
//_uid = format["%1%2",(round time),_uid];
if (_spawnDMG) then { if (_spawnDMG) then {
_fuel = 0; _fuel = 0;
if (getNumber(configFile >> "CfgVehicles" >> _class >> "isBicycle") != 1) then { if (getNumber(configFile >> "CfgVehicles" >> _class >> "isBicycle") != 1) then {
// Create randomly damaged parts
_totaldam = 0; _totaldam = 0;
_hitpoints = _object call vehicle_getHitpoints; _hitpoints = _object call vehicle_getHitpoints;
{ {
// generate damage on all parts
_dam = call generate_new_damage; _dam = call generate_new_damage;
_selection = getText(configFile >> "cfgVehicles" >> _class >> "HitPoints" >> _x >> "name"); _selection = getText(configFile >> "cfgVehicles" >> _class >> "HitPoints" >> _x >> "name");
if (_dam > 0) then { if (_dam > 0) then {
_array set [count _array,[_selection,_dam]]; _array set [count _array,[_selection,_dam]];
_totaldam = _totaldam + _dam; _totaldam = _totaldam + _dam;
}; };
} count _hitpoints; } count _hitpoints;
// just set low base dmg - may change later
_damage = 0; _damage = 0;
// New fuel min max
_fuel = (random(DynamicVehicleFuelHigh-DynamicVehicleFuelLow)+DynamicVehicleFuelLow) / 100; _fuel = (random(DynamicVehicleFuelHigh-DynamicVehicleFuelLow)+DynamicVehicleFuelLow) / 100;
}; };
}; };
//Send request
_key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, _damage , _characterID, _worldspace, [], _array, _fuel,_uid]; _key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, _damage , _characterID, _worldspace, [], _array, _fuel,_uid];
#ifdef OBJECT_DEBUG #ifdef OBJECT_DEBUG
diag_log ("HIVE: WRITE: "+ str(_key)); diag_log ("HIVE: WRITE: "+ str(_key));
#endif #endif
_key call server_hiveWrite; _key call server_hiveWrite;
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
// Switched to spawn so we can wait a bit for the ID // GET DB ID
[_object,_uid,_fuel,_damage,_array,_characterID,_class] spawn { _key = format["CHILD:388:%1:",_uid];
private["_object","_uid","_fuel","_damage","_array","_characterID","_done","_retry","_key","_result","_outcome","_oid","_selection","_dam","_class"];
_object = _this select 0; #ifdef OBJECT_DEBUG
_uid = _this select 1; diag_log ("HIVE: WRITE: "+ str(_key));
_fuel = _this select 2; #endif
_damage = _this select 3;
_array = _this select 4;
_characterID = _this select 5;
_class = _this select 6;
_done = false; _result = _key call server_hiveReadWrite;
_retry = 0; _outcome = _result select 0;
// TODO: Needs major overhaul
while {_retry < 10} do { if (_outcome != "PASS") then {
// GET DB ID deleteVehicle _object;
_key = format["CHILD:388:%1:",_uid]; diag_log("CUSTOM: failed to get id for : " + str(_uid));
#ifdef OBJECT_DEBUG } else {
diag_log ("HIVE: WRITE: "+ str(_key)); _oid = _result select 1;
#endif _object setVariable ["ObjectID", _oid, true];
_result = _key call server_hiveReadWrite;
_outcome = _result select 0; #ifdef OBJECT_DEBUG
if (_outcome == "PASS") then { diag_log("CUSTOM: Selected " + str(_oid));
_oid = _result select 1; #endif
_object setVariable ["ObjectID", _oid, true];
#ifdef OBJECT_DEBUG
diag_log("CUSTOM: Selected " + str(_oid));
#endif
_done = true;
_retry = 100;
} else {
diag_log("CUSTOM: trying again to get id for: " + str(_uid));
_done = false;
_retry = _retry + 1;
uiSleep 1;
};
};
if(!_done) exitWith { deleteVehicle _object; diag_log("CUSTOM: failed to get id for : " + str(_uid)); };
_object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["lastUpdate",diag_tickTime];
_object setVariable ["CharacterID", _characterID, true]; _object setVariable ["CharacterID", _characterID, true];
_object setDamage _damage; _object setDamage _damage;
// Set Hits after ObjectID is set
{ {
_selection = _x select 0; _selection = _x select 0;
_dam = _x select 1; _dam = _x select 1;
@@ -116,14 +81,12 @@ dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
} count _array; } count _array;
_object setFuel _fuel; _object setFuel _fuel;
_object setvelocity [0,0,1]; _object setvelocity [0,0,1];
_object call fnc_veh_ResetEH; _object call fnc_veh_ResetEH;
// testing - should make sure everyone has eventhandlers for vehicles was unused...
PVDZE_veh_Init = _object; PVDZE_veh_Init = _object;
publicVariable "PVDZE_veh_Init"; publicVariable "PVDZE_veh_Init";
diag_log ("PUBLISH: Created " + (_class) + " with ID " + str(_uid)); diag_log ("PUBLISH: Created " + (_class) + " with ID " + str(_uid));
}; };

62
SQF/dayz_server/compile/server_publishVehicle2.sqf
View File

@@ -1,4 +1,4 @@
private ["_activatingPlayer","_isOK","_worldspace","_location","_dir","_class","_uid","_key","_keySelected","_characterID","_donotusekey"]; private ["_activatingPlayer","_isOK","_worldspace","_location","_dir","_class","_uid","_key","_keySelected","_characterID","_donotusekey","_object","_result","_outcome","_oid","_object_para"];
//PVDZE_veh_Publish2 = [[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; //PVDZE_veh_Publish2 = [[_dir,_location],_part_out,false,_keySelected,_activatingPlayer];
#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp"
@@ -14,7 +14,7 @@ if(_donotusekey) then {
_isOK = isClass(configFile >> "CfgWeapons" >> _keySelected); _isOK = isClass(configFile >> "CfgWeapons" >> _keySelected);
}; };
if(!_isOK) exitWith { diag_log ("HIVE: CARKEY DOES NOT EXIST: "+ str(_keySelected)); }; if(!_isOK) exitWith {diag_log ("HIVE: CARKEY DOES NOT EXIST: "+ str(_keySelected));};
if(_donotusekey) then { if(_donotusekey) then {
_characterID = _keySelected; _characterID = _keySelected;
@@ -26,7 +26,6 @@ _dir = _worldspace select 0;
_location = _worldspace select 1; _location = _worldspace select 1;
_uid = _worldspace call dayz_objectUID2; _uid = _worldspace call dayz_objectUID2;
//Send request
_key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, 0 , _characterID, _worldspace, [], [], 1,_uid]; _key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, 0 , _characterID, _worldspace, [], [], 1,_uid];
#ifdef OBJECT_DEBUG #ifdef OBJECT_DEBUG
@@ -35,57 +34,29 @@ diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite; _key call server_hiveWrite;
// Switched to spawn so we can wait a bit for the ID _key = format["CHILD:388:%1:",_uid];
[_uid,_characterID,_class,_dir,_location,_donotusekey,_activatingPlayer] spawn {
private ["_object","_uid","_characterID","_done","_retry","_key","_result","_outcome","_oid","_class","_location","_object_para","_donotusekey","_activatingPlayer"];
_uid = _this select 0; #ifdef OBJECT_DEBUG
_characterID = _this select 1; diag_log ("HIVE: WRITE: "+ str(_key));
_class = _this select 2; #endif
//_dir = _this select 3;
_location = _this select 4;
_donotusekey = _this select 5;
_activatingPlayer = _this select 6;
_done = false; _result = _key call server_hiveReadWrite;
_retry = 0; _outcome = _result select 0;
// TODO: Needs major overhaul for 1.1
while {_retry < 10} do {
// GET DB ID
_key = format["CHILD:388:%1:",_uid];
#ifdef OBJECT_DEBUG
diag_log ("HIVE: WRITE: "+ str(_key));
#endif
_result = _key call server_hiveReadWrite; if (_outcome != "PASS") then {
_outcome = _result select 0; diag_log("CUSTOM: failed to get id for : " + str(_uid));
if (_outcome == "PASS") then { } else {
_oid = _result select 1; _oid = _result select 1;
#ifdef OBJECT_DEBUG
diag_log("CUSTOM: Selected " + str(_oid));
#endif
_done = true; #ifdef OBJECT_DEBUG
_retry = 100; diag_log("CUSTOM: Selected " + str(_oid));
#endif
} else {
diag_log("CUSTOM: trying again to get id for: " + str(_uid));
_done = false;
_retry = _retry + 1;
uiSleep 1;
};
};
if(!_done) exitWith { diag_log("CUSTOM: failed to get id for : " + str(_uid)); };
if(DZE_TRADER_SPAWNMODE) then { if(DZE_TRADER_SPAWNMODE) then {
//_object_para = createVehicle ["ParachuteMediumWest", [0,0,0], [], 0, "CAN_COLLIDE"];
_object_para = "ParachuteMediumWest" createVehicle [0,0,0]; _object_para = "ParachuteMediumWest" createVehicle [0,0,0];
_object_para setPos [_location select 0, _location select 1,(_location select 2) + 65]; _object_para setPos [_location select 0, _location select 1,(_location select 2) + 65];
//_object = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_object = _class createVehicle [0,0,0]; _object = _class createVehicle [0,0,0];
} else { } else {
//_object = createVehicle [_class, _location, [], 0, "CAN_COLLIDE"];
// Don't use setPos or CAN_COLLIDE here. It will spawn inside other vehicles // Don't use setPos or CAN_COLLIDE here. It will spawn inside other vehicles
_object = _class createVehicle _location; _object = _class createVehicle _location;
if (surfaceIsWater _location && {({_x != _object} count (_location nearEntities ["Ship",8])) == 0}) then { if (surfaceIsWater _location && {({_x != _object} count (_location nearEntities ["Ship",8])) == 0}) then {
@@ -95,7 +66,6 @@ _key call server_hiveWrite;
}; };
if(!_donotusekey) then { if(!_donotusekey) then {
// Lock vehicle
_object setvehiclelock "locked"; _object setvehiclelock "locked";
}; };
@@ -105,7 +75,6 @@ _key call server_hiveWrite;
_object setVariable ["ObjectID", _oid, true]; _object setVariable ["ObjectID", _oid, true];
_object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["lastUpdate",diag_tickTime];
_object setVariable ["CharacterID", _characterID, true]; _object setVariable ["CharacterID", _characterID, true];
//_object setVelocity [0,0,1];
if(DZE_TRADER_SPAWNMODE) then { if(DZE_TRADER_SPAWNMODE) then {
_object attachTo [_object_para, [0,0,-1.6]]; _object attachTo [_object_para, [0,0,-1.6]];
@@ -117,7 +86,6 @@ _key call server_hiveWrite;
_object call fnc_veh_ResetEH; _object call fnc_veh_ResetEH;
// for non JIP users this should make sure everyone has eventhandlers for vehicles.
PVDZE_veh_Init = _object; PVDZE_veh_Init = _object;
publicVariable "PVDZE_veh_Init"; publicVariable "PVDZE_veh_Init";

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

@@ -1,4 +1,4 @@
private ["_activatingPlayer","_isOK","_object","_worldspace","_location","_dir","_class","_uid","_key","_keySelected","_characterID","_donotusekey"]; private ["_activatingPlayer","_object","_worldspace","_location","_dir","_class","_uid","_key","_keySelected","_characterID","_donotusekey","_result","_outcome","_oid","_countr","_objectID","_objectUID","_newobject","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty"];
//PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; //PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer];
#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp"
@@ -10,8 +10,7 @@ _keySelected = _this select 4;
_activatingPlayer = _this select 5; _activatingPlayer = _this select 5;
_characterID = _keySelected; _characterID = _keySelected;
_isOK = isClass(configFile >> "CfgVehicles" >> _class); if (!(isClass(configFile >> "CfgVehicles" >> _class)) || isNull _object) exitWith {
if (!_isOK || isNull _object) exitWith {
diag_log ("HIVE-pv3: Vehicle does not exist: "+ str(_class)); diag_log ("HIVE-pv3: Vehicle does not exist: "+ str(_class));
dze_waiting = "fail"; dze_waiting = "fail";
(owner _activatingPlayer) publicVariableClient "dze_waiting"; (owner _activatingPlayer) publicVariableClient "dze_waiting";
@@ -25,68 +24,35 @@ _dir = _worldspace select 0;
_location = _worldspace select 1; _location = _worldspace select 1;
_uid = _worldspace call dayz_objectUID2; _uid = _worldspace call dayz_objectUID2;
//Send request
_key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, 0 , _characterID, _worldspace, [], [], 1,_uid]; _key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, 0 , _characterID, _worldspace, [], [], 1,_uid];
#ifdef OBJECT_DEBUG #ifdef OBJECT_DEBUG
diag_log ("HIVE: WRITE: "+ str(_key)); diag_log ("HIVE: WRITE: "+ str(_key));
#endif #endif
_key call server_hiveWrite; _key call server_hiveWrite;
_objectID = _object getVariable ["ObjectID","0"];
_objectUID = _object getVariable ["ObjectUID","0"];
_location = [_object] call fnc_getPos;
// Switched to spawn so we can wait a bit for the ID // GET DB ID
[_object,_uid,_characterID,_class,_dir,_location,_donotusekey,_activatingPlayer] spawn { _key = format["CHILD:388:%1:",_uid];
private ["_object","_uid","_characterID","_done","_retry","_key","_result","_outcome","_oid","_class","_location","_donotusekey","_activatingPlayer","_countr","_objectID","_objectUID","_dir","_newobject","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty"]; #ifdef OBJECT_DEBUG
diag_log ("HIVE: WRITE: "+ str(_key));
#endif
_result = _key call server_hiveReadWrite;
_outcome = _result select 0;
_object = _this select 0; if (_outcome != "PASS") then {
_objectID = _object getVariable ["ObjectID","0"]; diag_log("HIVE-pv3: failed to get id for : " + str(_uid));
_objectUID = _object getVariable ["ObjectUID","0"]; _key = format["CHILD:310:%1:",_uid];
_uid = _this select 1; _key call server_hiveWrite;
_characterID = _this select 2; dze_waiting = "fail";
_class = _this select 3; (owner _activatingPlayer) publicVariableClient "dze_waiting";
_dir = _this select 4; } else {
// _location = _this select 5; _oid = _result select 1;
_location = [_object] call fnc_getPos; #ifdef OBJECT_DEBUG
_donotusekey = _this select 6; diag_log("CUSTOM: Selected " + str(_oid));
_activatingPlayer = _this select 7; #endif
_done = false;
_retry = 0;
// TODO: Needs major overhaul for 1.1
while {_retry < 10} do {
// GET DB ID
_key = format["CHILD:388:%1:",_uid];
#ifdef OBJECT_DEBUG
diag_log ("HIVE: WRITE: "+ str(_key));
#endif
_result = _key call server_hiveReadWrite;
_outcome = _result select 0;
if (_outcome == "PASS") then {
_oid = _result select 1;
//_object setVariable ["ObjectID", _oid, true];
#ifdef OBJECT_DEBUG
diag_log("CUSTOM: Selected " + str(_oid));
#endif
_done = true;
_retry = 100;
} else {
diag_log("CUSTOM: trying again to get id for: " + str(_uid));
_done = false;
_retry = _retry + 1;
uiSleep 1;
};
};
if (!_done) exitWith {
diag_log("HIVE-pv3: failed to get id for : " + str(_uid));
_key = format["CHILD:310:%1:",_uid];
_key call server_hiveWrite;
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;

BIN
Server Files/HiveExt.dll
View File

Binary file not shown.

44
Server Files/SQL/1.0.6.2_Updates.sql Normal file
View File

@@ -0,0 +1,44 @@
/*
DayZ Epoch 1.0.6.2 Updates
RUN THIS FILE IF UPDATING AN EXISTING 1061 DATABASE TO 1062.
NEW DATABASES SHOULD USE EPOCH.SQL INSTEAD.
EXISTING 1051 DATABASES SHOULD RUN 1.0.6_UPDATES.SQL FIRST, 1.0.6.1_UPDATES.SQL SECOND, THEN RUN THIS FILE.
*/
/*
THIS PROCEDURE IS REQUIRED FOR 1062 AND RETURNS THE OBJECT ID MUCH MORE EFFICENTLY THAN THE METHOD IN 1061 SQF
*/
DROP procedure IF EXISTS `retObjID`;
DELIMITER $$
CREATE PROCEDURE `retObjID`(
IN objTableName VARCHAR(256),
IN SID INT(11),
IN UID bigint(24),
OUT OID INT(11)unsigned
)
BEGIN
DECLARE x INT;
declare sqlstr VARCHAR(256);
SET @OID = 0;
SET @x = 1;
SET @sqlstr = CONCAT('SELECT `ObjectID` from `', objTableName ,'` where `Instance` = ', SID ,' AND `ObjectUID` = ', UID ,' INTO @OID');
PREPARE stmt FROM @sqlstr;
WHILE (@x <= 5) DO
EXECUTE stmt;
IF (@OID > 0) then
SET @x = 6;
else
SET @x = @x + 1;
DO sleep(0.1);
END IF;
END WHILE;
DEALLOCATE PREPARE stmt;
SET OID = @OID;
SELECT @OID;
END;$$
DELIMITER ;

37
Server Files/SQL/epoch.sql
View File

@@ -2350,3 +2350,40 @@ INSERT INTO `trader_tids` VALUES(690, 'Cooked Meats', 176);
INSERT INTO `trader_tids` VALUES(691, 'Drinks', 176); INSERT INTO `trader_tids` VALUES(691, 'Drinks', 176);
INSERT INTO `trader_tids` VALUES(692, 'Packaged Food', 176); INSERT INTO `trader_tids` VALUES(692, 'Packaged Food', 176);
INSERT INTO `trader_tids` VALUES(693, 'Attachments', 165); INSERT INTO `trader_tids` VALUES(693, 'Attachments', 165);
/*
THIS PROCEDURE IS REQUIRED FOR 1062 AND RETURNS THE OBJECT ID MUCH MORE EFFICENTLY THAN THE METHOD IN 1061 SQF
*/
DROP procedure IF EXISTS `retObjID`;
DELIMITER $$
CREATE PROCEDURE `retObjID`(
IN objTableName VARCHAR(256),
IN SID INT(11),
IN UID bigint(24),
OUT OID INT(11)unsigned
)
BEGIN
DECLARE x INT;
declare sqlstr VARCHAR(256);
SET @OID = 0;
SET @x = 1;
SET @sqlstr = CONCAT('SELECT `ObjectID` from `', objTableName ,'` where `Instance` = ', SID ,' AND `ObjectUID` = ', UID ,' INTO @OID');
PREPARE stmt FROM @sqlstr;
WHILE (@x <= 5) DO
EXECUTE stmt;
IF (@OID > 0) then
SET @x = 6;
else
SET @x = @x + 1;
DO sleep(0.1);
END IF;
END WHILE;
DEALLOCATE PREPARE stmt;
SET OID = @OID;
SELECT @OID;
END;$$
DELIMITER ;