From 7bde1ec5d20e55759a96f4f652753661790e8761 Mon Sep 17 00:00:00 2001
From: shagu <ericmauser@googlemail.com>
Date: Sun, 8 Jun 2025 09:40:01 +0200
Subject: [PATCH] libdebuff: clean up and reduce duplicated code

---
 libs/libdebuff.lua | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/libs/libdebuff.lua b/libs/libdebuff.lua
index c83ee7d1..545b9fb7 100644
--- a/libs/libdebuff.lua
+++ b/libs/libdebuff.lua
@@ -266,25 +266,19 @@ function libdebuff:UnitDebuff(unit, id)
     effect = scanner:Line(1) or ""
   end
 
-  if libdebuff.objects[unitname] and libdebuff.objects[unitname][unitlevel] and libdebuff.objects[unitname][unitlevel][effect] then
-    -- clean up cache
-    if libdebuff.objects[unitname][unitlevel][effect].duration and libdebuff.objects[unitname][unitlevel][effect].duration + libdebuff.objects[unitname][unitlevel][effect].start < GetTime() then
-      libdebuff.objects[unitname][unitlevel][effect] = nil
-    else
-      duration = libdebuff.objects[unitname][unitlevel][effect].duration
-      timeleft = duration + libdebuff.objects[unitname][unitlevel][effect].start - GetTime()
-      caster = libdebuff.objects[unitname][unitlevel][effect].caster
-    end
+  -- read level based debuff table
+  local data = libdebuff.objects[unitname] and libdebuff.objects[unitname][unitlevel]
+  data = data or libdebuff.objects[unitname] and libdebuff.objects[unitname][0]
 
-  -- no level data
-  elseif libdebuff.objects[unitname] and libdebuff.objects[unitname][0] and libdebuff.objects[unitname][0][effect] then
-    -- clean up cache
-    if libdebuff.objects[unitname][0][effect].duration and libdebuff.objects[unitname][0][effect].duration + libdebuff.objects[unitname][0][effect].start < GetTime() then
-      libdebuff.objects[unitname][0][effect] = nil
+  if data and data[effect] then
+    if data[effect].duration and data[effect].start and data[effect].duration + data[effect].start > GetTime() then
+      -- read valid debuff data
+      duration = data[effect].duration
+      timeleft = duration + data[effect].start - GetTime()
+      caster = data[effect].caster
     else
-      duration = libdebuff.objects[unitname][0][effect].duration
-      timeleft = duration + libdebuff.objects[unitname][0][effect].start - GetTime()
-      caster = libdebuff.objects[unitname][0][effect].caster
+      -- clean up invalid values
+      data[effect] = nil
     end
   end