From 4ea3f3683005ca69e697e27e6dbdcaab16cb73a9 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Tue, 21 Nov 2017 15:05:07 -0500 Subject: [PATCH] Update PVDZ_sec_atp logs This reverts commit 7b287a2 Vanilla commit: https://github.com/DayZMod/DayZ/commit/a81dd8164c2029221fc4924817615191032b1fa8 --- SQF/dayz_code/actions/player_breakin.sqf | 6 +++--- SQF/dayz_code/compile/fn_damageHandler.sqf | 18 ++++++++---------- SQF/dayz_code/compile/vehicle_getOut.sqf | 4 ++-- SQF/dayz_code/configVariables.sqf | 1 - SQF/dayz_code/init/publicEH.sqf | 13 ++++--------- SQF/dayz_code/stringtable.xml | 2 +- SQF/dayz_code/system/antihack.sqf | 2 +- .../system/scheduler/sched_antiTeleport.sqf | 2 +- .../system/scheduler/sched_security.sqf | 10 +++++----- SQF/dayz_server/system/server_monitor.sqf | 6 +++--- Server Files/Battleye/publicvariable.txt | 2 +- 11 files changed, 29 insertions(+), 37 deletions(-) diff --git a/SQF/dayz_code/actions/player_breakin.sqf b/SQF/dayz_code/actions/player_breakin.sqf index 5630fd399..51dde95e0 100644 --- a/SQF/dayz_code/actions/player_breakin.sqf +++ b/SQF/dayz_code/actions/player_breakin.sqf @@ -121,7 +121,7 @@ if (isnil "_proceed") then { if (_proceed) then { //Completed but no success. if (!_brokein) then { - PVDZ_Server_LogIt = format["BROKEINFAILED: Player %1 Broke into Failed %2 at %3 chances:%4,%5",player, (typeof _target), (mapGridPosition _pos) , _sledgeChance, _crowBarChance]; + PVDZ_sec_atp = format["BROKEINFAILED: Play3r %1 Broke into Failed %2 at %3 chances:%4,%5",player, (typeof _target), (mapGridPosition _pos), _sledgeChance, _crowBarChance]; _msg = "STR_BLD_BREAKIN_COMPLETE_FAIL"; } else { @@ -133,12 +133,12 @@ if (_proceed) then { _target animate ["DoorL", 1]; - PVDZ_Server_LogIt = format["BROKEINSUCCESSFUL: Player %1 Broke into %2 at %3",player, (typeof _target), (mapGridPosition _pos)]; + PVDZ_sec_atp = format["BROKEINSUCCESSFUL: Play3r %1 Broke into %2 at %3",player, (typeof _target), (mapGridPosition _pos)]; _msg = "STR_BLD_BREAKIN_COMPLETE"; }; //Send info to server for admins - publicVariableServer "PVDZ_Server_LogIt"; + publicVariableServer "PVDZ_sec_atp"; }; //Interrupted for some reason diff --git a/SQF/dayz_code/compile/fn_damageHandler.sqf b/SQF/dayz_code/compile/fn_damageHandler.sqf index ff4d2b614..1144a69b2 100644 --- a/SQF/dayz_code/compile/fn_damageHandler.sqf +++ b/SQF/dayz_code/compile/fn_damageHandler.sqf @@ -12,6 +12,7 @@ _damage = _this select 2; _source = _this select 3; _ammo = _this select 4; //diag_log format["%1 HandleDamage: Unit:%2 Hit:%3 Damage:%4 Source:%5 Ammo:%6",diag_tickTime,_unit,_hit,_damage,_source,_ammo]; + _unconscious = _unit getVariable ["NORRN_unconscious", false]; _model = typeOf player; _sourceType = typeOf _source; @@ -165,23 +166,22 @@ if (_unit == player) then { _isVehicle = ({_sourceVehicleType isKindOf _x} count ["LandVehicle","Air","Ship"] > 0); //Log to server. Useful for detecting damage and ammo cheats. - if (DZE_ServerLogHits && {!_isLocal} && {!_isZombieHit} && {_isMan or _isVehicle} && {diag_ticktime-(_source getVariable["lastloghit",0]) > 2}) then { + if (!_isLocal && {!_isZombieHit} && {_isMan or _isVehicle} && {diag_ticktime-(_source getVariable["lastloghit",0]) > 2}) then { _wpst = weaponState _source; _source setVariable ["lastloghit",diag_ticktime]; _sourceDist = round(_unit distance _source); _sourceWeap = switch (true) do { case (_ammo in ["PipeBomb","Mine","MineE"]): { format["with %1",_ammo] }; - case (_isVehicle) : { format ["with a %1",getText(configFile >> "CfgVehicles" >> _sourceVehicleType >> "displayName")] }; + case (_isVehicle) : { format ["with %1",getText(configFile >> "CfgVehicles" >> _sourceVehicleType >> "displayName")] }; case (_ammo in MeleeAmmo) : { format ["with %2%1",_wpst select 0, if (_sourceDist>6) then {"suspicious weapon "} else {""}] }; case (_wpst select 0 == "Throw") : { format ["with %1 thrown", _wpst select 3] }; - case (["Horn", currentWeapon _source] call fnc_inString) : {"with suspicious vehicle "+str((getposATL _source) nearEntities [["Air", "LandVehicle", "Ship"],5])}; + case (["Horn",currentWeapon _source] call fnc_inString) : { format ["with %1 suspicious", currentWeapon _source]}; case ((_wpst select 0 == "") AND {_wpst select 4 == 0}) : { format ["with %1/%2 suspicious", primaryWeapon _source, _ammo] }; case (_wpst select 0 != "") : { format ["with %1/%2 ", _wpst select 0, _ammo, _wpst select 4] }; default { "with suspicious weapon" }; }; - //Damage values over 999,999 will kick for PV value restriction (e+). These should not be possible for legitimate players. - PVDZ_sec_atp = [_unit, _source, toArray _sourceWeap, _sourceDist, _hit, str _damage]; //Send arbitrary string as array to allow stricter publicVariableVal.txt filter + PVDZ_sec_atp = [_unit, _source, _sourceWeap, _sourceDist, _hit, (_damage min 999999)]; publicVariableServer "PVDZ_sec_atp"; }; @@ -342,6 +342,7 @@ if (_damage > 0.4) then { if (!_isHit && !_isPZombie) then { //Create Wound _unit setVariable["hit_"+_wound,true,true]; + PVDZ_hlt_Bleed = [_unit,_wound,_damage]; publicVariable "PVDZ_hlt_Bleed"; // draw blood stream on character, on all gameclients [_unit,_wound,_hit] spawn fnc_usec_damageBleed; // draw blood stream on character, locally @@ -382,18 +383,15 @@ if (_hit in USEC_MinorWounds) then { "height:", (Dayz_freefall select 1), "blood loss", (_nrj2 * 25) ]; [_unit,_hit,_damage] call object_processHit; } else { - [_unit,"arms",(_damage / 6)] call object_processHit; // prevent broken legs due to arma bugs + [_unit,"arms",(_damage / 6)] call object_processHit; // prevent broken arms due to arma bugs }; if (_nrj2 > 30) then { (3 min (_nrj2/100)) call fnc_usec_bulletHit; // red flash r_player_blood = 0 max (r_player_blood - (_nrj2 * 25)); }; } else { - [_unit,_hit,(_damage / 2)] call object_processHit; + [_unit,_hit,(_damage / 2)] call object_processHit; }; - - //Stop process hit running twice. its set aboue in the if else statement. - //[_unit,_hit,(_damage / 2)] call object_processHit; }; }; diff --git a/SQF/dayz_code/compile/vehicle_getOut.sqf b/SQF/dayz_code/compile/vehicle_getOut.sqf index edcc67dfb..1e60995f1 100644 --- a/SQF/dayz_code/compile/vehicle_getOut.sqf +++ b/SQF/dayz_code/compile/vehicle_getOut.sqf @@ -39,8 +39,8 @@ if (_unit == player) then { }; //Log to server RPT (could give false pos) - should help admins see who is trying to abuse this. - PVDZ_Server_LogIt = format["Player %1 exited a %2 close to buildable object as %3",_unit, (typeof _vehicle), _position]; - publicVariableServer "PVDZ_Server_LogIt"; + PVDZ_sec_atp = format["WARNING: Play3r %1 exited %2 close to built fence as %3",_unit, (typeof _vehicle), _position]; + publicVariableServer "PVDZ_sec_atp"; localize "str_actions_exitBlocked" call dayz_rollingMessages; diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf index b57e24d5b..3e5edcc01 100644 --- a/SQF/dayz_code/configVariables.sqf +++ b/SQF/dayz_code/configVariables.sqf @@ -41,7 +41,6 @@ DZE_DeathMsgChat = "none"; //"none","global","side","system" Display death messa DZE_DeathMsgDynamicText = false; // Display death messages as dynamicText in the top left with weapon icons. DZE_DeathMsgRolling = false; // Display death messages as rolling messages in bottom center of screen. DZE_DeathScreen = true; // True=Use Epoch death screen (Trade city obituaries have been amended) False=Use DayZ death screen (You are dead) -DZE_ServerLogHits = false; // Log damage source, weapon, distance and ammo to server RPT for player hits. Useful for detecting damage and ammo cheats. // Dynamic Vehicles DynamicVehicleDamageLow = 0; // Min damage random vehicles can spawn with diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index df644cfce..2a3ab6d35 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -39,15 +39,15 @@ if (toLower worldName == "chernarus") then { //need to add building coordinates if (_ammo != "" && _ammo isKindOf "HelicopterExploSmall") then { _who = player; _dist = round (_who distance _building); - PVDZ_sec_atp = toArray (format ["UID#%1 d4maged %2 %5 to %3pct with ammo %4 at dist4nce %6m.", - getPlayerUID _who, typeOf _building, round (100 * _dmgLvl), _ammo, _part, _dist]); + PVDZ_sec_atp = format ["UID#%1 d4maged %2 %5 to %3pct with ammo %4 at dist4nce %6m.", + getPlayerUID _who, typeOf _building, round (100 * _dmgLvl), _ammo, _part, _dist]; publicVariableServer "PVDZ_sec_atp"; }; } else { if (_who == player) then { _dist = round (_who distance _building); - PVDZ_sec_atp = toArray (format ["UID#%1 d4maged %2 %5 to %3pct with ammo %4 at dist4nce %6m.", - getPlayerUID _who, typeOf _building, round (100 * _dmgLvl), _ammo, _part, _dist]); + PVDZ_sec_atp = format ["UID#%1 d4maged %2 %5 to %3pct with ammo %4 at dist4nce %6m.", + getPlayerUID _who, typeOf _building, round (100 * _dmgLvl), _ammo, _part, _dist]; publicVariableServer "PVDZ_sec_atp"; }; }; @@ -197,11 +197,6 @@ if (isServer) then { */ }; - /*"PVDZ_Server_LogIt" addPublicVariableEventHandler { - _info = _this select 1; - diag_log format["WARNING: %1",_info]; - };*/ - //"PVDZ_Server_processSetAccessCode" addPublicVariableEventHandler {(_this select 1) call pvs_processSetAccessCode}; //"PVDZ_Server_processCode" addPublicVariableEventHandler {(_this select 1) call pvs_processAccessCode}; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 3128d557f..2d15777e0 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -7047,7 +7047,7 @@ %1 умер от %2 - %1 was killed by %2 with a %3 from %4m + %1 was killed by %2 with %3 from %4m %1 wurde von %2 mit einer %3 aus %4m Entfernung getötet. %1 был убит игроком %2 с %3 с расстояния %4м diff --git a/SQF/dayz_code/system/antihack.sqf b/SQF/dayz_code/system/antihack.sqf index b7c43b9e4..94adb9b04 100644 --- a/SQF/dayz_code/system/antihack.sqf +++ b/SQF/dayz_code/system/antihack.sqf @@ -28,7 +28,7 @@ inGameUISetEventHandler ["Action","false"]; _plant = _x createVehicleLocal (getMarkerPos "center"); uiSleep 0.1; if (sizeOf _x == 0) exitWith { - PVDZ_sec_atp = toArray ("Plants texture hack for type " + _x); + PVDZ_sec_atp = "Plants texture hack for type " + _x; publicVariableServer "PVDZ_sec_atp"; endMission "LOSER"; }; diff --git a/SQF/dayz_code/system/scheduler/sched_antiTeleport.sqf b/SQF/dayz_code/system/scheduler/sched_antiTeleport.sqf index b892a3d31..c01a5c900 100644 --- a/SQF/dayz_code/system/scheduler/sched_antiTeleport.sqf +++ b/SQF/dayz_code/system/scheduler/sched_antiTeleport.sqf @@ -47,7 +47,7 @@ sched_antiTP = { if (_lastVehicle == vehicle player) then { if ((_speed > _topSpeed) && (alive player) && ((driver (vehicle player) == player) or (isNull (driver (vehicle player)))) && (_debug distance _lastpos > 3000) && !((vehicle player == player) && (_curheight < _lastheight) && ((_curheight - _terrainHeight) > 1))) then { (vehicle player) setposATL _lastpos; - PVDZ_sec_atp = toArray (format["TELEPORT REVERT for player UID#%1 from %2 to %3, %4 meters, now at %5", getPlayerUID player, _lastpos, _curPos, round(_lastpos distance _curpos), getPosATL player]); + PVDZ_sec_atp = format["TELEPORT REVERT for play3r UID#%1 from %2 to %3, %4 meters", getPlayerUID player, mapGridPosition _lastpos, mapGridPosition _curPos, round(_lastpos distance _curpos)]; publicVariableServer "PVDZ_sec_atp"; } else { _lastpos = _curpos; diff --git a/SQF/dayz_code/system/scheduler/sched_security.sqf b/SQF/dayz_code/system/scheduler/sched_security.sqf index 03e4567f6..129d1e89e 100644 --- a/SQF/dayz_code/system/scheduler/sched_security.sqf +++ b/SQF/dayz_code/system/scheduler/sched_security.sqf @@ -16,14 +16,14 @@ sched_security = { _time = time; if (typeName player != "OBJECT") then { - PVDZ_sec_atp = toArray (format["WARNING typename error for player UID#%1", getPlayerUID player]); + PVDZ_sec_atp = format["WARNING typename error for play3r UID#%1", getPlayerUID player]; publicVariableServer "PVDZ_sec_atp"; endMission "LOSER"; }; switch (true) do { case (1==0) : { - PVDZ_sec_atp = toArray (format["WARNING true error for player UID#%1", getPlayerUID player]); + PVDZ_sec_atp = format["WARNING true error for play3r UID#%1", getPlayerUID player]; publicVariableServer "PVDZ_sec_atp"; endMission "LOSER"; }; @@ -33,7 +33,7 @@ sched_security = { if (_time - _otime > 1 or _time < _otime) then { _timeTrickCount = _timeTrickCount +1; if (_timeTrickCount > 2) then { - PVDZ_sec_atp = toArray (format["WARNING unusual time shift for UID#%1", getPlayerUID player]); + PVDZ_sec_atp = format["WARNING unusual time shift for UID#%1", getPlayerUID player]; publicVariableServer "PVDZ_sec_atp"; }; }; @@ -43,7 +43,7 @@ sched_security = { if (_pid != _netid) then { _idTrickCount = _idTrickCount +1; if (_idTrickCount > 2) then { - PVDZ_sec_atp = toArray (format["WARNING unusual outfit swap for UID#%1", getPlayerUID player]); + PVDZ_sec_atp = format["WARNING unusual outfit swap for UID#%1", getPlayerUID player]; publicVariableServer "PVDZ_sec_atp"; }; }; @@ -57,7 +57,7 @@ sched_security = { _u = (_list select _i); if (!isNull _u) then { _pos = getPosATL _u; - PVDZ_sec_atp = toArray (format [ "From play3r UID#%1: illegal gr0up m3mber %2 at %3,%4... Server may be compromised!", getPlayerUID player, typeOf _u, _pos select 0, _pos select 1]); + PVDZ_sec_atp = format ["From play3r UID#%1: illegal gr0up m3mber %2 at %3,%4... Server may be compromised!", getPlayerUID player, typeOf _u, _pos select 0, _pos select 1]; publicVariableServer "PVDZ_sec_atp"; deleteVehicle _u; _quit = true; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 6bbe63e6a..7063b2657 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -433,8 +433,8 @@ if (dayz_townGenerator) then {execVM "\z\addons\dayz_server\system\lit_fireplace "PVDZ_sec_atp" addPublicVariableEventHandler { _x = _this select 1; switch (1==1) do { - case (typeName (_x select 0) == "SCALAR") : { // just some logs from the client - diag_log (toString _x); + case (typeName _x == "STRING") : { // just some logs from the client + diag_log _x; }; case (count _x == 2) : { // wrong side diag_log format["P1ayer %1 reports possible 'side' hack. Server may be compromised!",(_x select 1) call fa_plr2Str]; @@ -444,7 +444,7 @@ if (dayz_townGenerator) then {execVM "\z\addons\dayz_server\system\lit_fireplace _source = _x select 1; if (!isNull _source) then { diag_log format ["P1ayer %1 hit by %2 %3 from %4 meters in %5 for %6 damage", - _unit call fa_plr2Str, if (!isPlayer _source && alive _source) then {"AI"} else {_source call fa_plr2Str}, toString (_x select 2), _x select 3, _x select 4, _x select 5]; + _unit call fa_plr2Str, if (!isPlayer _source && alive _source) then {"AI"} else {_source call fa_plr2Str}, _x select 2, _x select 3, _x select 4, _x select 5]; }; }; }; diff --git a/Server Files/Battleye/publicvariable.txt b/Server Files/Battleye/publicvariable.txt index ccadbf896..15a354c2e 100644 --- a/Server Files/Battleye/publicvariable.txt +++ b/Server Files/Battleye/publicvariable.txt @@ -1,3 +1,3 @@ //new -5 !=(remExField|remExFP) !=(PVCDZ_obj_GutBody|drn_AskServerDynamicWeatherEventArgs|BIS_effects_gepv|achievement) !=PVDZ_(drg_(RaDrag|RaLW|RLact)|getTickTime|hlt_Bleed|obj_(Delete|Publish|RoadFlare|Destroy|Fire)|veh_Save|veh_SF) !=PVDZ_(plr_(Death|Login[12]|LoginRecord|Save|SwitchMove)|Server(_Simulation|StoreVar)|sec_atp) !=PVDZ_(playerMedicalSync|object_replace|groupInvite) !=PVDZ_(send(|Unconscious)) !=PVDZ_Server_(buildLock|LogIt|UpdateGroup) !=PVDZ_Server_process(Code|SetAccessCode) !=PVDZ_objgather_(Delete|Knockdown) !=PVDZE_(obj_(Delete|Publish|Swap|Trade)|maintainArea|PingSend|veh_(Lock|Publish2|Upgrade)|handleSafeGear|plr_(DeathB|FriendRQ|TradeMenu)) +5 !=(remExField|remExFP) !=(PVCDZ_obj_GutBody|drn_AskServerDynamicWeatherEventArgs|BIS_effects_gepv|achievement) !=PVDZ_(drg_(RaDrag|RaLW|RLact)|getTickTime|hlt_Bleed|obj_(Delete|Publish|RoadFlare|Destroy|Fire)|veh_Save|veh_SF) !=PVDZ_(plr_(Death|Login[12]|LoginRecord|Save|SwitchMove)|Server(_Simulation|StoreVar)|sec_atp) !=PVDZ_(playerMedicalSync|object_replace|groupInvite) !=PVDZ_(send(|Unconscious)) !=PVDZ_Server_(buildLock|UpdateGroup) !=PVDZ_Server_process(Code|SetAccessCode) !=PVDZ_objgather_(Delete|Knockdown) !=PVDZE_(obj_(Delete|Publish|Swap|Trade)|maintainArea|PingSend|veh_(Lock|Publish2|Upgrade)|handleSafeGear|plr_(DeathB|FriendRQ|TradeMenu)) 1=BIS_effects_gepv|PVDZ_(drg_RaDrag|hlt_Bleed|obj_Delete|obj_Destroy|obj_Publish|plr_Death|plr_LoginRecord|sec_atp|send|veh_SF) \ No newline at end of file