From 963c1c44271eac894e963098c7bce974b9d4aa01 Mon Sep 17 00:00:00 2001
From: Meow <30401521+me0wg4ming@users.noreply.github.com>
Date: Fri, 27 Mar 2026 17:36:10 +0100
Subject: [PATCH] fixed castbar to work properly for spells like Volley

---
 modules/castbar.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/castbar.lua b/modules/castbar.lua
index 1fb7fe2f..8b498daa 100644
--- a/modules/castbar.lua
+++ b/modules/castbar.lua
@@ -107,6 +107,8 @@ pfUI:RegisterModule("castbar", "vanilla", function ()
       local focusGuid = nil
       if this.unitstr and string.find(this.unitstr, "^0x") then
         focusGuid = this.unitstr
+      elseif this.unitstr and this.unitstr == "player" and GetUnitGUID then
+        focusGuid = GetUnitGUID("player")
       elseif this.unitstr and this.unitstr ~= "player" then
         local guid = GetUnitGUID(this.unitstr)
         if guid then focusGuid = guid end
@@ -139,12 +141,12 @@ pfUI:RegisterModule("castbar", "vanilla", function ()
         query = UnitName("player")
       end
 
-      -- Fallback: pfGetCastInfo only when no focusGuid (Nampower not available for this unit)
-      if not cast and not castBlocked and not focusGuid and pfGetCastInfo then
+      -- Fallback: pfGetCastInfo only when no focusGuid or no cast found via libdebuff
+      if not cast and not castBlocked and pfGetCastInfo then
         cast, nameSubtext, text, texture, startTime, endTime, isTradeSkill = pfGetCastInfo(query)
       end
 
-      if not cast and not castBlocked and not focusGuid and pfGetChannelInfo then
+      if not cast and not castBlocked and pfGetChannelInfo then
         channel, nameSubtext, text, texture, startTime, endTime, isTradeSkill = pfGetChannelInfo(this.unitstr or this.unitname)
         cast = channel
       end