From ee4f877da43b7ca09dd16449dc713f0956f00c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A7=E9=98=B3=E8=AF=9B=E4=BB=99?= Date: Fri, 28 Feb 2025 12:02:38 +0800 Subject: [PATCH 1/2] Update AceTimer-3.0.lua fix AceTimer:TimeLeft --- AceTimer-3.0/AceTimer-3.0.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AceTimer-3.0/AceTimer-3.0.lua b/AceTimer-3.0/AceTimer-3.0.lua index e84d420..33c0b5b 100644 --- a/AceTimer-3.0/AceTimer-3.0.lua +++ b/AceTimer-3.0/AceTimer-3.0.lua @@ -172,7 +172,7 @@ end function AceTimer:TimeLeft(id) local timer = activeTimers[id] if not timer then - return 0 + return else return timer.ends - GetTime() end From 752f1e49dec5f6c1ca665661bf4bab4c09ec33b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A7=E9=98=B3pc?= Date: Sat, 1 Mar 2025 13:37:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96copyDefaults,=E4=BF=AE?= =?UTF-8?q?=E6=94=B9*=E7=9A=84=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AceDB-3.0/AceDB-3.0.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/AceDB-3.0/AceDB-3.0.lua b/AceDB-3.0/AceDB-3.0.lua index a0a8936..30220de 100644 --- a/AceDB-3.0/AceDB-3.0.lua +++ b/AceDB-3.0/AceDB-3.0.lua @@ -90,6 +90,7 @@ local function copyDefaults(dest, src) --if type(dest) ~= "table" then return end for k, v in pairs(src) do if k == "*" or k == "**" then + if k=='*' then v=dest['*'] or v end if type(v) == "table" then -- This is a metatable used for table defaults local mt = {