W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-04-18 02:06:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	SQF/dayz_code/compile/fn_damageActions.sqf
#	SQF/dayz_code/compile/fn_selfActions.sqf
This commit is contained in:
icomrade
2016-05-02 20:44:50 -04:00
parent 575682b7c8 d361abaec3
commit 5f054393e5
31 changed files with 1944 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/compile/fn_damageActions.sqf
View File

@@ -211,7 +211,7 @@ if (isPlayer cursorTarget) then {
};
if (_unit isKindOf "Man") then {
// should only fire if cursor target is man and not vehicle
_charID = _unit getVariable ["CharacterID", 0];
_charID = _unit getVariable ["CharacterID", "0"];
if (DZE_plotforLife) then {
_charID = [_unit] call FNC_GetPlayerUID;
};