Merge pull request #4476 from johnnylam88/fix/reflectable-spells-tww2

feat: add reflectable spells for TWW Season 2
Hekili · Mar 4, 2025 · a4d1f0e · a4d1f0e
2 parents 08342c8 + ea37f00
commit a4d1f0e
Show file tree

Hide file tree

Showing 5 changed files with 548 additions and 273 deletions.
diff --git a/Events.lua b/Events.lua
@@ -333,10 +333,11 @@ RegisterEvent( "PLAYER_ENTERING_WORLD", function( event, login, reload )
             state.combat = GetTime() - 0.01
         end
 
-        local _, zone = GetInstanceInfo()
+        local _, zone, _, _, _, _, _, instanceID = GetInstanceInfo()
         state.bg = zone == "pvp"
         state.arena = zone == "arena"
         state.torghast = IsInJailersTower()
+        state.instance_id = instanceID or -1
 
         Hekili:BuildUI()
     end
@@ -378,10 +379,11 @@ end
 
 do
     local function UpdateZoneInfo()
-        local _, zone = GetInstanceInfo()
+        local _, zone, _, _, _, _, _, instanceID = GetInstanceInfo()
         state.bg = zone == "pvp"
         state.arena = zone == "arena"
         state.torghast = IsInJailersTower()
+        state.instance_id = instanceID or -1
     end
 
     RegisterEvent( "ZONE_CHANGED", UpdateZoneInfo )