W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove redundant unconscious checks in damage handler

Browse Source 
This is already check above. My mistake from e4ede46
This commit is contained in:
ebaydayz
2016-11-12 20:12:04 -05:00
parent e266fee651
commit 00f1f8537a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/compile/fn_damageHandler.sqf
View File

@@ -132,7 +132,7 @@ if (_unit == player) then {
}; };
if ((vehicle player == player) and (!_unconscious)) then { if ((vehicle player == player) and (!_unconscious)) then {
if (_ammo == "tranquiliser_bolt" && !r_player_unconscious) then { if (_ammo == "tranquiliser_bolt") then {
[_unit] spawn { [_unit] spawn {
private ["_unit"]; private ["_unit"];
_unit = _this select 0; _unit = _this select 0;
@@ -148,7 +148,7 @@ if (_unit == player) then {
if (_damage > 0.4) then { if (_damage > 0.4) then {
//Melee knockout system //Melee knockout system
if ((_isHeadHit) && (_ammo in ["Crowbar_Swing_Ammo","Bat_Swing_Ammo","Sledge_Swing_Ammo"]) && (!r_player_unconscious)) then { if ((_isHeadHit) && (_ammo in ["Crowbar_Swing_Ammo","Bat_Swing_Ammo","Sledge_Swing_Ammo"])) then {
[_unit] spawn { [_unit] spawn {
_unit = _this select 0; _unit = _this select 0;
localize "str_actions_medical_knocked_out" call dayz_rollingMessages; localize "str_actions_medical_knocked_out" call dayz_rollingMessages;