Merge branch 'hotfix/v2.25' into main

Gladdy.lua

@@ -26,11 +26,11 @@ local LibStub = LibStub
 
 ---------------------------
 
-local MAJOR, MINOR = "Gladdy", 12
+local MAJOR, MINOR = "Gladdy", 13
 local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
 local L
 Gladdy.version_major_num = 2
-Gladdy.version_minor_num = 0.24
+Gladdy.version_minor_num = 0.25
 Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
 Gladdy.version_releaseType = RELEASE_TYPES.release
 Gladdy.version = PREFIX .. string.format("%.2f", Gladdy.version_num) .. "-" .. Gladdy.version_releaseType

Gladdy.toc

@@ -1,5 +1,5 @@
 ## Title: Gladdy |cFFFF0000 game client not supported|r
-## Version: 2.24-Release
+## Version: 2.25-Release
 ## Notes: The most powerful arena AddOn for WoW Classic TBC/WotLK
 ## Author: XiconQoo, DnB_Junkee, Knall
 ## X-Email: contact me on discord Knall#1751

Gladdy_BCC.toc

@@ -1,6 +1,6 @@
 ## Interface: 20504
 ## Title: Gladdy - TBC
-## Version: 2.24-Release
+## Version: 2.25-Release
 ## Notes: The most powerful arena AddOn for WoW 2.5.4
 ## Author: XiconQoo, DnB_Junkee, Knall
 ## X-Email: contact me on discord Knall#1751

Gladdy_Wrath.toc

@@ -1,6 +1,6 @@
 ## Interface: 30402
 ## Title: Gladdy - WotLK
-## Version: 2.24-Release
+## Version: 2.25-Release
 ## Notes: The most powerful arena AddOn for WoW 3.4.2
 ## Author: XiconQoo, DnB_Junkee, Knall
 ## X-Email: contact me on discord Knall#1751

Modules/TotemPlates.lua

@@ -203,13 +203,13 @@ end
 function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID)
     local nameplate = C_NamePlate.GetNamePlateForUnit(unitID)
     self.activeTotemNameplates[unitID] = nil
-    --self:ToggleAddon(nameplate, true)
     if nameplate.gladdyTotemFrame then
         nameplate.gladdyTotemFrame:Hide()
         nameplate.gladdyTotemFrame:SetParent(nil)
         tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame)
         nameplate.gladdyTotemFrame = nil
     end
+    self:ToggleAddon(nameplate, true)
 end
 
 ---------------------------------------------------
@@ -373,23 +373,25 @@ function TotemPlates:ToggleAddon(nameplate, show)
     local addonFrames = { self:GetAddonFrame(nameplate) }
     if addonFrames and #addonFrames > 0 then
         if show then
-            for _,v in ipairs(addonFrames) do
+            for _, frame in ipairs(addonFrames) do
-                if nameplate.unitFrame and nameplate.unitFrame.UpdateAllElements then
+                if frame.UpdateAllElements then
                     Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - nameplate.unitFrame:UpdateAllElements")
-                    nameplate.unitFrame:UpdateAllElements("NAME_PLATE_UNIT_ADDED")
+                    frame:Show()
+                    frame:UpdateAllElements("NAME_PLATE_UNIT_ADDED")
                 else
                     Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - Show")
-                    v:Show()
+                    frame:Show()
                 end
             end
         else
-            for _,v in ipairs(addonFrames) do
+            for _, frame in ipairs(addonFrames) do
-                if nameplate.unitFrame and nameplate.unitFrame.UpdateAllElements then
+                if frame.UpdateAllElements then
                     Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - nameplate.unitFrame:UpdateAllElements")
-                    nameplate.unitFrame:UpdateAllElements("NAME_PLATE_UNIT_REMOVED")
+                    frame:UpdateAllElements("NAME_PLATE_UNIT_REMOVED")
+                    frame:Hide()
                 else
                     Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - Hide")
-                    v:Hide()
+                    frame:Hide()
                 end
             end
         end
@@ -402,7 +404,7 @@ function TotemPlates.OnUpdate(self)
     else
         self.selectionHighlight:SetAlpha(0)
     end
-    if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui" or TotemPlates.addon == "ElvUI") and self.parent and self.parent.unitFrame then
+    if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui") and self.parent and self.parent.unitFrame then
         self.parent.unitFrame:Hide()
     end
 end
@@ -454,7 +456,7 @@ function TotemPlates:OnUnitEvent(unitID)
         nameplate.gladdyTotemFrame.parent = nameplate
         nameplate.gladdyTotemFrame:Show()
         TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID)
-        self:ToggleAddon(nameplate)
+        self:ToggleAddon(nameplate, false)
         self.activeTotemNameplates[unitID] = nameplate
     elseif totemDataEntry and not Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled and Gladdy.db.npTotemsHideDisabledTotems then
         if nameplate.gladdyTotemFrame then
@@ -463,7 +465,7 @@ function TotemPlates:OnUnitEvent(unitID)
             tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame)
             nameplate.gladdyTotemFrame = nil
         end
-        self:ToggleAddon(nameplate)
+        self:ToggleAddon(nameplate, false)
     else
         self:ToggleAddon(nameplate, true)
     end

README.md

@@ -4,7 +4,7 @@
 
 ---
 
-## [v2.24-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.24-Release/Gladdy_Classic_v2.24-Release.zip)
+## [v2.25-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.25-Release/Gladdy_Classic_v2.25-Release.zip)
 
 ###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
 
@@ -61,6 +61,7 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
 - [dfherr](https://github.com/dfherr)
 - [miraage](https://github.com/miraage)
 - [veiz](https://github.com/veiz)
+- [Flamanis](https://github.com/Flamanis)
 
 Thank you!
 
@@ -80,6 +81,9 @@ Thank you!
 
 ### Changes
 
+### v2.25-Release
+- fix TotemPlates interfering with ElvUI (thanks [Flamanis](https://github.com/Flamanis))
+
 ### v2.24-Release
 - fix for WotLK v30402 (update libs)
 - update DRList