Skip to content

Commit 09e286c

Browse files
authored
Fix WarsongGulch.lua
1 parent 1665608 commit 09e286c

1 file changed

Lines changed: 18 additions & 6 deletions

File tree

Modules/WarsongGulch.lua

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
local addon, ns = ...
2+
3+
-- file-local wrapper to handle Retail/Classic API for flag positions (surgical fix)
4+
local function PVPS_GetBattlefieldFlagPosition(index)
5+
local uiMapId = C_Map and C_Map.GetBestMapForUnit and C_Map.GetBestMapForUnit("player") or nil
6+
if PS and PS.isRetail and C_PvP and C_PvP.GetBattlefieldFlagPosition and uiMapId then
7+
return C_PvP.GetBattlefieldFlagPosition(index, uiMapId)
8+
end
9+
if _G.GetBattlefieldFlagPosition then
10+
return _G.GetBattlefieldFlagPosition(index)
11+
end
12+
return nil, nil, nil
13+
end
214
local PVPSound = ns.PVPSound
315
local PS = ns.PS
416
local L = ns.L
@@ -197,11 +209,11 @@ function mod:CHAT_MSG_BG_SYSTEM_ALLIANCE(event, EventMessage)
197209

198210
for i = 1, 2 do
199211
if PS.isRetail then
200-
local type = select(3, C_PvP.PVPS_GetBattlefieldFlagPosition(i, mod.zoneId))
212+
local type = select(3, C_PvP.GetBattlefieldFlagPosition(i, mod.zoneId))
201213

202214
if type == 137218 then -- type for "AllianceFlag"
203-
AllianceFlagPositionX = select(1, C_PvP.PVPS_GetBattlefieldFlagPosition(i, mod.zoneId))
204-
AllianceFlagPositionY = select(2, C_PvP.PVPS_GetBattlefieldFlagPosition(i, mod.zoneId))
215+
AllianceFlagPositionX = select(1, C_PvP.GetBattlefieldFlagPosition(i, mod.zoneId))
216+
AllianceFlagPositionY = select(2, C_PvP.GetBattlefieldFlagPosition(i, mod.zoneId))
205217
break
206218
end
207219
else
@@ -276,11 +288,11 @@ function mod:CHAT_MSG_BG_SYSTEM_HORDE(event, EventMessage)
276288

277289
for i = 1, 2 do
278290
if PS.isRetail then
279-
local type = select(3, C_PvP.PVPS_GetBattlefieldFlagPosition(i, mod.zoneId))
291+
local type = select(3, C_PvP.GetBattlefieldFlagPosition(i, mod.zoneId))
280292

281293
if type == 137200 then -- type for "HordeFlag"
282-
HordeFlagPositionX = select(1, C_PvP.PVPS_GetBattlefieldFlagPosition(i, mod.zoneId))
283-
HordeFlagPositionY = select(2, C_PvP.PVPS_GetBattlefieldFlagPosition(i, mod.zoneId))
294+
HordeFlagPositionX = select(1, C_PvP.GetBattlefieldFlagPosition(i, mod.zoneId))
295+
HordeFlagPositionY = select(2, C_PvP.GetBattlefieldFlagPosition(i, mod.zoneId))
284296
break
285297
end
286298
else

0 commit comments

Comments
 (0)