From b8c5798af54a303c4256f6e471369753ff741aa6 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sat, 19 Oct 2013 07:53:59 +0000 Subject: [PATCH] Fix the return value of TimeInCombat() script condition. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1077 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleCondition.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OvaleCondition.lua b/OvaleCondition.lua index a8071fa..4acb61a 100644 --- a/OvaleCondition.lua +++ b/OvaleCondition.lua @@ -3843,7 +3843,11 @@ end OvaleCondition.conditions.timeincombat = function(condition) local comparator, limit = condition[1], condition[2] - return TestValue(comparator, limit, 0, Ovale.combatStartTime, 1) + if Ovale.enCombat then + return TestOvaleValue(Ovale.combatStartTime, math.huge, 0, Ovale.combatStartTime, 1, comparator, limit) + else + return Compare(0, comparator, limit) + end end --- Get the estimated number of seconds remaining before the target is dead. -- 1.7.9.5