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

Fix wrong handler for PVDZ_Server_processCode

Browse Source 
Vanilla development commit:

afbedde9fa
This commit is contained in:
ebaydayz
2016-07-28 11:02:28 -04:00
parent cbbbe1bd8f
commit e399556af2
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SQF/dayz_code/eventHandlers/processAccessCode.sqf Normal file
View File

@@ -0,0 +1,22 @@
private ["_unitSending","_object","_object","_code"];
_unitSending = _this select 0;
_object = _this select 1;
_code = _this select 2;
//diag_log format["%1, %2-%3",_unitSending,_object,_code];
_ownerID = owner _unitSending;
if (_unitSending distance _object < 5) then {
_currentCode = _object getVariable ["dayz_padlockCombination",[]];
_result = [_currentCode,_code] call BIS_fnc_areEqual;
PVCDZ_Client_processCode = [_object,_result,_code];
_ownerID publicVariableClient "PVCDZ_Client_processCode";
diag_log format["INFO: %1, %5 is trying to guess with %3 for %2 at time %4",(name _unitSending),(typeof _object),_code,time,(getPlayerUID _unitSending)];
} else {
diag_log format["WARNING: %1, %5 is asking for code for %2 but is a range of %3 at time %4",(name _unitSending),(typeof _object),(_unit distance _object),time,(getPlayerUID _unitSending)];
};

1
SQF/dayz_code/init/compiles.sqf
View File

@@ -1,6 +1,7 @@
if (isServer) then { if (isServer) then {
call compile preprocessFileLineNumbers "\z\addons\dayz_server\init\server_functions.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\init\server_functions.sqf";
pvs_processSetAccessCode = compile preprocessFile "\z\addons\dayz_code\eventHandlers\processSetAccessCode.sqf"; pvs_processSetAccessCode = compile preprocessFile "\z\addons\dayz_code\eventHandlers\processSetAccessCode.sqf";
pvs_processAccessCode = compile preprocessFile "\z\addons\dayz_code\eventHandlers\processAccessCode.sqf";
server_spawnTraders = compile preprocessFile "\z\addons\dayz_server\compile\server_spawnTraders.sqf"; server_spawnTraders = compile preprocessFile "\z\addons\dayz_server\compile\server_spawnTraders.sqf";
}; };

12
SQF/dayz_code/init/publicEH.sqf
View File

@@ -207,8 +207,11 @@ if (isServer) then {
diag_log format["WARNING: %1",_info]; diag_log format["WARNING: %1",_info];
}; };
"PVDZ_Server_processCode" addPublicVariableEventHandler {(_this select 1) call pvs_processSetAccessCode}; "PVDZ_Server_processSetAccessCode" addPublicVariableEventHandler {(_this select 1) call pvs_processSetAccessCode};
"PVDZ_Server_processCode" addPublicVariableEventHandler {(_this select 1) call pvs_processAccessCode};
/*
"PVDZ_Server_processSetAccessCode" addPublicVariableEventHandler { "PVDZ_Server_processSetAccessCode" addPublicVariableEventHandler {
private ["_unitSending","_object","_object","_code"]; private ["_unitSending","_object","_object","_code"];
_unitSending = (_this select 1) select 0; _unitSending = (_this select 1) select 0;
@@ -240,6 +243,7 @@ if (isServer) then {
diag_log format["WARNING: %1, %2 is trying to set a code for a gate he does not own.",(name _unitSending),(getPlayerUID _unitSending)]; diag_log format["WARNING: %1, %2 is trying to set a code for a gate he does not own.",(name _unitSending),(getPlayerUID _unitSending)];
}; };
}; };
*/
"PVDZ_Server_buildLock" addPublicVariableEventHandler { "PVDZ_Server_buildLock" addPublicVariableEventHandler {
_object = (_this select 1) select 0; _object = (_this select 1) select 0;
@@ -304,16 +308,16 @@ if (!isDedicated) then {
_object setVariable ["dayz_padlockLockStatus", false,true]; _object setVariable ["dayz_padlockLockStatus", false,true];
_object setVariable ["isOpen", "1", true]; _object setVariable ["isOpen", "1", true];
_object setVariable ["dayz_padlockHistory", [], true]; _object setVariable ["dayz_padlockHistory", [], true];
format [localize "STR_BLD_UNLOCKED",typeOf _object] call dayz_rollingMessages; format[localize "STR_BLD_UNLOCKED",typeOf _object] call dayz_rollingMessages;
} else { } else {
format [localize "STR_BLD_WRONG_COMBO",typeOf _object] call dayz_rollingMessages; format[localize "STR_BLD_WRONG_COMBO",typeOf _object] call dayz_rollingMessages;
_object setVariable ["dayz_padlockHistory", _codeGuess, true]; _object setVariable ["dayz_padlockHistory", _codeGuess, true];
}; };
}; };
"PVCDZ_Client_processAccessCode" addPublicVariableEventHandler { "PVCDZ_Client_processAccessCode" addPublicVariableEventHandler {
_codeGuess = (_this select 1) select 0; _codeGuess = (_this select 1) select 0;
format [localize "STR_BLD_COMBO_SET",_codeGuess] call dayz_rollingMessages; format[localize "STR_BLD_COMBO_SET",_codeGuess] call dayz_rollingMessages;
}; };
// EPOCH ADDITION // EPOCH ADDITION