From 6ab4faba39612d8ac6d7f3df8a8ff2622a972ce7 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Tue, 19 Sep 2017 12:11:27 -0400 Subject: [PATCH] Update AI hit log Correction for 6239959 @oiad isPlayer is not reliable on dead units which may be passed to fa_plr2Str. Also, the other scripts which call fa_plr2Str always provide a player, so we only want to check for AI on the hit log source. --- SQF/dayz_server/init/server_functions.sqf | 2 +- SQF/dayz_server/system/server_monitor.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 3ccc0eba6..ba15eb660 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -250,7 +250,7 @@ fa_plr2str = { _name = _x getVariable ["bodyName", nil]; if ((isNil "_name" OR {(_name == "")}) AND ({alive _x})) then { _name = name _x; }; if (isNil "_name" OR {(_name == "")}) then { _name = "UID#"+(getPlayerUID _x); }; - _res = if (isPlayer _x) then {format["PID#%1(%2)", owner _x, _name]} else {localize "STR_PLAYER_AI"}; + _res = format["PID#%1(%2)", owner _x, _name ]; }; _res }; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index db673ea1b..57acf343d 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -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, _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 {localize "STR_PLAYER_AI"} else {_source call fa_plr2Str}, toString (_x select 2), _x select 3, _x select 4, _x select 5]; }; }; };