diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index 64b597e19..b34469490 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -34,6 +34,23 @@ if (isServer) then { "PVDZE_send" addPublicVariableEventHandler {(_this select 1) call server_sendToClient}; "PVDZE_maintainArea" addPublicVariableEventHandler {(_this select 1) spawn server_maintainArea}; + "PVDZE_atp" addPublicVariableEventHandler { + _x = _this select 1; + if (typeName _x == "STRING") then { + diag_log _x; + /*} else { + _unit = _x select 0; + _source = _x select 1; + if (((!(isNil {_source})) AND {(!(isNull _source))}) AND {((_source isKindOf "CAManBase") AND {(owner _unit != owner _source)})}) then { + diag_log format ["Player %1 hit by %2 %3 from %4 meters", + _unit call fa_plr2Str, _source call fa_plr2Str, _x select 2, _x select 3]; + if (_unit getVariable["processedDeath", 0] == 0) then { + _unit setVariable [ "attacker", name _source ]; + _unit setVariable [ "noatlf4", diag_ticktime ]; // server-side "not in combat" test, if player is not already dead + }; + };*/ + }; + }; "PVDZE_plr_Died" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied}; "PVDZE_plr_Save" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerSync;}; "PVDZE_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj}; diff --git a/SQF/dayz_code/system/antihack.sqf b/SQF/dayz_code/system/antihack.sqf index 0168ab5bb..95503fd2a 100644 --- a/SQF/dayz_code/system/antihack.sqf +++ b/SQF/dayz_code/system/antihack.sqf @@ -37,14 +37,7 @@ while {true} do { _topv = 0; _toph = 0; - while {((typeName player == "OBJECT") AND {((player in playableUnits) AND {(alive player)})})} do { - //[-18697.58,379.53012,25815.256] - /* - if ([getMarkerPos "respawn_west", [0,0,0]] call BIS_fnc_areEqual || !([getMarkerPos "respawn_west", _debug] call BIS_fnc_areEqual)) then { - createMarkerLocal ["respawn_west", _debug]; - "respawn_west" setMarkerType "EMPTY"; - }; - */ + while {((typeName player == "OBJECT") AND {((player in playableUnits) OR {(alive player)})})} do { _curpos = getPosATL (vehicle player); _distance = _lastpos distance _curpos; _curtime = diag_ticktime; @@ -79,24 +72,13 @@ while {true} do { _terrainHeight = getTerrainHeightASL [_curpos select 0, _curpos select 1]; - /* - _differenceCheck = false; - _lastPosVar = player getVariable ["lastPos", []]; - if (count _lastPosVar > 0) then { - _differenceCheck = (_lastPosVar distance _lastpos) > _topSpeed; - } else { - diag_log "LASTPOS RESET"; - }; - */ - _safetyVehicle = vehicle player; 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; -// atp = 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]; - atp = [name player, dayz_characterID, _lastpos, _curPos, getPosATL player]; - publicVariableServer "atp"; + PVDZE_atp = [name player, dayz_characterID, _lastpos, _curPos, getPosATL player]; + publicVariableServer "PVDZE_atp"; } else { _lastpos = _curpos; _lastheight = _curheight; @@ -124,11 +106,5 @@ while {true} do { }; sleep 0.25; }; -// if (_al1veOnce) then { -// sleep 5; -// endMission "LOSER"; -// } -// else { - sleep 0.1; -// }; + sleep 0.1; }; \ No newline at end of file diff --git a/Server Files/Battleye/publicvariable.txt b/Server Files/Battleye/publicvariable.txt index ec6e0dda2..ef361e357 100644 --- a/Server Files/Battleye/publicvariable.txt +++ b/Server Files/Battleye/publicvariable.txt @@ -1,2 +1,2 @@ //new -5 "" !"PVDZE_" !"norrn" !"usec" !="remExField" !="remExFP" !="drn_AskServerDynamicWeatherEventArgs" !="atp" !="BIS_effects_gepv" \ No newline at end of file +5 "" !"PVDZE_" !"norrn" !"usec" !="remExField" !="remExFP" !="drn_AskServerDynamicWeatherEventArgs" !="BIS_effects_gepv" \ No newline at end of file