From c648cee5f16e2262dac172c2679145d763b2d8ef Mon Sep 17 00:00:00 2001
From: "[VB]AWOL" <vbawol@veteranbastards.com>
Date: Tue, 10 Dec 2013 15:42:22 -0600
Subject: [PATCH] revert changes to combat timer

---
 SQF/dayz_code/system/player_spawn_2.sqf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf
index 9696c2dd1..11e967cc8 100644
--- a/SQF/dayz_code/system/player_spawn_2.sqf
+++ b/SQF/dayz_code/system/player_spawn_2.sqf
@@ -217,14 +217,14 @@ while {true} do {
 	// If in combat, display counter and restrict logout
 	_startcombattimer      = player getVariable["startcombattimer",0];
 	if (_startcombattimer == 1) then {
-		player setVariable["combattimeout", diag_tickTime + 30, true];
+		player setVariable["combattimeout", time + 30, true];
 		player setVariable["startcombattimer", 0, true];
 		dayz_combat = 1;
 	};
 
 	_combattimeout = player getVariable["combattimeout",0];
 	if (_combattimeout > 0) then {
-		_timeleft = _combattimeout - diag_tickTime;
+		_timeleft = _combattimeout - time;
 		if (_timeleft > 0) then {
 			//hintSilent format["In Combat: %1",round(_timeleft)];
 		} else {