Update restoring of Blizzard events

Nevcairiel · Dec 30, 2022 · 1b4b0ef · 1b4b0ef
1 parent 716106e
commit 1b4b0ef
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/modules/Focus.lua b/modules/Focus.lua
@@ -137,15 +137,19 @@ function Focus:ApplySettings()
 		FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_START", "focus")
 		FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_STOP", "focus")
 		FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_FAILED", "focus")
-		FocusFrameSpellBar:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED")
-		FocusFrameSpellBar:RegisterEvent("UNIT_SPELLCAST_DELAYED")
-		FocusFrameSpellBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
-		FocusFrameSpellBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
-		FocusFrameSpellBar:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE")
+		FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_INTERRUPTED", "focus")
+		FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_DELAYED", "focus")
+		FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_START", "focus")
+		FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "focus")
+		FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_STOP", "focus")
 		if WoWRetail then
-			FocusFrameSpellBar:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE")
-			FocusFrameSpellBar:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE")
+			FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_EMPOWER_START", "focus")
+			FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_EMPOWER_UPDATE", "focus")
+			FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_EMPOWER_STOP", "focus")
+			FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "focus")
+			FocusFrameSpellBar:RegisterUnitEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "focus")
 		end
+
 		FocusFrameSpellBar:RegisterEvent("PLAYER_ENTERING_WORLD")
 		FocusFrameSpellBar:RegisterEvent("PLAYER_FOCUS_CHANGED")
 		FocusFrameSpellBar:RegisterEvent("CVAR_UPDATE")

diff --git a/modules/Pet.lua b/modules/Pet.lua
@@ -98,17 +98,20 @@ function Pet:ApplySettings()
 	else
 		PetCastingBarFrame.RegisterEvent = nil
 		PetCastingBarFrame:UnregisterAllEvents()
-		PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_START")
-		PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_STOP")
-		PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_FAILED")
-		PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED")
-		PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_DELAYED")
-		PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
-		PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
-		PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE")
+		PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_START", "pet")
+		PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_STOP", "pet")
+		PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_FAILED", "pet")
+		PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_INTERRUPTED", "pet")
+		PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_DELAYED", "pet")
+		PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_START", "pet")
+		PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_UPDATE", "pet")
+		PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_CHANNEL_STOP", "pet")
 		if WoWRetail then
-			PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_INTERRUPTIBLE")
-			PetCastingBarFrame:RegisterEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE")
+			PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_EMPOWER_START", "pet")
+			PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_EMPOWER_UPDATE", "pet")
+			PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_EMPOWER_STOP", "pet")
+			PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_INTERRUPTIBLE", "pet")
+			PetCastingBarFrame:RegisterUnitEvent("UNIT_SPELLCAST_NOT_INTERRUPTIBLE", "pet")
 		end
 		PetCastingBarFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
 		PetCastingBarFrame:RegisterEvent("UNIT_PET")